--- loncom/auth/lonroles.pm 2004/07/03 19:44:53 1.93 +++ loncom/auth/lonroles.pm 2004/08/03 18:53:27 1.97 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.93 2004/07/03 19:44:53 albertel Exp $ +# $Id: lonroles.pm,v 1.97 2004/08/03 18:53:27 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,12 +40,18 @@ 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(); + my $navwindow; + if ($launch_nav eq 'on') { + $navwindow.=&Apache::lonnavmaps::launch_win('now'); + } else { + $navwindow.=&Apache::lonnavmaps::close(); + } my $bodytag=&Apache::loncommon::bodytag('Switching Role'); # Note to style police: # This must only replace the spaces, nothing else, or it bombs elsewhere. @@ -56,10 +62,12 @@ sub redirect_user { $bodytag - +$navwindow

$msg

+Continue ENDREDIR @@ -246,7 +254,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; } } @@ -280,7 +289,7 @@ ENDENTERKEY my $swinfo=&Apache::lonmenu::rawconfig(); my $bodytag=&Apache::loncommon::bodytag('User Roles'); - my $helptag='
'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,'').'
'; + 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(< @@ -452,7 +461,7 @@ ENDHEADER $Apache::lonnet::hostname{$home}. '/adm/login?domain='.$ENV{'user.domain'}. '&username='.$ENV{'user.name'}. - '&firsturl=/priv/'.$trest); + '&firsturl=/priv/'.$trest.'/'); } #next if ($home eq 'no_host'); $home = $Apache::lonnet::hostname{$home}; @@ -476,7 +485,7 @@ ENDHEADER $Apache::lonnet::hostname{$home}. '/adm/login?domain='.$ENV{'user.domain'}. '&username='.$ENV{'user.name'}. - '&firsturl=/priv/'.$ENV{'user.name'}); + '&firsturl=/priv/'.$ENV{'user.name'}.'/'); } #next if ($home eq 'no_host'); $home = $Apache::lonnet::hostname{$home};