--- loncom/interface/lonmenu.pm 2003/05/23 23:18:37 1.69 +++ loncom/interface/lonmenu.pm 2003/05/23 23:58:53 1.70 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.69 2003/05/23 23:18:37 www Exp $ +# $Id: lonmenu.pm,v 1.70 2003/05/23 23:58:53 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -164,7 +164,7 @@ sub registerurl { my $forcereg=shift; my $target = shift; my $result = ''; - + if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; } my $force_title=''; if ($ENV{'request.state'} eq 'construct') { $force_title=&Apache::lonxml::display_title(); @@ -184,8 +184,7 @@ sub registerurl { my $unloadfunction=''; unless (($ENV{'browser.interface'} eq 'textual') || ($ENV{'environment.remote'} eq 'off') || - ($ENV{'request.publicaccess'}) || - ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html')) { + ($ENV{'request.publicaccess'})) { my $reopen=&Apache::lonmenu::reopenmenu(); $loadfunction='swmenu='.$reopen.'swmenu.noclient=0;'; $unloadfunction='swmenu='.$reopen.'swmenu.noclient=1;'; @@ -216,6 +215,7 @@ sub innerregister { my $forcereg=shift; my $target = shift; my $result = ''; + if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; } $Apache::lonxml::registered=1; @@ -474,10 +474,12 @@ ENDDONOTREGTHIS } sub loadevents() { + if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAreg();'; } sub unloadevents() { + if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAstale();'; }