--- loncom/interface/lonmenu.pm	2004/11/11 23:45:36	1.128
+++ loncom/interface/lonmenu.pm	2007/07/16 01:57:38	1.220
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.128 2004/11/11 23:45:36 albertel Exp $
+# $Id: lonmenu.pm,v 1.220 2007/07/16 01:57:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,20 +39,19 @@
 package Apache::lonmenu;
 
 use strict;
-use Apache::lonnet();
-use Apache::Constants qw(:common);
+use Apache::lonnet;
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
+use LONCAPA qw(:DEFAULT :match);
 
-use vars qw(@desklines $readdesk);
+use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
 
 
 my @inlineremote;
-my $font;
-my $tabbg;
-my $pgbg;
+
+
 
 # ================================================================ Little texts
 
@@ -60,122 +59,212 @@ sub initlittle {
     return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
 				       'nav' => 'Navigate Contents',
 				       'main' => 'Main Menu',
-				       'launch' => 'Launch Remote Control');
+                                       'roles' => ($env{'user.adv'}?
+                                                    'Roles':'Courses'),
+                                       'docs' => 'Edit Course',
+                                       'exit' => 'Exit',
+                                       'login' => 'Log In',
+				       'launch' => 'Launch Remote Control',
+                                       'groups' => 'Groups',
+                                       'gdoc' => 'Group Documents',
+                                       );
 }
 
 # ============================= This gets called at the top of the body section
 
 sub menubuttons {
     my $forcereg=shift;
-    my $target  =shift;
     my $registration=shift;
+    my $titletable=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['inhibitmenu']);
-    if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
+    if (($env{'form.inhibitmenu'} eq 'yes') ||
+        ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
 
+    if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+
+    my %lt=&initlittle();
     my $navmaps='';
     my $reloadlink='';
-    my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}));
-    my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'}));
-    if ($ENV{'browser.interface'} eq 'textual') {
+    my $docs='';
+    my $groups='';
+    my $showgroups=0;
+    my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
+    my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+
+    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+    $logo = '<td class="LC_top_nav_logo"><a href="/adm/about.html"><img src="'.
+	$logo.'" alt="LON-CAPA Logo" /></a></td>';
+
+    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 = &escape($returnurl);
+        }
+    }
+    if ($env{'request.course.id'}) {
+        my %coursegroups;
+        my $viewgrps_permission =
+	    &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+        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
-	my %lt=&initlittle();
-        $pgbg='#FFFFFF';
-        $tabbg='#FFFFFF';
-	$font='#000000';
-        if ($ENV{'request.course.id'}) {
+        if ($env{'request.course.id'}) {
 	    $navmaps=(<<ENDNAV);
-<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
+<a href="/adm/navmaps?postdata=$escurl&amp;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:');
+            if (($env{'request.noversionuri'}=~/^\/adm\//) &&
+         ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+                my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
+<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
 ENDRELOAD
             }
-        }
+	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+               $docs=(<<ENDDOCS);
+<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
+ENDDOCS
+            }
+            if ($showgroups) {
+                $groups =(<<ENDGROUPS);
+<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a>
+ENDGROUPS
+            }
+	}
+        my $form=&serverform();
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 $utility
 </script>
+<div id="LC_top_nav">
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
-$reloadlink $navmaps<br />
-<script>
+$reloadlink $navmaps $docs $groups
+<a href="/adm/roles" target="_top">$lt{'roles'}</a>
+<a href="/adm/logout" target="_top">$lt{'exit'}</a>
+</div>
+<br />
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
+$form
 ENDMAINMENU
-        if ($registration) { $output.=&innerregister($forcereg,$target); }
+        if ($registration) { $output.=&innerregister($forcereg); }
 	return $output."<hr />";
-    } elsif ($ENV{'environment.remote'} eq 'off') {
+    } elsif ($env{'environment.remote'} eq 'off') {
 # Remote Control is switched off
 # 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 $function =&Apache::loncommon::get_users_function();
         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') {
+	    return (<<ENDINLINEMENU);
+   <table id="LC_top_nav">
+    <tr>
+      $logo
+      <td></td>
+      <td class="LC_top_nav_login">
+        <a href="/adm/roles" target="_top">$lt{'login'}</a>
+     </td>
+    </tr>
+  </table>
+</font>
+ENDINLINEMENU
+        }
 # Do we have a NAV link?
