--- loncom/auth/lonroles.pm 2005/11/01 21:59:24 1.131
+++ loncom/auth/lonroles.pm 2005/11/08 21:54:03 1.132
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.131 2005/11/01 21:59:24 albertel Exp $
+# $Id: lonroles.pm,v 1.132 2005/11/08 21:54:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -461,7 +461,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 {
@@ -589,8 +590,7 @@ ENDHEADER
$r->print('
'); } $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; @@ -616,7 +616,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"); @@ -765,40 +765,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. + ' | |||||||||||||||||||||