--- loncom/interface/lonmenu.pm	2006/06/27 18:16:03	1.186
+++ loncom/interface/lonmenu.pm	2006/06/30 04:23:29	1.190
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.186 2006/06/27 18:16:03 albertel Exp $
+# $Id: lonmenu.pm,v 1.190 2006/06/30 04:23:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@ sub initlittle {
                                        'docs' => 'Course Documents',
                                        'exit' => 'Exit',
 				       'launch' => 'Launch Remote Control',
-                                       'groups' => 'Course Groups',
+                                       'groups' => 'Groups',
                                        'gdoc' => 'Group Documents',
                                        'teams' => 'Teams',
                                        );
@@ -100,11 +100,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'});
         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;
         }
@@ -118,7 +118,7 @@ sub menubuttons {
 ENDNAV
             if (($env{'request.noversionuri'}=~/^\/adm\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|grppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
@@ -175,11 +175,8 @@ ENDMAINMENU
       <td>
         <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>
+     <td class="LC_top_nav_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>
+    </tr>
   </table>
 </font>
 ENDINLINEMENU
@@ -202,7 +199,7 @@ my $is_group = (&Apache::loncommon::cour
 ENDDOCS
             }
             if ($showgroups) {
-                my $text = ($is_group) ? $lt{'groups'} : $lt{'teams'};
+                my $text = ($is_group) ? $lt{'teams'} : $lt{'groups'};
                 $groups =(<<ENDGROUPS);
 <td><a href="/adm/coursegroups" target="_top">$text</a></td>
 ENDGROUPS
@@ -214,7 +211,7 @@ ENDGROUPS
 		(($env{'request.noversionuri'}=~/^\/adm\//) &&
 		 ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
 		 ($env{'request.noversionuri'}!~
-		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+		        m[^/adm/.*/(smppg|grppg|bulletinboard|aboutme)($|\?)])
 		  )
 		 ) {
                 my $escreload=&escape('return:');
@@ -257,7 +254,7 @@ $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_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>
 </tr>
 </table>
 $form
@@ -484,7 +481,7 @@ s&8&3&prt.gif&prepare[_1]&printout[_1]&g
 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)(\?|$)/) {
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|grppg|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