--- loncom/interface/lonmenu.pm 2004/11/30 19:08:18 1.131 +++ loncom/interface/lonmenu.pm 2004/12/03 22:10:39 1.135 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.131 2004/11/30 19:08:18 raeburn Exp $ +# $Id: lonmenu.pm,v 1.135 2004/12/03 22:10:39 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,6 +78,13 @@ sub menubuttons { my $reloadlink=''; my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'})); my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'})); + if ($ENV{'request.state'} eq 'construct') { + if (($ENV{'request.noversionuri'} eq '') || (!defined($ENV{'request.noversionuri'}))) { + my $returnurl = $ENV{'request.filename'}; + $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; + $escurl = &Apache::lonnet::escape($returnurl); + } + } if ($ENV{'browser.interface'} eq 'textual') { # Textual display only my %lt=&initlittle(); @@ -259,7 +266,7 @@ sub innerregister { $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; my $maptitle=&Apache::lonnet::gettitle($mapurl); my $restitle=&Apache::lonnet::gettitle($resurl); - if ($maptitle) { + if ($maptitle && $maptitle ne 'default.sequence') { $newmail.=', '.$maptitle; } if ($restitle) { @@ -544,12 +551,14 @@ ENDDONOTREGTHIS } sub loadevents() { - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($ENV{'request.state'} eq 'construct' || + $ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAreg();'; } sub unloadevents() { - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($ENV{'request.state'} eq 'construct' || + $ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAstale();'; } @@ -960,8 +969,9 @@ NAVCONTROL } sub utilityfunctions { + my $caller = shift; unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; } my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}); my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); @@ -1102,7 +1112,16 @@ sub handler { $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); $font=&Apache::loncommon::designparm($function.'.font',$domain); -# ---- Print the screen, pretent to be in text mode to generate text-based menu + my $script_tag; + if ($ENV{'environment.remote'} eq 'on') { + my $utility=&utilityfunctions('/adm/menu'); + $script_tag=(< +$utility + +ENDSCRIPT + } +# ---- Print the screen, pretend to be in text mode to generate text-based menu unless ($ENV{'browser.interface'} eq 'textual') { $ENV{'browser.interface'}='faketextual'; $ENV{'environment.remote'}='off'; @@ -1110,6 +1129,7 @@ sub handler { $r->print(< LON-CAPA Main Menu +$script_tag $bodytag ENDHEADER