--- loncom/interface/lonmenu.pm 2006/04/10 18:49:56 1.172 +++ loncom/interface/lonmenu.pm 2006/04/20 02:58:17 1.174 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.172 2006/04/10 18:49:56 albertel Exp $ +# $Id: lonmenu.pm,v 1.174 2006/04/20 02:58:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -84,7 +84,6 @@ sub get_colors { sub menubuttons { my $forcereg=shift; - my $target =shift; my $registration=shift; my $titletable=shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, @@ -164,7 +163,7 @@ $reloadlink $navmaps $docs $groups $form ENDMAINMENU - if ($registration) { $output.=&innerregister($forcereg,$target); } + if ($registration) { $output.=&innerregister($forcereg); } return $output."
"; } elsif ($env{'environment.remote'} eq 'off') { # Remote Control is switched off @@ -244,7 +243,7 @@ ENDCRELOAD } my $reg=''; if ($registration) { - $reg=&innerregister($forcereg,$target,$titletable); + $reg=&innerregister($forcereg,$titletable); } my $form=&serverform(); my $utility=&utilityfunctions(); @@ -294,20 +293,13 @@ ENDINLINEMENU # ====================================== This gets called in the header section sub registerurl { - my $forcereg=shift; - my $target = shift; + my ($forcereg) = @_; my $result = ''; if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } my $force_title=''; if ($env{'request.state'} eq 'construct') { $force_title=&Apache::lonxml::display_title(); } - if ($target eq 'edit') { - $result .="\n"; - } if (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off') || ((($env{'request.publicaccess'}) || @@ -318,10 +310,8 @@ sub registerurl { ''.$force_title; } # Graphical display after login only - if ($Apache::lonxml::registered && !$forcereg) { return ''; } - if ($target ne 'edit') { - $result.=&innerregister($forcereg,$target); - } + if ($env{'request.registered'} && !$forcereg) { return ''; } + $result.=&innerregister($forcereg); return $result.$force_title; } @@ -329,7 +319,7 @@ sub registerurl { # =========== and in the body of the document sub innerregister { - my ($forcereg, $target, $titletable) = @_; + my ($forcereg, $titletable) = @_; my $result = ''; my ($uname,$thisdisfn); my $const_space = ($env{'request.state'} eq 'construct'); @@ -337,7 +327,7 @@ sub innerregister { if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } - $Apache::lonxml::registered=1; + $env{'request.registered'} = 1; my $textinter=($env{'browser.interface'} eq 'textual'); my $noremote=($env{'environment.remote'} eq 'off');