--- loncom/auth/lonroles.pm 2004/05/09 00:45:00 1.91 +++ loncom/auth/lonroles.pm 2004/07/21 19:54:43 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.91 2004/05/09 00:45:00 www Exp $ +# $Id: lonroles.pm,v 1.95 2004/07/21 19:54:43 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,14 +40,20 @@ use Apache::lonannounce; use Apache::lonlocal; sub redirect_user { - my ($r,$title,$url,$msg) = @_; + my ($r,$title,$url,$msg,$launch_nav) = @_; $msg = $title if (! defined($msg)); &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; my $swinfo=&Apache::lonmenu::rawconfig(); + if ($launch_nav eq 'on') { + $swinfo.=&Apache::lonnavmaps::launch_win('now','no'); + } my $bodytag=&Apache::loncommon::bodytag('Switching Role'); - $r->print (<print(<$title @@ -57,6 +63,7 @@ $bodytag $swinfo

$msg

+Continue ENDREDIR @@ -243,7 +250,8 @@ ENDENTERKEY # # Send the user to the course they selected &redirect_user($r,&mt('Entering Course'), - $furl,$msg); + $furl,$msg, + $ENV{'environment.remotenavmap'}); return OK; } } @@ -277,10 +285,7 @@ ENDENTERKEY my $swinfo=&Apache::lonmenu::rawconfig(); my $bodytag=&Apache::loncommon::bodytag('User Roles'); - my $helptag='
'.&Apache::loncommon::help_open_topic - ("General_Intro",&mt("Click here for help")).''. - &Apache::loncommon::help_open_faq(1,&mt('Click here for FAQ')).''. - &Apache::loncommon::help_open_bug('',&mt('Click here to report bugs')).'
'; + my $helptag='
'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'
'; $r->print(<