--- loncom/interface/lonmenu.pm	2005/04/07 06:56:23	1.152
+++ loncom/interface/lonmenu.pm	2005/06/08 02:27:21	1.155
@@ -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.155 2005/06/08 02:27:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -304,10 +304,11 @@ sub innerregister {
 	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }
     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;
         }
@@ -344,15 +345,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 +418,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 +547,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(