--- loncom/interface/lonmenu.pm	2006/06/28 20:56:00	1.187
+++ loncom/interface/lonmenu.pm	2006/07/19 10:52:27	1.199
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.187 2006/06/28 20:56:00 albertel Exp $
+# $Id: lonmenu.pm,v 1.199 2006/07/19 10:52:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,9 +63,8 @@ sub initlittle {
                                        'docs' => 'Course Documents',
                                        'exit' => 'Exit',
 				       'launch' => 'Launch Remote Control',
-                                       'groups' => 'Course Groups',
+                                       'groups' => 'Groups',
                                        'gdoc' => 'Group Documents',
-                                       'teams' => 'Teams',
                                        );
 }
 
@@ -91,6 +90,10 @@ sub menubuttons {
     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'};
@@ -100,11 +103,11 @@ sub menubuttons {
     }
     if ($env{'request.course.id'}) {
         my %coursegroups;
-        my $viewgrps_permission =                                                
-                     &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+        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;
         }
@@ -131,7 +134,7 @@ ENDDOCS
             }
             if ($showgroups) {
                 $groups =(<<ENDGROUPS);
-<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
+<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a>
 ENDGROUPS
             }
 	}
@@ -168,18 +171,15 @@ ENDMAINMENU
         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);
    <table id="LC_top_nav">
     <tr>
-      <td>
+      $logo
+      <td></td>
+      <td class="LC_top_nav_exit">
         <a href="/adm/logout" target="_top">$lt{'exit'}</a>
      </td>
-     <td "LC_top_nav_logo">
-       <img align="right" src="$logo" alt="Logo" />
-       <b>LON-CAPA</b>&nbsp;
-     </td>
-   </tr>
+    </tr>
   </table>
 </font>
 ENDINLINEMENU
@@ -202,9 +202,8 @@ my $is_group = (&Apache::loncommon::cour
 ENDDOCS
             }
             if ($showgroups) {
-                my $text = ($is_group) ? $lt{'teams'} : $lt{'groups'};
                 $groups =(<<ENDGROUPS);
-<td><a href="/adm/coursegroups" target="_top">$text</a></td>
+<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
 ENDGROUPS
             }
 	    if (
@@ -235,11 +234,12 @@ ENDCRELOAD
         }
         my $form=&serverform();
 	my $utility=&utilityfunctions();
-	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	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 type="text/javascript">
 // BEGIN LON-CAPA Internal
@@ -249,6 +249,7 @@ $utility
 </script>
 <table id="LC_top_nav">
 <tr>
+$logo
 <td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink
 $navmaps
@@ -256,8 +257,8 @@ $docs
 $groups
 $remote
 <td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
-<td><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
-<td class="LC_top_nav_logo"><img align="right" src="$logo" alt="Logo" /><b>LON-CAPA</b></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>
 $form
@@ -386,7 +387,7 @@ sub innerregister {
 	    &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
         ###
@@ -445,10 +446,7 @@ sub innerregister {
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
             } elsif ($editbutton eq '') {
-                $editbutton=&switch('','',6,1,'port.gif',
-				    'port-[_1]','folio[_1]',
-				    "go('/adm/portfolio');",
-				    "Enter my portfolio space");
+                $editbutton=&clear(6,1);
             }
         }
         ###
@@ -780,7 +778,7 @@ 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 type="text/javascript">'.$returnval.'</script>';