-        if ($ENV{'request.course.id'}) {
-        	    $navmaps=(<<ENDNAV);
-<td bgcolor="$tabbg">
-<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
+        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><a href="$link" target="_top">$lt{'nav'}</a></td>
 ENDNAV
-	    if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
-                ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-         ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
-                my $escreload=&Apache::lonnet::escape('return:');
+my $is_group = (&Apache::loncommon::course_type() eq 'Group');
+	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
+		$docs=(<<ENDDOCS);
+<td><a href="/adm/coursedocs" target="_top">$text</a></td>
+ENDDOCS
+            }
+            if ($showgroups) {
+                $groups =(<<ENDGROUPS);
+<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</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=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<td bgcolor="$tabbg">
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a></td>
+<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
 ENDRELOAD
             }
         }
+	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
+	    my $escreload=&escape('return:');
+	    $reloadlink=(<<ENDCRELOAD);
+<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
+ENDCRELOAD
+        }
         my $reg='';
         if ($registration) {
-           $reg=&innerregister($forcereg,$target);
+           $reg=&innerregister($forcereg,$titletable);
         }
+        my $form=&serverform();
 	my $utility=&utilityfunctions();
+	my $remote;
+	if ($env{'user.adv'}) {
+	    $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
+	}
+
+        my $helplink=&Apache::loncommon::top_nav_help('Help');
 	return (<<ENDINLINEMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
+// <![CDATA[
 $utility
+// ]]>
 </script>
-<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+<table id="LC_top_nav">
 <tr>
-<td bgcolor="$tabbg">
-<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
-</td>
+$logo
+<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink
 $navmaps
-<td bgcolor="$tabbg">
-<a href="/adm/remote?action=launch&url=$escurl" target="_top">
-<font color="$font">$lt{'launch'}</font></a></td>
-<td bgcolor="$tabbg">
-<img align="right" src="/adm/lonIcons/minilogo.gif" />
-<b>LON-CAPA</b></td>
+$docs
+$groups
+$remote
+<td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
+<td class="LC_top_nav_help">$helplink</td>
+<td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 </tr>
 </table>
-</font>
-<script>
+$form
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 $reg
@@ -188,34 +277,25 @@ ENDINLINEMENU
 # ====================================== This gets called in the header section
 
 sub registerurl {
-    my $forcereg=shift;
-    my $target = shift;
+    my ($forcereg) = @_;
     my $result = '';
-    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
     my $force_title='';
-    if ($ENV{'request.state'} eq 'construct') {
+    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{'environment.remote'} eq 'off') ||
-        ((($ENV{'request.publicaccess'}) || 
+    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'})))) &&
+	   &unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
  	return $result.
           '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
-    if ($Apache::lonxml::registered && !$forcereg) { return ''; }
-    if ($target ne 'edit') {
-	$result.=&innerregister($forcereg,$target);
-    }
+    if ($env{'request.registered'} && !$forcereg) { return ''; }
+    $result.=&innerregister($forcereg);
     return $result.$force_title;
 }
 
@@ -223,81 +303,93 @@ sub registerurl {
 # =========== and in the body of the document
 
 sub innerregister {
-    my $forcereg=shift;
-    my $target = shift;
+    my ($forcereg, $titletable) = @_;
     my $result = '';
     my ($uname,$thisdisfn);
-    my $const_space = ($ENV{'request.state'} eq 'construct');
+    my $const_space = ($env{'request.state'} eq 'construct');
+    my $is_const_dir = 0;
 
-    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
 
-    $Apache::lonxml::registered=1;
+    $env{'request.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;
+    undef(@inlineremote);
 
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
     if ($noremote) {
-	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+	$newmail='<table id="LC_nav_location"><tr>';
     }
-    if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
-	my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
-        $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+    if (&Apache::lonmsg::newmail()) { 
+	if ($textual) {
+	    $newmail.= '<td class="LC_new_mail">
+                   <a href="/adm/communicate" target="_top">'.
+		   &mt('You have new messages').'</a></td>';
+	} else {
+	    $newmail= 'swmenu.setstatus("you have","messages");';
+	}
+    } elsif (($textual) 
+	     && ($env{'request.symb'}) 
+	     && ($env{'request.course.id'})) {
+	$newmail.= '<td class="LC_current_location">';
+	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($resurl);
-        if ($maptitle) {
+	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" target="_top">You have new messages</a></b><br />':
-                          'swmenu.setstatus("you have","messages");');
+        $newmail.='&nbsp;&nbsp;&nbsp;</td>';
     }
-    if ($noremote) {
-	$newmail.='</td></tr></table></font>';
+    if ($env{'request.state'} eq 'construct') {
+        $newmail = $titletable;
+    } else {
+	if ($noremote) {
+	    $newmail.='</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" />':'');
+    my $tablestart=($noremote?'<table id="LC_menubuttons">':'').
+	($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
+    my $tableend=($noremote?'</table>':'').($textinter?'<a name="content" />':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    if (($ENV{'request.noversionuri'}!~/^\/(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'};
+	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',$crs)) {
-		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',
-                       "gocmd('/adm/grades','submission')",
-		       'View user submissions for this assessment resource');
-            }
+        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');
+            } 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 (&Apache::lonnet::allowed('opa',$crs)) {
+	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');
+			     'Modify parameter settings for this resource');
 	}
 # -- End Homework
         ###
@@ -305,17 +397,17 @@ sub innerregister {
         ### 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'}=~/($match_domain)\/($match_username)$/);
                     ($top,$bottom) = ('co con-','struct');
                     $action = "go('/priv/".$caname."');";
                     $desc = "Enter construction space as co-author";
@@ -335,9 +427,9 @@ sub innerregister {
             my $cfile='';
             my $cfuname='';
             my $cfudom='';
-            if ($ENV{'request.filename'}) {
-                my $file=&Apache::lonnet::declutter($ENV{'request.filename'});
-                $file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
+            if ($env{'request.filename'}) {
+                my $file=&Apache::lonnet::declutter($env{'request.filename'});
+                $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
                 # Check that the user has permission to edit this resource
                 ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
                 if (defined($cfudom)) {
@@ -353,7 +445,7 @@ sub innerregister {
             # Finally, turn the button on or off
             if ($cfile && !$const_space) {
                 $editbutton=&switch
-                    ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
+                    ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
             } elsif ($editbutton eq '') {
                 $editbutton=&clear(6,1);
@@ -365,64 +457,112 @@ sub innerregister {
         my $menuitems;
         if ($const_space) {
 	    my ($uname,$thisdisfn) =
-		($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
+		($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
             my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
-            $currdir =~ s#[^/]+$##;
-            $menuitems=(<<ENDMENUITEMS);
-s&6&1&list.gif&list[_1]&dir[_1]&go('$currdir')&List current directory
-s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retreive 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]&gopost('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
+            if ($currdir =~ m-/$-) {
+                $is_const_dir = 1;
+            } else {
+                $currdir =~ s#[^/]+$##;
+		my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
+		my $esc_currdir = &Apache::loncommon::escape_single($currdir);
+                $menuitems=(<<ENDMENUITEMS);
+s&6&1&list.gif&list[_1]&dir[_1]&golist('$esc_currdir')&List current directory
+s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
+s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
+s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
+s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
-        } else {
+            }
+        } elsif ( defined($env{'request.course.id'}) && 
+		 $env{'request.symb'} ne '' ) {
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
-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
+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
+s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&&1
+s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&&1
 ENDMENUITEMS
-            unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
-	        $menuitems.=(<<ENDREALRES);
+
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+		if (!$env{'request.enc'}) {
+		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+ENDREALRES
+                }
+	        $menuitems.=(<<ENDREALRES);
 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
 	    }
         }
+	if ($env{'request.uri'} =~ /^\/res/) {
+	    $menuitems .= (<<ENDMENUITEMS);
+s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+ENDMENUITEMS
+	}
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
-            if ($command eq 's') {
-		$buttons.=&switch('','',@rest);
-            } else {
-                $buttons.=&clear(@rest);
+            my $idx=10*$rest[0]+$rest[1];
+            if (&hidden_button_check() eq 'yes') {
+                if ($idx == 21 ||$idx == 23) {
+                    $buttons.=&switch('','',@rest);
+                } else {
+                    $buttons.=&clear(@rest);
+                }
+            } else {  
+                if ($command eq 's') {
+	            $buttons.=&switch('','',@rest);
+                } else {
+                    $buttons.=&clear(@rest);
+                }
             }
         }
+
         if ($textual) {
-# Registered, textual output
-            my $form=&serverform();
+	    my $addremote=0;
+	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } }
 	    my $inlinebuttons='';
-
-	    if ($ENV{'browser.interface'} eq 'textual') {
-		$inlinebuttons=
+	    if ($addremote) {
+# Registered, textual output
+		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>
+		} else {
+                    if ($env{'environment.icons'} eq 'iconsonly') {
+                        $inlinebuttons=(<<ENDARROWSINLINE);
+<tr><td>
+$inlineremote[21] $inlineremote[23]
+ENDARROWSINLINE
+                        if (&hidden_button_check() ne 'yes') {
+                            $inlinebuttons .= (<<ENDINLINEICONS);
+$inlineremote[61] $inlineremote[63]
+$inlineremote[71] $inlineremote[72] $inlineremote[73]
+$inlineremote[81] $inlineremote[82] $inlineremote[83]
+$inlineremote[91] $inlineremote[92] $inlineremote[93]</td></tr>
+ENDINLINEICONS
+                        }
+                    } else {
+			$inlinebuttons=(<<ENDFIRSTLINE);
+<tr><td>$inlineremote[21]</td><td>&nbsp;</td><td>$inlineremote[23]</td></tr>
+ENDFIRSTLINE
+                        if (&hidden_button_check() ne 'yes') { 
+                            $inlinebuttons .= (<<ENDINLINE);
 <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
 </script>
 $timesync
@@ -430,21 +570,23 @@ $newmail
 $tablestart
 $inlinebuttons
 $tableend
-$form
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 
 ENDREGTEXT
 # Registered, graphical output
         } else {
-	    my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
-	    $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri));
-	    my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
+	    my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+	    $requri=&Apache::lonenc::check_encrypt(&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;
 
@@ -471,16 +613,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,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
         }
@@ -495,7 +636,7 @@ ENDDONOTREGTEXT
 # Not registered, graphical
            $result = (<<ENDDONOTREGTHIS);
 
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -529,12 +670,14 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
-    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.state'} eq 'construct' ||
+	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
-    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.state'} eq 'construct' ||
+	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
     return 'LONCAPAstale();';
 }
 
@@ -542,18 +685,18 @@ 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 $esclowerurl=&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') {
@@ -610,7 +753,7 @@ ENDREMOTESTARTUP
 
 sub setflags() {
     return(<<ENDSETFLAGS);
-<script>
+<script type="text/javascript">
     menuloaded=0;
     tim=0;
 </script>
@@ -618,10 +761,10 @@ 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
@@ -630,12 +773,12 @@ ENDMAINCALL
 sub load_remote_msg {
     my ($lowerurl)=@_;
 
-    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 $esclowerurl=&Apache::lonnet::escape($lowerurl);
+    my $esclowerurl=&escape($lowerurl);
     my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
-		    "/adm/remote?action=collapse?url=$esclowerurl");
+		 "/adm/remote?action=collapse&amp;url=$esclowerurl");
     return(<<ENDREMOTEFORM);
 <p>
 <form name="wheel">
@@ -648,8 +791,8 @@ 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);');
@@ -659,8 +802,8 @@ sub reopenmenu {
 
 sub open {
     my $returnval='';
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { 
+    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'};
@@ -676,10 +819,10 @@ ENDRESIZE
     $returnval.=(<<ENDOPEN);
 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");
+"height=375,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>';
 }
 
 
@@ -687,8 +830,8 @@ 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 { 
        $inlineremote[10*$row+$col]='';
@@ -701,32 +844,39 @@ sub clear {
 # The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)".
 
 sub switch {
-    my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;
+    my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
     $top=&mt($top);
     $bot=&mt($bot);
     $desc=&mt($desc);
     $img=&mt($img);
-    unless (($ENV{'browser.interface'} eq 'textual')  ||
-            ($ENV{'environment.remote'} eq 'off')) {
+
+    my $idx=10*$row+$col;
+    $category_members{$cat}.=':'.$idx;
+
+    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/\s*\-\s*//gs;
        if ($nobreak) {
-	   $inlineremote[10*$row+$col]=
+	   $inlineremote[$idx]=
 	       '<a href="javascript:'.$act.';">'.$text.'</a>';
        } else {
-	   $inlineremote[10*$row+$col]="\n<br />".
+	   $inlineremote[$idx]="\n<br />".
 	       $desc.' <a href="javascript:'.$act.';">'.$text.'</a>';
        }
    } else {
 # Inline Remote
+       if ($env{'environment.icons'} ne 'classic') {
+          $img=~s/\.gif$/\.png/;
+       }
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\s*\-\s*//gs;
@@ -734,34 +884,37 @@ sub switch {
        my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
        if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
        my $pic=
-	   '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
+	   '<img 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')) {
+       if ($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.'">'.
+	       $inlineremote[$idx]="\n".
+		   '<td class="LC_menubuttons_text" align="right">'.$text.
+		   '</td><td class="LC_menubuttons_img" align="left">'.
 		   '<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>';
+	       $inlineremote[$idx]="\n<tr>".
+		   '<td class="LC_menubuttons_img" align="left">'.
+		   '<a href="javascript:'.$act.';">'.$pic.'</a></td>
+                    <td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>';
 	   } else {
-	       $inlineremote[10*$row+$col]="\n<tr>".
-		   '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+	       $inlineremote[$idx]="\n<tr>".
+		   '<td class="LC_menubuttons_img" align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
-		   '</font></td></tr>';       
+		   '</a></td><td class="LC_menubuttons_text" colspan="3">'.
+		   '<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>';
 	   }
        } else {
 # Inline Menu
-	   $inlineremote[10*$row+$col]=
-		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a><font color="'.$font.'" size="2">'.$desc.
-		   '</font>';
+           if ($env{'environment.icons'} eq 'iconsonly') {
+              $inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>';
+           } else {
+	      $inlineremote[$idx]=
+		   '<a class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
+		   '<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>';
+           }
        }
    }
     return '';
@@ -770,12 +923,12 @@ sub switch {
 sub secondlevel {
     my $output='';
     my 
-    ($uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc)=@_;
+    ($uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat)=@_;
     if ($prt eq 'any') {
-	   $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+	   $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
     } elsif ($prt=~/^r(\w+)/) {
         if ($rol eq $1) {
-           $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+           $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
         }
     }
     return $output;
@@ -783,98 +936,125 @@ 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;
+    undef(@inlineremote);
+    undef(%category_members);
     &rawconfig(1);
-    return join('',map { (defined($_)?$_:'') } @inlineremote);
+    my $output='<table id="LC_mainmenu"><tr>';
+    for (my $col=1; $col<=2; $col++) {
+        $output.='<td class="LC_mainmenu_column">';
+        for (my $row=1; $row<=8; $row++) {
+            foreach my $cat (keys(%category_members)) {
+               if ($category_positions{$cat} ne "$col,$row") { next; }
+               $output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
+               my %active=();
+               foreach my $menu_item (split(/\:/,$category_members{$cat})) {
+                  if ($inlineremote[$menu_item]) {
+                     $active{$menu_item}=1;
+                  }
+               }  
+               foreach my $item (sort(keys(%active))) {
+                  $output.=$inlineremote[$item];
+               }
+               $output.='</table>';
+            }
+         }
+         $output.="</td>";
+    }
+    $output.="</tr></table>";
+    return $output;
 }
 
 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'};
-    foreach (@desklines) {
-        my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_);
+    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 my $line (@desklines) {
+        my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
         $prt=~s/\$crs/$crs/g; 
         $prt=~s/\$requested_domain/$requested_domain/g;
+        if ($category_names{$cat}!~/\w/) { $cat='oth'; }
+        my $type = &Apache::loncommon::course_type();
+        if ($type eq 'Group') {
+            $desc = &convert_menu_function($desc,$type);
+        }
         if ($pro eq 'clear') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {
                $output.=&secondlevel(
-	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
+	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
 	} elsif ($pro eq 'smp') {
             unless ($adv) {
                $output.=&secondlevel(
-          $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
+          $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
             }
         } elsif ($pro eq 'adv') {
             if ($adv) {
                $output.=&secondlevel(
-	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
+	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
             }
         } elsif (($pro=~/^p(\w+)/) && ($prt)) {
 	    if (&Apache::lonnet::allowed($1,$prt)) {
-               $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+               $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
             }
         } elsif ($pro eq 'course') {
-            if ($ENV{'request.course.fn'}) {
-               $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+            if ($env{'request.course.fn'}) {
+               $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
 	    }
         } 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);
+            if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {
+                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
             }
         } 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'}:''))
+            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);
+                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
 	    }
         } 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'}=~/($match_domain)\/($match_username)$/);
                     }                       
                     $act =~ s/\$caname/$caname/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);
@@ -882,15 +1062,15 @@ sub rawconfig {
 		    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);
+                        $output.=&switch($caname,$cadom,
+                                        $row,$col,$img,$top,$bot,$act,$desc,$cat);
                     }
                 }
             }
         }
     }
-    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");';
@@ -903,11 +1083,11 @@ sub rawconfig {
 # ======================================================================= 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");
@@ -928,7 +1108,7 @@ sub footer {
 }
 
 sub nav_control_js {
-    my $nav=($ENV{'environment.remotenavmap'} eq 'on');
+    my $nav=($env{'environment.remotenavmap'} eq 'on');
     return (<<NAVCONTROL);
     var w_loncapanav_flag="$nav";
 
@@ -945,12 +1125,35 @@ NAVCONTROL
 }
 
 sub utilityfunctions {
-    unless (($ENV{'browser.interface'} eq 'textual')  ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
-    my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'});
+    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(&unescape($currenturl));
     
-    my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
+    my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
     my $nav_control=&nav_control_js();
+
+    my $start_page_annotate = 
+        &Apache::loncommon::start_page('Annotator',undef,
+				       {'only_body' => 1,
+					'js_ready'  => 1,
+					'bgcolor'   => '#BBBBBB',
+					'add_entries' => {
+					    'onload' => 'javascript:document.goannotate.submit();'}});
+
+    my $end_page_annotate = 
+        &Apache::loncommon::end_page({'js_ready' => 1});
+
+    my $start_page_bookmark = 
+        &Apache::loncommon::start_page('Bookmarks',undef,
+				       {'only_body' => 1,
+					'js_ready'  => 1,
+					'bgcolor'   => '#BBBBBB',});
+
+    my $end_page_bookmark = 
+        &Apache::loncommon::end_page({'js_ready' => 1});
+
 return (<<ENDUTILITY)
 
     var currentURL="$currenturl";
@@ -995,6 +1198,32 @@ function gocstr(url,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;
@@ -1002,6 +1231,15 @@ function gocstr(url,filename) {
     }
 }
 
+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');
@@ -1010,12 +1248,60 @@ function catalog_info() {
 function chat_win() {
    lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
 }
+
+function group_chat(group) {
+   var url = '/adm/groupchat?group='+group;
+   var winName = 'LONchat_'+group;
+   grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
+}
+
+function edit_bookmarks() {
+   go('');
+   w_BookmarkPal_flag=1;
+   bookmarkpal=window.open("/adm/bookmarks",
+               "BookmarkPal", "width=400,height=505,scrollbars=0");
+}
+
+function annotate() {
+   w_Annotator_flag=1;
+   annotator=window.open('','Annotator','width=365,height=265,scrollbars=0');
+   annotator.document.write(
+   '$start_page_annotate'
+  +"<form name='goannotate' target='Annotator' method='post' "
+  +"action='/adm/annotations'>"
+  +"<input type='hidden' name='symbnew' value='"+currentSymb+"' />"
+  +"<\\/form>"
+  +'$end_page_annotate');
+   annotator.document.close();
+}
+
+function set_bookmark() {
+   go('');
+   clienttitle=document.title;
+   clienthref=location.pathname;
+   w_bmquery_flag=1;
+   bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
+   bmquery.document.write(
+   '$start_page_bookmark'
+   +"<center><form method='post'"
+   +" name='newlink' action='/adm/bookmarks' target='bmquery' "
+   +">\\n <table width=340 height=150 "
+   +"bgcolor='ffffff' align=center><tr><td>Link Name:<br /><input "
+   +"type='text' name='title' size=45 value='"+clienttitle+"' />"
+   +"<br />Address:<br /><input type='text' name='address' size='45' "
+   +"value='"+clienthref+"' /><br /><center><input type='submit' "
+   +"value='Save' /> <input type='button' value='Close (no save)' "
+   +"onclick='javascript:window.close();' /><\\/center><\\/td>"
+   +"<\\/tr><\\/table><\\/form><\\/center>"
+   +'$end_page_bookmark' );
+   bmquery.document.close();
+}
+
 ENDUTILITY
 }
 
 sub serverform {
     return(<<ENDSERVERFORM);
-
 <form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
@@ -1034,13 +1320,19 @@ sub constspaceform {
 <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') {
+    if ($env{'environment.remotenavmap'} eq 'on') {
 	$navstatus.="1";
     } else {
 	$navstatus.="-1";
@@ -1048,68 +1340,54 @@ sub get_nav_status {
     return $navstatus;
 }
 
-# ================================================ Handler when called directly
-
-
-sub handler {
-    my $r = shift;
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    return OK if $r->header_only;
-
-    my $form=&serverform();
-    my $bodytag=&Apache::loncommon::bodytag('Main Menu');
-    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);
-# ---- Print the screen, pretent 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(<<ENDHEADER);
-<html><head>
-<title>LON-CAPA Main Menu</title>
-</head>
-$bodytag
-ENDHEADER
-    $r->print('<table>'.&inlinemenu().'</table>'.$form);
-    $r->print('</body></html>');
-    return OK;
+#FIXME this needs to move into mydesktab and the other locations 
+# the text is generated
+sub convert_menu_function {
+    my ($rolename,$type) = @_;
+    if ($type eq 'Group') {
+        $rolename =~ s/student/member/g;
+        $rolename =~ s/group/team/g;
+        $rolename =~ s/course/group/g;
+        $rolename =~ s/Course/Group/g;
+    }
+    return $rolename;
+}
+
+sub hidden_button_check {
+    my $hidden;
+    if ($env{'request.course.id'} eq '') {
+        return;
+    }
+    if ($env{'request.role.adv'}) {
+        return;
+    }
+    return(&Apache::lonnet::EXT('resource.0.buttonshide')); 
 }
 
 # ================================================================ Main Program
 
 BEGIN {
-  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) {
-                $desklines[$#desklines+1]=$configline;
-            }
-        }
-        CORE::close($config);
+    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=~/^cat\:/) {
+                       my @entries=split(/\:/,$configline);
+                       $category_positions{$entries[2]}=$entries[1];
+                       $category_names{$entries[2]}=$entries[3];
+		    } elsif ($configline) {
+			push(@desklines,$configline);
+		    }
+		}
+		CORE::close($config);
+	    }
+	}
+	$readdesk='done';
     }
-   }
-   $readdesk='done';
-  }
 }
 
 1;