--- loncom/interface/lonmenu.pm	2005/04/07 06:56:23	1.152
+++ loncom/interface/lonmenu.pm	2005/07/12 15:55:06	1.157
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.152 2005/04/07 06:56:23 albertel Exp $
+# $Id: lonmenu.pm,v 1.157 2005/07/12 15:55:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -157,6 +157,24 @@ ENDMAINMENU
         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='.
@@ -198,6 +216,8 @@ ENDRELOAD
         my $form=&serverform();
 	my $utility=&utilityfunctions();
 	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+	my $face= 'face="Arial,Helvetica,sans-serif"';
+
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
@@ -205,30 +225,29 @@ ENDRELOAD
 $utility
 // ]]>
 </script>
-<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+<table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
 <td bgcolor="$tabbg">
-<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
+<a href="/adm/menu" target="_top"><font $face color="$font">$lt{'main'}</font></a>
 </td>
 $reloadlink
 $navmaps
 $docs
 <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
-<font color="$font">$lt{'launch'}</font></a></td>
+<font $face color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
-<a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
+<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 color="$font">$lt{'exit'}</font></a>
+<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a>
 </td>
 <td bgcolor="$tabbg">
-<img align="right" src="$logo" />
+<img align="right" src="$logo" alt="Logo" />
 <b>LON-CAPA</b></td>
 $form
 </tr>
 </table>
-</font>
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -301,13 +320,14 @@ sub innerregister {
 
     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 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($env{'request.symb'});
+	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);
+	my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread());
         if ($maptitle && $maptitle ne 'default.sequence') {
 	    $newmail.=', '.$maptitle;
         }
@@ -325,7 +345,7 @@ sub innerregister {
         $newmail = $titletable;
     } else {
 	if ($noremote) {
-	    $newmail.='</td></tr></table></font>';
+	    $newmail.='</font></td></tr></table>';
 	}
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
@@ -344,15 +364,14 @@ sub innerregister {
         my $hwkadd='';
         if ($env{'request.symb'} ne '' &&
 	    $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 (&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 ($env{'request.symb'} ne '' &&
@@ -418,7 +437,10 @@ sub innerregister {
                     ('','',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");
             }
         }
         ###
@@ -544,7 +566,6 @@ 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(
@@ -1122,7 +1143,6 @@ 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" />