--- loncom/auth/lonroles.pm 2005/09/16 19:47:42 1.129 +++ loncom/auth/lonroles.pm 2005/11/08 22:08:12 1.133 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.129 2005/09/16 19:47:42 albertel Exp $ +# $Id: lonroles.pm,v 1.133 2005/11/08 22:08:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -244,7 +244,7 @@ ENDENTERKEY "request.course.id" => $cdom.'_'.$cnum); $furl='/adm/roles?tryagain=1'; $msg= - '
'); } $r->print(' | '.&mt('User Role').' | '.&mt('Extent'). - ' | '.&mt('Start').' | '.&mt('End').' | '. - &mt('Remarks and Calendar Announcements').' | '.&mt('Start').' | '.&mt('End').' | '."\n"); my $doheaders=-1; foreach my $type ('Domain','Construction Space','Course','System') { my $haverole=0; @@ -613,6 +609,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.'.$_); @@ -620,7 +619,7 @@ ENDHEADER } } if ($output) { - $r->print("||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
".
+ $r->print("".
&mt('Recent Roles')." | ");
$r->print($output);
$r->print("".&mt($type)." | | ".&mt($type)." | '); } } - $r->print(' | '.&mt('No role specified'). + $r->print(' | '.&mt('No role specified'). ' | '.$tremark. ' | '."\n"); @@ -769,40 +768,46 @@ sub role_status { sub build_roletext { my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_; my $roletext='||||||||||||||
'.&mt('Switch Server').' | '; } else { $roletext.=(''); } } elsif ($tstatus eq 'is') { - $roletext.=(' | '); } elsif ($tryagain) { $roletext.= - ' | '; } elsif ($advanced) { $roletext.= - ' | '; } else { - $roletext.=' | '; + $roletext.=' | '; } } $tremark.=&Apache::lonannounce::showday(time,1, &Apache::lonannounce::readcalendar($tdom.'_'.$trest)); - $roletext.=' | '.$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. + ' | |||||||||||||||||||||