--- loncom/auth/lonroles.pm 2005/07/08 10:39:49 1.126 +++ loncom/auth/lonroles.pm 2005/11/15 21:39:28 1.136 @@ -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.136 2005/11/15 21:39:28 raeburn 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(); } @@ -88,6 +89,9 @@ sub handler { # ================================================================== Roles Init if ($env{'form.selectrole'}) { + if ($env{'form.newrole'}) { + $env{'form.'.$env{'form.newrole'}}=1; + } if ($env{'request.course.id'}) { my %temp=('logout_'.$env{'request.course.id'} => time); &Apache::lonnet::put('email_status',\%temp); @@ -243,7 +247,7 @@ ENDENTERKEY "request.course.id" => $cdom.'_'.$cnum); $furl='/adm/roles?tryagain=1'; $msg= - '

'. + '

'. &mt('Could not initialize course at this time.'). '

'.&mt('Please try again.').'

'.$ferr; } @@ -311,6 +315,8 @@ ENDENTERKEY my $swinfo=&Apache::lonmenu::rawconfig(); my $bodytag=&Apache::loncommon::bodytag('User Roles'); + my $standby=&mt('Role selected. Please stand by.'); + $standby=~s/\n/\\n/g; 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(< @@ -322,6 +328,20 @@ $helptag
ENDHEADER @@ -361,7 +381,7 @@ ENDHEADER } else { if ($env{'user.error.msg'}) { $r->print( - '

'. + '

'. &mt('You need to choose another user role or enter a specific course for this function').'

'); } } @@ -395,6 +415,7 @@ ENDHEADER $r->print('
'); $r->print(''); $r->print(''); + $r->print(''); } if ($env{'user.adv'}) { $r->print( @@ -415,7 +436,7 @@ ENDHEADER if ($envkey=~/^user\.role\./) { my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont); &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); - next if (!defined($role) || $role eq ''); + next if (!defined($role) || $role eq '' || $role =~ /^gr/); $tremark=''; $tpstart=' '; $tpend=' '; @@ -430,34 +451,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++; @@ -466,7 +481,8 @@ ENDHEADER my $trole; if ($role =~ /^cr\//) { my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); - $tremark.='
'.&mt('Defined by ').$rauthor. + if ($tremark) { $tremark.='
'; } + $tremark.=&mt('Defined by ').$rauthor. &mt(' at ').$rdomain.'.'; $trole=$rrole; } else { @@ -484,11 +500,7 @@ ENDHEADER foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } if (!$allowed) { $button=0; - $switchserver=&Apache::lonnet::escape('http://'. - $Apache::lonnet::hostname{$home}. - '/adm/login?domain='.$env{'user.domain'}. - '&username='.$env{'user.name'}. - '&firsturl=/priv/'.$trest.'/'); + $switchserver='otherserver='.$home.'&role='.$trolecode; } #next if ($home eq 'no_host'); $home = $Apache::lonnet::hostname{$home}; @@ -563,7 +575,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; @@ -598,10 +610,9 @@ ENDHEADER $r->print('
'); unless ($nochoose) { $r->print(''); } $r->print(''."\n"); + ''."\n"); my $doheaders=-1; - foreach my $type ('Construction Space','Course','Domain','System') { + foreach my $type ('Domain','Construction Space','Course','System') { my $haverole=0; foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { @@ -618,6 +629,9 @@ ENDHEADER foreach (sort(keys(%recent_roles))) { if (defined($roletext{'user.role.'.$_})) { $output.=$roletext{'user.role.'.$_}; + if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) { + $output .= &allcourses_row($1); + } } elsif ($numdc > 0) { unless ($_ =~/^error\:/) { $output.=&display_cc_role('user.role.'.$_); @@ -625,7 +639,7 @@ ENDHEADER } } if ($output) { - $r->print(""); $r->print($output); $r->print(""); @@ -637,7 +651,7 @@ ENDHEADER $r->print(&coursepick_jscript()); $r->print(&Apache::loncommon::coursebrowser_javascript()); } - foreach my $type ('Construction Space','Course','Domain','System') { + foreach my $type ('Construction Space','Domain','Course','System') { my $output; foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { @@ -652,7 +666,7 @@ ENDHEADER if ($output) { if ($doheaders > 0) { $r->print("". - ""); + ""); } $r->print($output); } @@ -668,13 +682,13 @@ ENDHEADER } unless ($nochoose) { if ($env{'request.role'} ne 'cm') { - $r->print(''); } else { $r->print(''); } } - $r->print(''."\n"); @@ -684,7 +698,7 @@ ENDHEADER } # ------------------------------------------------------------ Privileges Info if (($advanced) && (($env{'user.error.msg'}) || ($error))) { - $r->print('

Current Privileges

'); + $r->print('

Current Privileges

'); foreach $envkey (sort keys %env) { if ($envkey=~/^user\.priv\.$env{'request.role'}\./) { @@ -772,42 +786,52 @@ sub role_status { } sub build_roletext { - my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tbghigh,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_; - my $roletext=''; + my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_; + my $roletext=''; + my $is_dc=($trolecode =~ m/^dc\./); + my $rowspan=($is_dc) ? '' + : ' rowspan="2" '; + unless ($nochoose) { + my $buttonname=$trolecode; + $buttonname=~s/\W//g; if (!$button) { if ($switchserver) { - $roletext.=''; } else { $roletext.=(''); } } elsif ($tstatus eq 'is') { - $roletext.=(''); + $roletext.=''; } elsif ($tryagain) { $roletext.= - ''; + ''; } elsif ($advanced) { $roletext.= - ''; + ''; } else { - $roletext.=''; + $roletext.=' '; } } $tremark.=&Apache::lonannounce::showday(time,1, &Apache::lonannounce::readcalendar($tdom.'_'.$trest)); - $roletext.=''."\n"; + ''; + if (!$is_dc) { + $roletext.=''."\n"; + } return $roletext; } @@ -904,7 +928,7 @@ function process_pick(dom) { if (pickedCourse != '') { if (numbutton != -1) { var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse - opener.document.rolechoice.elements[numbutton+1].name = courseTarget + opener.document.rolechoice.elements[numbutton].name = courseTarget opener.document.rolechoice.submit() } } @@ -938,7 +962,6 @@ sub display_cc_role { my $trole = Apache::lonnet::plaintext('cc'); my $twhere; my $tbg='#77FF77'; - my $tbghigh='#99CC77'; my $tfont='#003300'; my %newhash=&Apache::lonnet::coursedescription($tcourseid); if (%newhash) { @@ -951,7 +974,7 @@ sub display_cc_role { $env{'course.'.$tcourseid.'.description'}=$twhere; } $twhere.="
".&mt('Domain').":".$1; - $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tbghigh,$tfont,$trole,&mt('Course'),$twhere,'','','',1,''); + $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,''); } } return $roletext; @@ -961,19 +984,14 @@ sub allcourses_row { my $dcdom = shift; my $ccrole = Apache::lonnet::plaintext('cc'); my $selectlink = &courselink($dcdom); - my $output = ''. - ''. - ''. - ''."\n"; + my $output = ''. + ''. + ''. + ''."\n"; return $output; }
 '.&mt('User Role').''.&mt('Extent'). - ''.&mt('Start').''.&mt('End').''. - &mt('Remarks and Calendar Announcements').'
'.&mt('Start').''.&mt('End').'
". + $r->print("
". &mt('Recent Roles')."
".&mt($type)."
".&mt($type)."
 '.&mt('No role specified'). + $r->print(''.&mt('No role specified'). ''.$tremark. ' 
'.&mt('Switch Server').'  '.$trole. ''.$twhere. ''.$tpstart. ''.$tpend. - ''.$tremark. - ' 
'.$tremark. + ' 
'. - ''. - $ccrole.''.&mt('All courses').': '. - $selectlink.''. - '
'.&mt('Domain').':'.$dcdom.''. - '		'. - &mt('Course Coordinator access to all courses in domain'). - ': '.$dcdom.'
'. + ''.$ccrole.''. + ' '.$selectlink.''. + ' from '.&mt('Domain').' '.$dcdom. + '