--- loncom/interface/lonmenu.pm 2003/04/03 03:08:12 1.50 +++ loncom/interface/lonmenu.pm 2003/04/03 21:32:23 1.54 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.50 2003/04/03 03:08:12 www Exp $ +# $Id: lonmenu.pm,v 1.54 2003/04/03 21:32:23 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -67,18 +67,21 @@ ENDMAINMENU return $output."
"; } elsif ($ENV{'environment.remote'} eq 'off') { # Remote Control is switched off + my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'}); my $output=(< // BEGIN LON-CAPA Internal +
Main Menu -Launch Remote Control +Launch Remote Control +
ENDINLINEMENU if ($registration) { $output.=&innerregister($forcereg,$target); } - return $output."
"; + return $output."
"; } else { return ''; } @@ -98,6 +101,7 @@ sub registerurl { "\n\n"; } if (($ENV{'browser.interface'} eq 'textual') || + ($ENV{'environment.remote'} eq 'off') || ((($ENV{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) && (!$forcereg))) { @@ -364,6 +368,8 @@ sub startupremote { # The Remote actually gets launched! # my $configmenu=&rawconfig(); + my $esclowerurl=&Apache::lonnet::escape($lowerurl); + return(< @@ -393,7 +399,7 @@ function wait() { $configmenu window.location='$lowerurl'; } else { - alert("Remote Control timed out. It is possible that it was blocked by pop-up window filters."); + window.location='/adm/remote?action=collapse&url=$esclowerurl'; } } else { wheelswitch(); @@ -402,7 +408,7 @@ function wait() { } function main() { - canceltim=setTimeout('tim=1;',60000); + canceltim=setTimeout('tim=1;',30000); window.status='-'; wait(); } @@ -640,7 +646,8 @@ sub footer { } sub utilityfunctions { - unless ($ENV{'browser.interface'} eq 'textual') { return ''; } + unless (($ENV{'browser.interface'} eq 'textual') || + ($ENV{'environment.remote'} eq 'off')) { return ''; } my $currenturl=$ENV{'REQUEST_URI'}; my $currentsymb=$ENV{'request.symb'}; return (<send_http_header; return OK if $r->header_only; - my $utility=&utilityfunctions(); my $form=&serverform(); my $bodytag=&Apache::loncommon::bodytag('Main Menu'); -# ------------------------------------------------------------ Print the screen +# ---- Print the screen, pretent to be in text mode to generate text-based menu + unless ($ENV{'brower.interface'} eq 'textual') { + $ENV{'environment.remote'}='off'; + } + my $utility=&utilityfunctions(); $r->print(< LON-CAPA Main Menu