--- loncom/auth/lonroles.pm 2003/12/05 14:18:00 1.78
+++ loncom/auth/lonroles.pm 2003/12/30 22:45:59 1.81
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.78 2003/12/05 14:18:00 sakharuk Exp $
+# $Id: lonroles.pm,v 1.81 2003/12/30 22:45:59 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -77,6 +77,17 @@ ENDREDIR
return;
}
+sub authorbombs {
+ my ($uname,$udom)=@_;
+ my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
+ foreach (keys %bombs) {
+ if ($_=~/^$udom\/$uname\//) {
+ return '
';
+ }
+ }
+ return '';
+}
+
sub handler {
my $r = shift;
@@ -238,7 +249,7 @@ ENDENTERKEY
my $swinfo=&Apache::lonmenu::rawconfig();
my $bodytag=&Apache::loncommon::bodytag('User Roles');
my $helptag=&Apache::loncommon::help_open_topic
- ("General_Intro","Click here for help");
+ ("General_Intro",&mt("Click here for help"));
$r->print(<
@@ -417,6 +428,7 @@ ENDHEADER
': '.$tdom.'
'.
' '.&mt('Server').': '.$home;
$ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+ $tremark.=&authorbombs($trest,$tdom);
$sortkey=$role."$trest:$tdom";
} elsif ($role eq 'au') {
# Authors
@@ -436,6 +448,7 @@ ENDHEADER
$twhere=&mt('Domain').': '.$tdom.'
'.&mt('Server').
': '.$home;
$ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+ $tremark.=&authorbombs($ENV{'user.name'},$tdom);
$sortkey=$role;
} elsif ($trest) {
$ttype='Course';
@@ -445,7 +458,7 @@ ENDHEADER
my $tcourseid=$tdom.'_'.$trest;
if ($ENV{'course.'.$tcourseid.'.description'}) {
$twhere=$ENV{'course.'.$tcourseid.'.description'};
- $sortkey=$tdom."\0".$twhere."\0".$envkey;
+ $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
unless ($twhere eq &mt('Currently not available')) {
$twhere.=' '.
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
@@ -455,7 +468,7 @@ ENDHEADER
my %newhash=Apache::lonnet::coursedescription
($tcourseid);
if (%newhash) {
- $sortkey=$tdom."\0".$newhash{'description'}.
+ $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
"\0".$envkey;
$twhere=$newhash{'description'}.
' '.
@@ -464,7 +477,7 @@ ENDHEADER
} else {
$twhere=&mt('Currently not available');
$ENV{'course.'.$tcourseid.'.description'}=$twhere;
- $sortkey=$tdom."\0".$twhere."\0".$envkey;
+ $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
}
}
if ($role ne 'st') { $twhere.="
".&mt('Domain').":".$tdom; }
@@ -540,7 +553,7 @@ ENDHEADER
if ($output) {
if ($doheaders > 0) {
$r->print("".
- "| $type | ");
+ "".&mt($type)." | ");
}
$r->print($output);
}