--- loncom/interface/lonmenu.pm 2006/06/29 18:43:33 1.188 +++ loncom/interface/lonmenu.pm 2006/07/01 00:39:54 1.191 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.188 2006/06/29 18:43:33 albertel Exp $ +# $Id: lonmenu.pm,v 1.191 2006/07/01 00:39:54 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|bulletinboard|aboutme)(\?|$)/)) { + ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|grppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} @@ -175,8 +175,8 @@ ENDMAINMENU $lt{'exit'} - LON-CAPALogo - + LON-CAPALogo + ENDINLINEMENU @@ -211,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:'); @@ -442,10 +442,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 +478,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.=(<'.$returnval.'';