--- loncom/interface/Attic/lonremote.pm 2003/04/03 03:08:12 1.4 +++ loncom/interface/Attic/lonremote.pm 2003/05/23 21:18:56 1.7 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonremote.pm,v 1.4 2003/04/03 03:08:12 www Exp $ +# $Id: lonremote.pm,v 1.7 2003/05/23 21:18:56 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,7 +50,7 @@ sub launchremote { my $startupremote=&Apache::lonmenu::startupremote($lowerurl); my $setflags=&Apache::lonmenu::setflags(); my $maincall=&Apache::lonmenu::maincall(); - my $bodytag=&Apache::loncommon::bodytag('Launch Remote Control'); + my $bodytag=&Apache::loncommon::bodytag('Launch Remote Control',undef,' '); $r->print(< @@ -60,6 +60,7 @@ $startupremote $bodytag $setflags $windowinfo +$maincall ENDLAUNCH @@ -68,12 +69,15 @@ ENDLAUNCH sub collapseremote { my ($r,$lowerurl)=@_; # -------------------------------------------------------- Menu script and info - my $bodytag=&Apache::loncommon::bodytag('Collapse Remote Control'); + my $bodytag=&Apache::loncommon::bodytag('Collapse Remote Control',undef, + ' '); my $windowinfo=&Apache::lonmenu::close(); + my $switch=''; $r->print(< The LearningOnline Network with CAPA +$switch $bodytag $windowinfo @@ -86,7 +90,8 @@ ENDCOLLAPSE sub handler { my $r = shift; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['action','url']); unless ($ENV{'form.action'}) { if ($ENV{'environment.remote'} eq 'on') { $ENV{'form.action'}='collapse'; @@ -94,9 +99,10 @@ sub handler { $ENV{'form.action'}='launch'; } } -# FIXME - testurl - my $lowerurl='/adm/roles'; -### + + my $lowerurl=$ENV{'form.url'}; + unless ($lowerurl) { $lowerurl='/adm/menu'; } + if ($ENV{'form.action'} eq 'launch') { &launchremote($r,$lowerurl); } else {