--- loncom/interface/lonmenu.pm 2003/06/04 22:05:22 1.74 +++ loncom/interface/lonmenu.pm 2003/09/17 23:40:25 1.91 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.74 2003/06/04 22:05:22 www Exp $ +# $Id: lonmenu.pm,v 1.91 2003/09/17 23:40:25 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,15 +44,29 @@ use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); use Apache::loncommon; use Apache::File; +use Apache::lonlocal; + use vars qw(@desklines $readdesk); + + my @inlineremote; my $font; my $tabbg; my $pgbg; +# ================================================================ Little texts + +sub initlittle { + return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', + 'nav' => 'Navigate Contents', + 'main' => 'Main Menu', + 'launch' => 'Launch Remote Control'); +} + # ============================= This gets called at the top of the body section sub menubuttons { + &Apache::lonlocal::reroutetrans(); my $forcereg=shift; my $target =shift; my $registration=shift; @@ -62,16 +76,17 @@ sub menubuttons { my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'}); if ($ENV{'browser.interface'} eq 'textual') { # Textual display only + my %lt=&initlittle(); if ($ENV{'request.course.id'}) { $navmaps=(<Navigate Contents +$lt{'nav'} ENDNAV if (($ENV{'REQUEST_URI'}=~/^\/adm\//) && ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) && ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(<Return to Last Location +$lt{'ret'} ENDRELOAD } } @@ -79,7 +94,7 @@ ENDRELOAD -Main Menu +$lt{'main'} $reloadlink $navmaps
'; -} - # ====================================== This gets called in the header section sub registerurl { + &Apache::lonlocal::reroutetrans(); my $forcereg=shift; my $target = shift; my $result = ''; @@ -185,32 +195,11 @@ sub registerurl { if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'environment.remote'} eq 'off') || ((($ENV{'request.publicaccess'}) || - (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) && + (!&Apache::lonnet::is_on_map( + &Apache::lonnet::unescape($ENV{'REQUEST_URI'})))) && (!$forcereg))) { - my $loadfunction=''; - my $inlineloadfunction=''; - my $unloadfunction=''; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off') || - ($ENV{'request.publicaccess'})) { - my $reopen=&Apache::lonmenu::reopenmenu(); - $loadfunction='swmenu='.$reopen.'swmenu.windowloaded(self.name);window.focus();'; - $inlineloadfunction=®flush(); - $unloadfunction='swmenu='.$reopen.'swmenu.windowunloaded(self.name);'; - } - return $result.(< -function LONCAPAreg() { - $loadfunction -} - -function LONCAPAstale() { - $unloadfunction -} - -$inlineloadfunction -$force_title -ENDFUNCTIONS + return $result. + ''.$force_title; } # Graphical display after login only if ($Apache::lonxml::registered && !$forcereg) { return ''; } @@ -222,6 +211,7 @@ ENDFUNCTIONS # =========== and in the body of the document sub innerregister { + &Apache::lonlocal::reroutetrans(); my $forcereg=shift; my $target = shift; my $result = ''; @@ -244,7 +234,7 @@ sub innerregister { $newmail='
'; } if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) { - my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'}); + my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'}); $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; my $maptitle=&Apache::lonnet::gettitle($mapurl); my $restitle=&Apache::lonnet::gettitle($resurl); @@ -258,7 +248,7 @@ sub innerregister { } if (&Apache::lonmsg::newmail()) { $newmail=($textual? - 'You have new messages
': + 'You have new messages
': 'swmenu.setstatus("you have","messages");'); } if ($noremote) { @@ -274,17 +264,23 @@ sub innerregister { my $hwkadd=''; if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) { - if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) { - $hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions', + my $crs='/'.$ENV{'request.course.id'}; + if ($ENV{'request.course.sec'}) { + $crs.='_'.$ENV{'request.course.sec'}; + } + $crs=~s/\_/\//g; + + if (&Apache::lonnet::allowed('vgr',$crs)) { + $hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions', "gocmd('/adm/grades','submission')", 'View user submissions for this assessment resource'); } - if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) { + if (&Apache::lonnet::allowed('mgr',$crs)) { $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades', "gocmd('/adm/grades','gradingmenu')", 'Modify user grades for this assessment resource'); } - if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { + if (&Apache::lonnet::allowed('opa',$crs)) { $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms', "gocmd('/adm/parmset','set')", 'Modify deadlines, etc, for this assessment resource'); @@ -352,14 +348,20 @@ sub innerregister { c&3&1 s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1 s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3 -s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information -s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource -s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource +c&6&3 +c&8&1 +c&8&2 s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2 -s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2 s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2 ENDMENUITEMS + unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { + $menuitems.=(< @@ -401,13 +405,12 @@ var swmenu=null; function LONCAPAreg() { swmenu=$reopen; - swmenu.windowloaded(self.name); swmenu.clearTimeout(swmenu.menucltim); $timesync $newmail $buttons - swmenu.currentURL=window.location.pathname; - swmenu.reloadURL=window.location.pathname+window.location.search; + swmenu.currentURL="$requri"; + swmenu.reloadURL=swmenu.currentURL+window.location.search; swmenu.currentSymb="$ENV{'request.symb'}"; swmenu.reloadSymb="$ENV{'request.symb'}"; swmenu.currentStale=0; @@ -429,7 +432,6 @@ var swmenu=null; 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)', 2000); - swmenu.windowunloaded(self.name); } // END LON-CAPA Internal @@ -453,7 +455,6 @@ var swmenu=null; function LONCAPAreg() { swmenu=$reopen - swmenu.windowloaded(self.name); $timesync swmenu.currentStale=1; swmenu.clearbut(2,1); @@ -470,8 +471,6 @@ var swmenu=null; } function LONCAPAstale() { - swmenu=$reopen - swmenu.windowunloaded(self.name); } // END LON-CAPA Internal @@ -629,6 +628,9 @@ sub switch { my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; + $top=&mt($top); + $bot=&mt($bot); + $desc=&mt($desc); unless (($ENV{'browser.interface'} eq 'textual') || ($ENV{'environment.remote'} eq 'off')) { # Remote @@ -638,7 +640,7 @@ sub switch { # Accessibility if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; - $text=~s/\- //; + $text=~s/\s*\-\s*//gs; $inlineremote[10*$row+$col]="\n".($nobreak?' ':'
'). ''.$text.' '. ($nobreak?'':$desc); @@ -646,7 +648,7 @@ sub switch { # Inline Remote if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; - $text=~s/\- //; + $text=~s/\s*\-\s*//gs; $inlineremote[10*$row+$col]="\n". ($nobreak==3?'		send_http_header; return OK if $r->header_only; + &Apache::lonlocal::clearreroutetrans(); + my $form=&serverform(); my $bodytag=&Apache::loncommon::bodytag('Main Menu'); my $function='student'; @@ -901,6 +913,7 @@ $utility $bodytag ENDHEADER $r->print(''.&inlinemenu().'
'.$form); + $r->print(&Apache::lonlocal::endreroutetrans()); $r->print(''); return OK; }