--- loncom/interface/lonmenu.pm	2003/04/03 03:08:12	1.50
+++ loncom/interface/lonmenu.pm	2006/03/16 22:21:15	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.50 2003/04/03 03:08:12 www Exp $
+# $Id: lonmenu.pm,v 1.167 2006/03/16 22:21:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,43 +42,251 @@ use strict;
 use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
-use Apache::loncommon;
-use Apache::File;
+use Apache::loncommon();
+use Apache::lonenc();
+use Apache::lonlocal;
+
 use vars qw(@desklines $readdesk);
 
+
+my @inlineremote;
+my $font;
+my $tabbg;
+my $pgbg;
+
+# ================================================================ Little texts
+
+sub initlittle {
+    return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
+				       'nav' => 'Navigate Contents',
+				       'main' => 'Main Menu',
+                                       'roles' => ($env{'user.adv'}?
+                                                    'Roles':'Courses'),
+                                       'docs' => 'Course Documents',
+                                       'exit' => 'Exit',
+				       'launch' => 'Launch Remote Control',
+                                       'groups' => 'Groups');
+}
+
 # ============================= This gets called at the top of the body section
 
 sub menubuttons {
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
-    if ($ENV{'browser.interface'} eq 'textual') {
+    my $titletable=shift;
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['inhibitmenu']);
+    if (($env{'form.inhibitmenu'} eq 'yes') ||
+        ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
+    my %lt=&initlittle();
+    my $navmaps='';
+    my $reloadlink='';
+    my $docs='';
+    my $groups='';
+    my $showgroups=0;
+    my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
+    my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+    my $face= 'face="Arial,Helvetica,sans-serif"';
+    if ($env{'request.state'} eq 'construct') {
+        if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
+            my $returnurl = $env{'request.filename'};
+            $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:;
+            $escurl = &Apache::lonnet::escape($returnurl);
+        }
+    }
+    if ($env{'request.course.id'}) {
+        my %coursegroups;
+        my $viewgrps_permission =                                                
+                     &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+        if (!$viewgrps_permission) {
+            %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
+        }
+        if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) {
+            $showgroups = 1;
+        }
+    }
+
+    if ($env{'browser.interface'} eq 'textual') {
 # Textual display only
+        $pgbg='#FFFFFF';
+        $tabbg='#FFFFFF';
+	$font='#000000';
+        if ($env{'request.course.id'}) {
+	    $navmaps=(<<ENDNAV);
+<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
+ENDNAV
+            if (($env{'request.noversionuri'}=~/^\/adm\//) &&
+         ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+                my $escreload=&Apache::lonnet::escape('return:');
+                $reloadlink=(<<ENDRELOAD);
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a>
+ENDRELOAD
+            }
+	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+               $docs=(<<ENDDOCS);
+<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a>
+ENDDOCS
+            }
+            if ($showgroups) {
+                $groups =(<<ENDGROUPS);
+<td bgcolor="$tabbg">
+<a href="/adm/coursegroups" target="_top"><font $face color="$font">$lt{'groups'}</font></a></td>
+ENDGROUPS
+            }
+	}
+        my $form=&serverform();
+        my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
+$utility
 </script>
-<a href="/adm/menu" target="_top">Main Menu</a><br />
-<script>
+<a href="/adm/menu" target="_top">$lt{'main'}</a>
+$reloadlink $navmaps $docs $groups
+<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a>
+<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a>
+<br />
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
+$form
 ENDMAINMENU
         if ($registration) { $output.=&innerregister($forcereg,$target); }
 	return $output."<hr />";
-    } elsif ($ENV{'environment.remote'} eq 'off') {
+    } elsif ($env{'environment.remote'} eq 'off') {
 # Remote Control is switched off
-	my $output=(<<ENDINLINEMENU);
-<script>
+# figure out colors
+	my %lt=&initlittle();
+	my $function='student';
+        if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+	    $function='coordinator';
+        }
+	if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
+            $function='admin';
+        }
+        if (($env{'request.role'}=~/^(au|ca)/) ||
+            ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) {
+            $function='author';
+        }
+        my $domain=&Apache::loncommon::determinedomain();
+        $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
+        $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+        $font=&Apache::loncommon::designparm($function.'.font',$domain);
+        my $link=&Apache::loncommon::designparm($function.'.link',$domain);
+        my $alink=&Apache::loncommon::designparm($function.'.alink',$domain);
+        my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
+        my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
+	if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+	    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+	    return (<<ENDINLINEMENU);
+<font face="Arial,Helvetica,sans-serif">
+   <table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr>
+      <td bgcolor="$tabbg">
+        <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+     </td>
+     <td align="right" bgcolor="$tabbg">
+       <img align="right" src="$logo" alt="Logo" />
+       <b>LON-CAPA</b>&nbsp;
+     </td>
+   </tr>
+  </table>
+</font>
+ENDINLINEMENU
+        }
+# Do we have a NAV link?
+        if ($env{'request.course.id'}) {
+	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
+		$escsymb;
+	    if ($env{'environment.remotenavmap'} eq 'on') {
+		$link="javascript:gonav('".$link."')";
+	    }
+	    $navmaps=(<<ENDNAV);
+<td bgcolor="$tabbg">
+<a href="$link" target="_top"><font $face color="$font">$lt{'nav'}</font></a></td>
+ENDNAV
+	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+		$docs=(<<ENDDOCS);
+<td bgcolor="$tabbg">
+<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a></td>
+ENDDOCS
+            }
+            if ($showgroups) {
+                $groups =(<<ENDGROUPS);
+<td bgcolor="$tabbg">
+<a href="/adm/coursegroups" target="_top"><font $face color="$font">$lt{'groups'}</font></a></td>
+ENDGROUPS
+            }
+	    if (
+		($env{'request.noversionuri'}=~m[^/(res|public)/] &&
+		 $env{'request.symb'} eq '')
+		||
+		(($env{'request.noversionuri'}=~/^\/adm\//) &&
+		 ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+		 ($env{'request.noversionuri'}!~
+		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+		  )
+		 ) {
+                my $escreload=&Apache::lonnet::escape('return:');
+                $reloadlink=(<<ENDRELOAD);
+<td bgcolor="$tabbg">
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
+ENDRELOAD
+            }
+        }
+	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
+	    my $escreload=&Apache::lonnet::escape('return:');
+	    $reloadlink=(<<ENDCRELOAD);
+<td bgcolor="$tabbg">
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
+ENDCRELOAD
+        }
+        my $reg='';
+        if ($registration) {
+           $reg=&innerregister($forcereg,$target,$titletable);
+        }
+        my $form=&serverform();
+	my $utility=&utilityfunctions();
+	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+
+	return (<<ENDINLINEMENU);
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
+// <![CDATA[
+$utility
+// ]]>
 </script>
