--- loncom/interface/lonmenu.pm 2005/04/07 06:56:23 1.152 +++ loncom/interface/lonmenu.pm 2005/12/01 19:00:46 1.164 @@ -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.164 2005/12/01 19:00:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,12 +78,13 @@ sub menubuttons { ['inhibitmenu']); if (($env{'form.inhibitmenu'} eq 'yes') || ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; } - + my %lt=&initlittle(); my $navmaps=''; my $reloadlink=''; my $docs=''; my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); + my $face= 'face="Arial,Helvetica,sans-serif"'; if ($env{'request.state'} eq 'construct') { if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { my $returnurl = $env{'request.filename'}; @@ -93,7 +94,6 @@ sub menubuttons { } if ($env{'browser.interface'} eq 'textual') { # Textual display only - my %lt=&initlittle(); $pgbg='#FFFFFF'; $tabbg='#FFFFFF'; $font='#000000'; @@ -106,12 +106,12 @@ ENDNAV ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(<$lt{'ret'} +$lt{'ret'} ENDRELOAD } if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $docs=(<$lt{'docs'} +$lt{'docs'} ENDDOCS } } @@ -124,8 +124,8 @@ $utility $lt{'main'} $reloadlink $navmaps $docs -$lt{'roles'} -$lt{'exit'} +$lt{'roles'} +$lt{'exit'}
- +
$reloadlink $navmaps $docs +$lt{'launch'} $form
-$lt{'main'} +$lt{'main'} -$lt{'launch'} -$lt{'roles'} +$lt{'roles'} -$lt{'exit'} +$lt{'exit'} - +Logo LON-CAPA
- @@ -301,13 +326,14 @@ sub innerregister { my $newmail=''; if ($noremote) { - $newmail='
'; + $newmail='
'; } 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 +351,7 @@ sub innerregister { $newmail = $titletable; } else { if ($noremote) { - $newmail.='
'; + $newmail.='
'; } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); @@ -343,16 +369,15 @@ 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'); - } + $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) { 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 +443,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 +572,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( @@ -1081,15 +1108,20 @@ function gocstr(url,filename) { this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value } if (this.document.lonhomework.problemtype) { - for (var i=0; i @@ -1166,6 +1197,7 @@ sub get_nav_status { sub handler { my $r = shift; + &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only;