--- loncom/auth/lonroles.pm 2005/07/08 10:39:49 1.126 +++ loncom/auth/lonroles.pm 2005/08/09 20:06:40 1.128 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.126 2005/07/08 10:39:49 www Exp $ +# $Id: lonroles.pm,v 1.128 2005/08/09 20:06:40 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,7 +50,8 @@ sub redirect_user { my $swinfo=&Apache::lonmenu::rawconfig(); my $navwindow; if ($launch_nav eq 'on') { - $navwindow.=&Apache::lonnavmaps::launch_win('now'); + $navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef, + ($url eq '/adm/whatsnew')); } else { $navwindow.=&Apache::lonnavmaps::close(); } @@ -430,34 +431,28 @@ ENDHEADER $tstatus='selected'; } my $tbg; - my $tbghigh; if (($tstatus eq 'is') || ($tstatus eq 'selected') || ($env{'form.showall'})) { if ($tstatus eq 'is') { $tbg='#77FF77'; - $tbghigh='#99CC77'; $tfont='#003300'; $possiblerole=$trolecode; $countactive++; } elsif ($tstatus eq 'future') { $tbg='#FFFF77'; - $tbghigh='#DDDD55'; $button=0; } elsif ($tstatus eq 'will') { $tbg='#FFAA77'; $tremark.=&mt('Active at next login. '); } elsif ($tstatus eq 'expired') { $tbg='#FF7777'; - $tbghigh='#EE9955'; $tfont='#330000'; $button=0; } elsif ($tstatus eq 'will_not') { $tbg='#AAFF77'; - $tbghigh='#BBDD55'; $tremark.=&mt('Expired after logout. '); } elsif ($tstatus eq 'selected') { $tbg='#11CC55'; - $tbghigh='339944'; $tfont='#002200'; $inrole=1; $countactive++; @@ -563,7 +558,7 @@ ENDHEADER $sortkey=$role.$twhere; } - $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tbghigh,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver); + $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver); $roletext{$envkey}=$roletext; if (!$sortkey) {$sortkey=$twhere."\0".$envkey;} $sortrole{$sortkey}=$envkey; @@ -625,7 +620,7 @@ ENDHEADER } } if ($output) { - $r->print("