-<a href="/adm/menu" target="_top">Main Menu</a>
-<a href="/adm/remote?action=launch" target="_top">Launch Remote Control</a>
-<script>
+<table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+<tr>
+<td bgcolor="$tabbg">
+<a href="/adm/menu" target="_top"><font $face color="$font">$lt{'main'}</font></a>
+</td>
+$reloadlink
+$navmaps
+$docs
+$groups
+<td bgcolor="$tabbg">
+<a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
+<font $face color="$font">$lt{'launch'}</font></a></td>
+<td bgcolor="$tabbg">
+<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a>
+</td>
+<td bgcolor="$tabbg">
+<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a>
+</td>
+<td bgcolor="$tabbg">
+<img align="right" src="$logo" alt="Logo" />
+<b>LON-CAPA</b></td>
+$form
+</tr>
+</table>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
+$reg
 ENDINLINEMENU
-        if ($registration) { $output.=&innerregister($forcereg,$target); }
-	return $output."<hr />";
     } else {
 	return '';
     }
@@ -90,24 +298,32 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    
+    if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    my $force_title='';
+    if ($env{'request.state'} eq 'construct') {
+	$force_title=&Apache::lonxml::display_title();
+    }
     if ($target eq 'edit') {
         $result .="<script type=\"text/javascript\">\n".
             "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
             &Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";
     }
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ((($ENV{'request.publicaccess'}) || 
-         (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off') ||
+        ((($env{'request.publicaccess'}) || 
+         (!&Apache::lonnet::is_on_map(
+	   &Apache::lonnet::unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
-	return $result.
-         '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
+ 	return $result.
+          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
-    $result.=&innerregister($forcereg,$target);
-    return $result;
+    if ($target ne 'edit') {
+	$result.=&innerregister($forcereg,$target);
+    }
+    return $result.$force_title;
 }
 
 # =========== This gets called in order to register a URL, both with the Remote
@@ -116,73 +332,116 @@ sub registerurl {
 sub innerregister {
     my $forcereg=shift;
     my $target = shift;
+    my $titletable = shift;
     my $result = '';
+    my ($uname,$thisdisfn);
+    my $const_space = ($env{'request.state'} eq 'construct');
+    my $is_const_dir = 0;
+
+    if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
 
     $Apache::lonxml::registered=1;
 
-    my $textinter=($ENV{'browser.interface'} eq 'textual');
-    my $noremote=($ENV{'environment.remote'} eq 'off');
+    my $textinter=($env{'browser.interface'} eq 'textual');
+    my $noremote=($env{'environment.remote'} eq 'off');
     
     my $textual=($textinter || $noremote);
 
+    @inlineremote=();
+    undef @inlineremote;
+
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
+    if ($noremote) {
+	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'"><font face="Arial,Helvetica,sans-serif">';
+    }
+    if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) {
+	my ($mapurl,$rid,$resurl)=
+	    &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
+        $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};
+        my $maptitle=&Apache::lonnet::gettitle($mapurl);
+	my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread());
+        if ($maptitle && $maptitle ne 'default.sequence') {
+	    $newmail.=', '.$maptitle;
+        }
+        if ($restitle) {
+	    $newmail.=': '.$restitle;
+        }
+        $newmail.='&nbsp;&nbsp;&nbsp;';
+    }
     if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?
- '<b><a href="/adm/communicate">You have new messages</a></b><br />':
+ '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
+    if ($env{'request.state'} eq 'construct') {
+        $newmail = $titletable;
+    } else {
+	if ($noremote) {
+	    $newmail.='</font></td></tr></table>';
+	}
+    }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
+    my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
+    my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
+    if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
+	my $crs='/'.$env{'request.course.id'};
+	if ($env{'request.course.sec'}) {
+	    $crs.='_'.$env{'request.course.sec'};
+	}
+	$crs=~s/\_/\//g;
+
         my $hwkadd='';
-        if 
-      ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
-		$hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions',
-                       "gocmd('/adm/grades','submission')",
-		       'View user submissions for this assessment resource');
-            }
-	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
-		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
+        if ($env{'request.symb'} ne '' &&
+	    $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
+	    if (&Apache::lonnet::allowed('mgr',$crs)) {
+		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
-            }
-	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
-		$hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
-                       "gocmd('/adm/parmset','set')",
-                       'Modify deadlines, etc, for this assessment resource');
+            } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
+		$hwkadd.=&switch('','',7,2,'subm.gif','view sub-[_1]','missions[_1]',
+                       "gocmd('/adm/grades','submission')",
+		       'View user submissions for this assessment resource');
             }
 	}
