--- loncom/interface/lonmenu.pm	2006/06/30 04:23:29	1.190
+++ loncom/interface/lonmenu.pm	2006/07/14 19:49:46	1.196
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.190 2006/06/30 04:23:29 raeburn Exp $
+# $Id: lonmenu.pm,v 1.196 2006/07/14 19:49:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,7 +118,7 @@ sub menubuttons {
 ENDNAV
             if (($env{'request.noversionuri'}=~/^\/adm\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|grppg|bulletinboard|aboutme)(\?|$)/)) {
+         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
@@ -129,11 +129,11 @@ ENDRELOAD
 <a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
 ENDDOCS
             }
-            if ($showgroups) {
-                $groups =(<<ENDGROUPS);
-<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
-ENDGROUPS
-            }
+#            if ($showgroups) {
+#                $groups =(<<ENDGROUPS);
+#<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a>
+#ENDGROUPS
+#            }
 	}
         my $form=&serverform();
         my $utility=&utilityfunctions();
@@ -198,12 +198,12 @@ my $is_group = (&Apache::loncommon::cour
 <td><a href="/adm/coursedocs" target="_top">$text</a></td>
 ENDDOCS
             }
-            if ($showgroups) {
-                my $text = ($is_group) ? $lt{'teams'} : $lt{'groups'};
-                $groups =(<<ENDGROUPS);
-<td><a href="/adm/coursegroups" target="_top">$text</a></td>
-ENDGROUPS
-            }
+#            if ($showgroups) {
+#                my $text = ($is_group) ? $lt{'teams'} : $lt{'groups'};
+#                $groups =(<<ENDGROUPS);
+#<td><a href="/adm/coursegroups" target="_top">$text</a></td>
+#ENDGROUPS
+#            }
 	    if (
 		($env{'request.noversionuri'}=~m[^/(res|public)/] &&
 		 $env{'request.symb'} eq '')
@@ -211,7 +211,7 @@ ENDGROUPS
 		(($env{'request.noversionuri'}=~/^\/adm\//) &&
 		 ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
 		 ($env{'request.noversionuri'}!~
-		        m[^/adm/.*/(smppg|grppg|bulletinboard|aboutme)($|\?)])
+		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
 		  )
 		 ) {
                 my $escreload=&escape('return:');
@@ -237,6 +237,13 @@ ENDCRELOAD
 	if ($env{'user.adv'}) {
 	    $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
 	}
+        my $helptopic='Student_Intro';
+        if ($env{'request.role'}=~/^(ca|au)/) {
+	    $helptopic='Authoring_Intro';
+	} elsif ($env{'request.role'}=~/^cc/) {
+	    $helptopic='Course_Coordination_Intro';
+	}
+        my $helplink=&Apache::loncommon::help_open_topic($helptopic,'Help');
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
@@ -246,6 +253,8 @@ $utility
 </script>
 <table id="LC_top_nav">
 <tr>
+<td class="LC_top_nav_logo">
+<a href="/adm/about.html"><img src="$logo" alt="LON-CAPA Logo" align="left" border="0" /></a></td>
 <td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink
 $navmaps
@@ -253,8 +262,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">LON-CAPA<img src="$logo" alt="Logo" /></td>
+<td>$helplink</td>
+<td class="LC_top_logout"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 </tr>
 </table>
 $form
@@ -383,7 +392,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
         ###
@@ -442,10 +451,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);
             }
         }
         ###
@@ -481,7 +487,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|grppg|navmaps|syllabus|aboutme)(\?|$)/) {
+            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
@@ -777,7 +783,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>';