--- loncom/auth/lonroles.pm 2004/07/03 19:44:53 1.93 +++ loncom/auth/lonroles.pm 2005/12/19 21:39:33 1.139 @@ -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.139 2005/12/19 21:39:33 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,22 +30,31 @@ package Apache::lonroles; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::lonuserstate(); use Apache::Constants qw(:common); use Apache::File(); use Apache::lonmenu; use Apache::loncommon; +use Apache::lonhtmlcommon; use Apache::lonannounce; use Apache::lonlocal; +use GDBM_File; 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',undef,undef, + ($url =~ m-/^adm/whatsnew-)); + } 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 +65,12 @@ sub redirect_user { $bodytag - +$navwindow