+	if ($env{'request.symb'} ne '' &&
+	    &Apache::lonnet::allowed('opa',$crs)) {
+	    $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
+			     "gocmd('/adm/parmset','set')",
+			     'Modify deadlines, etc, for this resource');
+	}
 # -- End Homework
         ###
         ### Determine whether or not to display the 'cstr' button for this
         ### resource
         ###
         my $editbutton = '';
-        if ($ENV{'user.author'}) {
-            if ($ENV{'request.role'}=~/^(ca|au)/) {
+        if ($env{'user.author'}) {
+            if ($env{'request.role'}=~/^(ca|au)/) {
                 # Set defaults for authors
                 my ($top,$bottom) = ('con-','struct');
-                my $action = "go('/priv/".$ENV{'user.name'}."');";
-                my $cadom  = $ENV{'request.role.domain'};
-                my $caname = $ENV{'user.name'};
+                my $action = "go('/priv/".$env{'user.name'}."');";
+                my $cadom  = $env{'request.role.domain'};
+                my $caname = $env{'user.name'};
                 my $desc = "Enter my resource construction space";
                 # Set defaults for co-authors
-                if ($ENV{'request.role'} =~ /^ca/) { 
-                    ($cadom,$caname)=($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+                if ($env{'request.role'} =~ /^ca/) { 
+                    ($cadom,$caname)=($env{'request.role'}=~/(\w+)\/(\w+)$/);
                     ($top,$bottom) = ('co con-','struct');
                     $action = "go('/priv/".$caname."');";
                     $desc = "Enter construction space as co-author";
                 }
                 # Check that we are on the correct machine
                 my $home = &Apache::lonnet::homeserver($caname,$cadom);
-                if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
-                    $editbutton=&switch
-                        ('','',6,1,$top,,$bottom,$action,$desc);
+		my $allowed=0;
+		my @ids=&Apache::lonnet::current_machine_ids();
+		foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		if (!$allowed) {
+		    $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
                 }
             }
             ##
@@ -191,42 +450,74 @@ sub innerregister {
             my $cfile='';
             my $cfuname='';
             my $cfudom='';
-            if ($ENV{'request.filename'}) {
-                my $file=&Apache::lonnet::declutter($ENV{'request.filename'});
+            if ($env{'request.filename'}) {
+                my $file=&Apache::lonnet::declutter($env{'request.filename'});
                 $file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
-                # Chech that the user has permission to edit this resource
+                # Check that the user has permission to edit this resource
                 ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
                 if (defined($cfudom)) {
-                    if (&Apache::lonnet::homeserver($cfuname,$cfudom) 
-                        eq $Apache::lonnet::perlvar{'lonHostID'}) {
+		    my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
+		    my $allowed=0;
+		    my @ids=&Apache::lonnet::current_machine_ids();
+		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		    if ($allowed) {
                         $cfile=$file;
                     }
                 }
             }        
             # Finally, turn the button on or off
-            if ($cfile) {
+            if ($cfile && !$const_space) {
                 $editbutton=&switch
-                    ('','',6,1,'cstr.gif','edit','resource',
+                    ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
             } elsif ($editbutton eq '') {
-                $editbutton=&clear(6,1);
+                $editbutton=&switch('','',6,1,'port.gif',
+				    'port-[_1]','folio[_1]',
+				    "go('/adm/portfolio');",
+				    "Enter my portfolio space");
             }
         }
         ###
         ###
 # Prepare the rest of the buttons
-	my $menuitems=(<<ENDMENUITEMS);
+        my $menuitems;
+        if ($const_space) {
+	    my ($uname,$thisdisfn) =
+		($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
+            my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
+            if ($currdir =~ m-/$-) {
+                $is_const_dir = 1;
+            } else {
+                $currdir =~ s#[^/]+$##;
+                $menuitems=(<<ENDMENUITEMS);
+s&6&1&list.gif&list[_1]&dir[_1]&golist('$currdir')&List current directory
+s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retrieve old version
+s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource
+s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource
+s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
+ENDMENUITEMS
+            }
+        } elsif (defined($env{'request.course.id'}) && 
+		 $env{'request.symb'} ne '') {
+	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
-s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
-s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&1
-s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
-s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource
-s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource
-s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
-s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
-s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2
-s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
+s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
+s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
+c&6&3
+c&8&1
+c&8&2
+s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2
+s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+	        $menuitems.=(<<ENDREALRES);
+s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+ENDREALRES
+	    }
+        }
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -236,31 +527,53 @@ ENDMENUITEMS
                 $buttons.=&clear(@rest);
             }
         }
+
         if ($textual) {
+	    my $addremote=0;
+	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } }
+	    my $inlinebuttons='';
+	    if ($addremote) {
 # Registered, textual output
-            my $utility=&utilityfunctions();
-            my $form=&serverform();
+
+		if ($env{'browser.interface'} eq 'textual') {
+		    $inlinebuttons=
+                        join('',map { (defined($_)?$_:'') } @inlineremote);
+		} else {
+		    $inlinebuttons=(<<ENDINLINE);
+<tr><td>$inlineremote[21]</td><td>&nbsp;</td><td>$inlineremote[23]</td></tr>
+<tr><td>$inlineremote[61]</td><td>$inlineremote[62]</td><td>$inlineremote[63]</td></tr>
+<tr><td>$inlineremote[71]</td><td>$inlineremote[72]</td><td>$inlineremote[73]</td></tr>
+<tr><td>$inlineremote[81]</td><td>$inlineremote[82]</td><td>$inlineremote[83]</td></tr>
+<tr><td>$inlineremote[91]</td><td>$inlineremote[92]</td><td>$inlineremote[93]</td></tr>
+ENDINLINE
+                }
+	    }
 	    $result =(<<ENDREGTEXT);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
-$utility
 </script>
 $timesync
 $newmail
-$buttons
-$hwkadd
-$editbutton
-$form
-<script>
-//END LON-CAPA Internal
+$tablestart
+$inlinebuttons
+$tableend
+<script type="text/javascript">
+// END LON-CAPA Internal
 </script>
 
 ENDREGTEXT
 # Registered, graphical output
         } else {
+	    my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+	    $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri));
+	    my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
+	    my $navstatus=&get_nav_status();
+	    my $clearcstr;
+
+	    if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
 	    $result = (<<ENDREGTHIS);
      
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -270,11 +583,12 @@ var swmenu=null;
           $timesync
           $newmail
           $buttons
-	  swmenu.currentURL=window.location.pathname;
-          swmenu.reloadURL=window.location.pathname+window.location.search;
-          swmenu.currentSymb="$ENV{'request.symb'}";
-          swmenu.reloadSymb="$ENV{'request.symb'}";
+	  swmenu.currentURL="$requri";
+          swmenu.reloadURL=swmenu.currentURL+window.location.search;
+          swmenu.currentSymb="$cursymb";
+          swmenu.reloadSymb="$cursymb";
           swmenu.currentStale=0;
+	  $navstatus
           $hwkadd
           $editbutton
     }
@@ -286,17 +600,15 @@ var swmenu=null;
              swmenu.switchbutton
              (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
 	  }
-          swmenu.clearbut(7,1);
           swmenu.clearbut(7,2);
           swmenu.clearbut(7,3);
           swmenu.menucltim=swmenu.setTimeout(
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
+ 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr',
 			  2000);
-
       }
 
-// END LON-CAPA Internal
+// END LON-CAPA Internal 
 </script>
 ENDREGTHIS
         }
@@ -311,7 +623,7 @@ ENDDONOTREGTEXT
 # Not registered, graphical
            $result = (<<ENDDONOTREGTHIS);
 
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -345,10 +657,14 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
+    if ($env{'request.state'} eq 'construct' ||
+	$env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
+    if ($env{'request.state'} eq 'construct' ||
+	$env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAstale();';
 }
 
@@ -356,18 +672,27 @@ sub unloadevents() {
 
 sub startupremote {
     my ($lowerurl)=@_;
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) {
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) {
      return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
     }
 #
 # The Remote actually gets launched!
 #
     my $configmenu=&rawconfig();
+    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+    my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
-<script>
-
+<script type="text/javascript">
+var timestart;
 function wheelswitch() {
+    if (typeof(document.wheel) != 'undefined') {
+	if (typeof(document.wheel.spin) != 'undefined') {
+	    var date=new Date();
+	    var waited=Math.round(30-((date.getTime()-timestart)/1000));
+	    document.wheel.spin.value=$message;
+	}
+    }
    if (window.status=='|') { 
       window.status='/'; 
    } else {
@@ -393,7 +718,7 @@ function wait() {
          $configmenu
          window.location='$lowerurl';  
       } else {
-         alert("Remote Control timed out. It is possible that it was blocked by pop-up window filters.");
+	  window.location='/adm/remote?action=collapse&url=$esclowerurl';
       }
    } else {
       wheelswitch();
@@ -402,8 +727,10 @@ function wait() {
 }
 
 function main() {
-   canceltim=setTimeout('tim=1;',60000);
+   canceltim=setTimeout('tim=1;',30000);
    window.status='-';
+   var date=new Date();
+   timestart=date.getTime();
    wait();
 }
 
@@ -413,7 +740,7 @@ ENDREMOTESTARTUP
 
 sub setflags() {
     return(<<ENDSETFLAGS);
-<script>
+<script type="text/javascript">
     menuloaded=0;
     tim=0;
 </script>
@@ -421,19 +748,38 @@ ENDSETFLAGS
 }
 
 sub maincall() {
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
     return(<<ENDMAINCALL);
-<script>
+<script type="text/javascript">
     main();
 </script>
 ENDMAINCALL
 }
+
+sub load_remote_msg {
+    my ($lowerurl)=@_;
+
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
+
+    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+    my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
+		    "/adm/remote?action=collapse?url=$esclowerurl");
+    return(<<ENDREMOTEFORM);
+<p>
+<form name="wheel">
+<input name="spin" type="text" size="60" />
+</form>
+</p>
+<p>$link</p>
+ENDREMOTEFORM
+}
 # ================================================================= Reopen menu
 
 sub reopenmenu {
-   if (($ENV{'browser.interface'} eq 'textual') ||
-       ($ENV{'environment.remote'} eq 'off')) { return ''; }
+   if (($env{'browser.interface'} eq 'textual') ||
+       ($env{'environment.remote'} eq 'off')) { return ''; }
    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
    return('window.open('.$nothing.',"'.$menuname.'","",false);');
@@ -443,8 +789,10 @@ sub reopenmenu {
 
 sub open {
     my $returnval='';
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { 
+	return '<script type="text/javascript">self.name="loncapaclient";</script>';
+    }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
@@ -459,8 +807,9 @@ ENDRESIZE
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
+self.name='loncapaclient';
 ENDOPEN
-    return '<script>'.$returnval.'</script>';
+    return '<script type="text/javascript">'.$returnval.'</script>';
 }
 
 
@@ -468,10 +817,13 @@ ENDOPEN
 
 sub clear {
     my ($row,$col)=@_;
-    unless (($ENV{'browser.interface'} eq 'textual') ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    unless (($env{'browser.interface'} eq 'textual') ||
+            ($env{'environment.remote'} eq 'off')) {
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
-   } else { return ''; }
+   } else { 
+       $inlineremote[10*$row+$col]='';
+       return ''; 
+   }
 }
 
 # ============================================ Switch a button or create a link
@@ -482,28 +834,67 @@ sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
-    unless (($ENV{'browser.interface'} eq 'textual')  ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    $top=&mt($top);
+    $bot=&mt($bot);
+    $desc=&mt($desc);
+    $img=&mt($img);
+    unless (($env{'browser.interface'} eq 'textual')  ||
+            ($env{'environment.remote'} eq 'off')) {
 # Remote
        return "\n".
  qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
-   } elsif ($ENV{'browser.interface'} eq 'textual') {
+   } elsif ($env{'browser.interface'} eq 'textual') {
 # Accessibility
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
-       $text=~s/\- //;
-       return "\n".($nobreak?' ':'<br />').
-        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
-        ($nobreak?'':$desc);
+       $text=~s/\s*\-\s*//gs;
+       if ($nobreak) {
+	   $inlineremote[10*$row+$col]=
+	       '<a href="javascript:'.$act.';">'.$text.'</a>';
+       } else {
+	   $inlineremote[10*$row+$col]="\n<br />".
+	       $desc.' <a href="javascript:'.$act.';">'.$text.'</a>';
+       }
    } else {
 # Inline Remote
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
-       $text=~s/\- //;
-       return "\n".($nobreak?' ':'<br />').
-        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
-        ($nobreak?'':$desc);
+       $text=~s/\s*\-\s*//gs;
+
+       my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+       if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
+       my $pic=
+	   '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
+	   ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
+	   ($nobreak==3?'right':'left').'" />';
+       if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) {
+# Accessibility
+	   if ($nobreak==3) {
+	       $inlineremote[10*$row+$col]="\n".
+		   '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.
+		   '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.
+		   '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
+	   } elsif ($nobreak) {
+	       $inlineremote[10*$row+$col]="\n<tr>".
+		   '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+		   '<a href="javascript:'.$act.';">'.$pic.
+		   '</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';
+	   } else {
+	       $inlineremote[10*$row+$col]="\n<tr>".
+		   '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+		   '<a href="javascript:'.$act.';">'.$pic.
+		   '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
+		   '</font></td></tr>';       
+	   }
+       } else {
+# Inline Menu
+	   $inlineremote[10*$row+$col]=
+		   '<a href="javascript:'.$act.';">'.$pic.
+		   '</a><font color="'.$font.'" size="2">'.$desc.
+		   '</font>';
+       }
    }
+    return '';
 }
 
 sub secondlevel {
@@ -522,39 +913,46 @@ sub secondlevel {
 
 sub openmenu {
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
     my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
     return "window.open(".$nothing.",'".$menuname."');";
 }
 
+sub inlinemenu {
+    @inlineremote=();
+    undef @inlineremote;
+    &rawconfig(1);
+    return join('',map { (defined($_)?$_:'') } @inlineremote);
+}
+
 sub rawconfig {
     my $textualoverride=shift;
     my $output='';
-    unless (($ENV{'browser.interface'} eq 'textual') ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    unless (($env{'browser.interface'} eq 'textual') ||
+            ($env{'environment.remote'} eq 'off')) {
        $output.=
  "window.status='Opening Remote Control';var swmenu=".&openmenu().
 "\nwindow.status='Configuring Remote Control ';";
     } else {
        unless ($textualoverride) { return ''; }
     }
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
-    my $adv=$ENV{'user.adv'};
-    my $author=$ENV{'user.author'};
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
+    my $adv=$env{'user.adv'};
+    my $author=$env{'user.author'};
     my $crs='';
-    if ($ENV{'request.course.id'}) {
-       $crs='/'.$ENV{'request.course.id'};
-       if ($ENV{'request.course.sec'}) {
-	   $crs.='_'.$ENV{'request.course.sec'};
+    if ($env{'request.course.id'}) {
+       $crs='/'.$env{'request.course.id'};
+       if ($env{'request.course.sec'}) {
+	   $crs.='_'.$env{'request.course.sec'};
        }
        $crs=~s/\_/\//g;
     }
-    my $pub=($ENV{'request.state'} eq 'published');
-    my $con=($ENV{'request.state'} eq 'construct');
-    my $rol=$ENV{'request.role'};
-    my $requested_domain = $ENV{'request.role.domain'};
+    my $pub=($env{'request.state'} eq 'published');
+    my $con=($env{'request.state'} eq 'construct');
+    my $rol=$env{'request.role'};
+    my $requested_domain = $env{'request.role.domain'};
     foreach (@desklines) {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;
@@ -576,28 +974,44 @@ sub rawconfig {
                $output.=&secondlevel(
 	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
             }
-        } elsif (($pro=~/p(\w+)/) && ($prt)) {
+        } elsif (($pro=~/^p(\w+)/) && ($prt)) {
 	    if (&Apache::lonnet::allowed($1,$prt)) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
             }
         } elsif ($pro eq 'course') {
-            if ($ENV{'request.course.fn'}) {
+            if ($env{'request.course.fn'}) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
 	    }
+        } elsif ($pro =~ /^courseenv_(.*)$/) {
+            my $key = $1;
+            if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {
+                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+            }
+        } elsif ($pro =~ /^course_(.*)$/) {
+            # Check for permissions inside of a course
+            if (($env{'request.course.id'}) &&
+                (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
+            ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
+                 )) {
+                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+	    }
         } elsif ($pro eq 'author') {
             if ($author) {
-                if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||
-                    (($prt eq 'rau') && ($ENV{'request.role'}=~/^au/))) {
+                if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) ||
+                    (($prt eq 'rau') && ($env{'request.role'}=~/^au/))) {
                     # Check that we are on the correct machine
                     my $cadom=$requested_domain;
-                    my $caname=$ENV{'user.name'};
+                    my $caname=$env{'user.name'};
                     if ($prt eq 'rca') {
 		       ($cadom,$caname)=
-                               ($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+                               ($env{'request.role'}=~/(\w+)\/(\w+)$/);
                     }                       
                     $act =~ s/\$caname/$caname/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);
-                    if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
+		    my $allowed=0;
+		    my @ids=&Apache::lonnet::current_machine_ids();
+		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		    if ($allowed) {
                         $output.=switch($caname,$cadom,
                                         $row,$col,$img,$top,$bot,$act,$desc);
                     }
@@ -605,21 +1019,25 @@ sub rawconfig {
             }
         }
     }
-    unless (($ENV{'browser.interface'} eq 'textual') ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    unless (($env{'browser.interface'} eq 'textual') ||
+            ($env{'environment.remote'} eq 'off')) {
        $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
+       if (&Apache::lonmsg::newmail()) { 
+	   $output.='swmenu.setstatus("you have","messages");';
+       }
     }
+
     return $output;
 }
 
 # ======================================================================= Close
 
 sub close {
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
-<script>
+<script type="text/javascript">
 window.status='Accessing Remote Control';
 menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
@@ -639,16 +1057,40 @@ sub footer {
 
 }
 
+sub nav_control_js {
+    my $nav=($env{'environment.remotenavmap'} eq 'on');
+    return (<<NAVCONTROL);
+    var w_loncapanav_flag="$nav";
+
+
+function gonav(url) {
+   if (w_loncapanav_flag != 1) {
+      gopost(url,'');
+   }  else {
+      navwindow=window.open(url,
+                  "loncapanav","height=600,width=400,scrollbars=1"); 
+   }
+}
+NAVCONTROL
+}
+
 sub utilityfunctions {
-    unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
-    my $currenturl=$ENV{'REQUEST_URI'};
-    my $currentsymb=$ENV{'request.symb'};
+    my $caller = shift;
+    unless (($env{'browser.interface'} eq 'textual')  ||
+        ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
+    my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+    $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl));
+    
+    my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
+    my $nav_control=&nav_control_js();
 return (<<ENDUTILITY)
 
     var currentURL="$currenturl";
     var reloadURL="$currenturl";
     var currentSymb="$currentsymb";
 
+$nav_control
+
 function go(url) {
    if (url!='' && url!= null) {
        currentURL = null;
@@ -678,13 +1120,69 @@ function gocmd(url,cmd) {
       this.document.server.submit();
    }
 }
+
+function gocstr(url,filename) {
+    if (url == '/adm/cfile?action=delete') {
+        this.document.cstrdelete.filename.value = filename
+        this.document.cstrdelete.submit();
+        return;
+    }
+    if (url == '/adm/printout') {
+        this.document.cstrprint.postdata.value = filename
+        this.document.cstrprint.curseed.value = 0;
+        this.document.cstrprint.problemtype.value = 0;
+        if (this.document.lonhomework) {
+            if ((this.document.lonhomework.rndseed) && (this.document.lonhomework.rndseed.value != null) && (this.document.lonhomework.rndseed.value != '')) {
+                this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value
+            }
+            if (this.document.lonhomework.problemtype) {
+		if (this.document.lonhomework.problemtype.value) {
+		    this.document.cstrprint.problemtype.value = 
+			this.document.lonhomework.problemtype.value;
+		} else if (this.document.lonhomework.problemtype.options) {
+		    for (var i=0; i<this.document.lonhomework.problemtype.options.length; i++) {
+			if (this.document.lonhomework.problemtype.options[i].selected) {
+			    if (this.document.lonhomework.problemtype.options[i].value != null && this.document.lonhomework.problemtype.options[i].value != '') { 
+				this.document.cstrprint.problemtype.value = this.document.lonhomework.problemtype.options[i].value
+				}
+			}
+		    }
+		}
+	    }
+	}
+        this.document.cstrprint.submit();
+        return;
+    }
+    if (url !='') {
+        this.document.constspace.filename.value = filename;
+        this.document.constspace.action = url;
+        this.document.constspace.submit();
+    }
+}
+
+function golist(url) {
+   if (url!='' && url!= null) {
+       currentURL = null;
+       currentSymb= null;
+       top.location.href=url;
+   }
+}
+
+
+
+function catalog_info() {
+   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+}
+
+function chat_win() {
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
+}
 ENDUTILITY
 }
 
 sub serverform {
     return(<<ENDSERVERFORM);
-
-<form name="server" action="/adm/logout" method="post">
+<form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />
@@ -692,51 +1190,106 @@ sub serverform {
 </form>
 ENDSERVERFORM
 }
+
+sub constspaceform {
+    return(<<ENDCONSTSPACEFORM);
+<form name="constspace" action="/adm/logout" method="post" target="_top">
+<input type="hidden" name="filename" value="" />
+</form>
+<form name="cstrdelete" action="/adm/cfile" method="post" target="_top">
+<input type="hidden" name="action" value="delete" /> 
+<input type="hidden" name="filename" value="" />
+</form>
+<form name="cstrprint" action="/adm/printout" target="_parent" method="post">
+<input type="hidden" name="postdata" value="" />
+<input type="hidden" name="curseed" value="" />
+<input type="hidden" name="problemtype" value="" />
+</form>
+
+ENDCONSTSPACEFORM
+}
+
+
+sub get_nav_status {
+    my $navstatus="swmenu.w_loncapanav_flag=";
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$navstatus.="1";
+    } else {
+	$navstatus.="-1";
+    }
+    return $navstatus;
+}
+
 # ================================================ Handler when called directly
 
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::no_cache($r);
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $utility=&utilityfunctions();
-    my $form=&serverform();
-    my $bodytag=&Apache::loncommon::bodytag('Main Menu');
-# ------------------------------------------------------------ Print the screen
-    $r->print(<<ENDHEADER);
-<html><head>
-<title>LON-CAPA Main Menu</title>
-<script>
+    my $form;
+    if ($env{'environment.remote'} ne 'off' &&
+	$env{'browser.interface'} ne 'textual') {
+	$form=&serverform();
+    }
+    my $function='student';
+    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+	$function='coordinator';
+    }
+    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
+	$function='admin';
+    }
+    if (($env{'request.role'}=~/^(au|ca)/) ||
+	($env{'request.noversionuri'}=~/^(\/priv|\~)/)) {
+	$function='author';
+    }
+    my $domain=&Apache::loncommon::determinedomain();
+    $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
+    $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+    $font=&Apache::loncommon::designparm($function.'.font',$domain);
+    my $script_tag;
+    if ($env{'environment.remote'} ne 'off') {
+        my $utility=&utilityfunctions('/adm/menu');
+        $script_tag=(<<ENDSCRIPT);
+<script type="text/javascript">
 $utility
 </script>
-</head>
-$bodytag
-ENDHEADER
-    $r->print(&rawconfig(1).$form);
-    $r->print('</body></html>');
+ENDSCRIPT
+    }
+# ---- Print the screen, pretend to be in text mode to generate text-based menu
+    unless ($env{'browser.interface'} eq 'textual') {
+	$env{'browser.interface'}='faketextual';
+	$env{'environment.remote'}='off';
+    }
+    $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag));
+    $r->print('<table>'.&inlinemenu().'</table>'.$form);
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
 # ================================================================ Main Program
 
 BEGIN {
-  if (! defined($readdesk)) {
-   {
-    my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-				  '/mydesk.tab');
-    while (my $configline=<$config>) {
-       $configline=(split(/\#/,$configline))[0];
-       $configline=~s/^\s+//;
-       chomp($configline);
-       if ($configline) {
-          $desklines[$#desklines+1]=$configline;
-       }
+    if (! defined($readdesk)) {
+	{
+	    my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
+	    if ( CORE::open( my $config,"<$tabfile") ) {
+		while (my $configline=<$config>) {
+		    $configline=(split(/\#/,$configline))[0];
+		    $configline=~s/^\s+//;
+		    chomp($configline);
+		    if ($configline) {
+			push(@desklines,$configline);
+		    }
+		}
+		CORE::close($config);
+	    }
+	}
+	$readdesk='done';
     }
-   }
-   $readdesk='done';
-  }
 }
 
 1;