Select Parts | ');
@@ -1070,10 +1137,10 @@ sub assessparms {
if (($prevvisit) || ($pschp) || ($pssymb)) {
# ----------------------------------------------------------------- Start Table
my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
- my $csuname=$ENV{'user.name'};
- my $csudom=$ENV{'user.domain'};
+ my $csuname=$env{'user.name'};
+ my $csudom=$env{'user.domain'};
- if ($parmlev eq 'full' || $parmlev eq 'brief') {
+ if ($parmlev eq 'full') {
my $coursespan=$csec?8:5;
$r->print('');
$r->print(' | ');
@@ -1102,8 +1169,9 @@ sub assessparms {
$r->print(<$lt{'pie'}
$lt{'csv'} ($csuname $lt{'at'} $csudom) |
-
---|
| $lt{'rl'} |
-$lt{'ic'} |
+
---|
| $lt{'ic'} | $lt{'rl'} |
+$lt{'ic'} |
+
ENDTABLETWO
if ($csec) {
$r->print("".
@@ -1112,8 +1180,8 @@ ENDTABLETWO
$r->print(<$lt{'aut'} | $lt{'type'} |
$lt{'emof'} | $lt{'part'} | $lt{'pn'} |
-$lt{'def'} | $lt{'femof'} |
-$lt{'gen'} | $lt{'foremf'} | $lt{'fr'} |
+$lt{'gen'} | $lt{'foremf'} |
+$lt{'def'} | $lt{'femof'} | $lt{'fr'} |
ENDTABLEHEADFOUR
if ($csec) {
@@ -1134,18 +1202,20 @@ ENDTABLEHEADFOUR
my $rid=$_;
my ($inmapid)=($rid=~/\.(\d+)$/);
- if (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid}) ||
- ($pssymb eq $symbp{$rid})) {
+ if ((!$pssymb &&
+ (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
+ ||
+ ($pssymb && $pssymb eq $symbp{$rid})) {
# ------------------------------------------------------ Entry for one resource
- if ($defbgone eq '"E0E099"') {
- $defbgone='"E0E0DD"';
+ if ($defbgone eq '"#E0E099"') {
+ $defbgone='"#E0E0DD"';
} else {
- $defbgone='"E0E099"';
+ $defbgone='"#E0E099"';
}
- if ($defbgtwo eq '"FFFF99"') {
- $defbgtwo='"FFFFDD"';
+ if ($defbgtwo eq '"#FFFF99"') {
+ $defbgtwo='"#FFFFDD"';
} else {
- $defbgtwo='"FFFF99"';
+ $defbgtwo='"#FFFF99"';
}
my $thistitle='';
my %name= ();
@@ -1154,7 +1224,7 @@ ENDTABLEHEADFOUR
my %display=();
my %type= ();
my %default=();
- my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+ my $uri=&Apache::lonnet::declutter($uris{$rid});
foreach (split(/\,/,$keyp{$rid})) {
my $tempkeyp = $_;
@@ -1172,14 +1242,14 @@ ENDTABLEHEADFOUR
my $totalparms=scalar keys %name;
if ($totalparms>0) {
my $firstrow=1;
- my $title=$bighash{'title_'.$rid};
- $title=~s/\:/:/g;
+ my $title=&Apache::lonnet::gettitle($uri);
$r->print('
---|
'.
join(' / ',split(/\//,$uri)).
' '.
- "$title");
@@ -1207,16 +1277,16 @@ ENDTABLEHEADFOUR
undef $firstrow;
}
- &print_row($r,$_,\%part,\%name,$rid,\%default,
+ &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,
- $parmlev);
+ $parmlev,$uname,$udom,$csec);
}
}
}
} # end foreach ids
# -------------------------------------------------- End entry for one resource
$r->print(' | |
---|
');
- } # end of brief/full
+ } # end of full
#--------------------------------------------------- Entry for parm level map
if ($parmlev eq 'map') {
my $defbgone = '"E0E099"';
@@ -1253,7 +1323,7 @@ ENDTABLEHEADFOUR
# $r->print("$mapid:$map: $rid \n");
if ($map eq $mapid) {
- my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+ my $uri=&Apache::lonnet::declutter($uris{$rid});
# $r->print("Keys: $keyp{$rid} \n");
#--------------------------------------------------------------------
@@ -1287,8 +1357,8 @@ ENDTABLEHEADFOUR
my $showtitle=$maptitles{$maptitle}.($maptitle!~/^uploaded/?' ['.$maptitle.']':'');
$r->print(<
-Set Defaults for All Resources in $foldermap
-$showtitle
+Set Defaults for All Resources in $foldermap
+$showtitle
Specifically for
ENDMAPONE
if ($uname) {
@@ -1296,17 +1366,17 @@ ENDMAPONE
('firstname','middlename','lastname','generation', 'id'));
my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
.$name{'lastname'}.' '.$name{'generation'};
- $r->print(&mt("User")." $uname \($person\) ".
+ $r->print(&mt("User")." $uname \($person\) ".
&mt('in')." \n");
} else {
- $r->print("".&mt('all').' '.&mt('users in')." \n");
+ $r->print("".&mt('all').' '.&mt('users in')." \n");
}
- if ($csec) {$r->print(&mt("Section")." $csec ".
+ if ($csec) {$r->print(&mt("Section")." $csec ".
&mt('of')." \n")};
- $r->print("$coursename ");
- $r->print("\n");
+ $r->print("$coursename ");
+ $r->print("\n");
#---------------------------------------------------------------- print table
$r->print('');
$r->print(''.&mt('Parameter Name').' | ');
@@ -1314,9 +1384,10 @@ ENDMAPONE
$r->print(''.&mt('Parameter in Effect').' | ');
foreach (sort keys %name) {
- &print_row($r,$_,\%part,\%name,$mapid,\%default,
+ $r->print('');
+ &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,
- $parmlev);
+ $parmlev,$uname,$udom,$csec);
# $r->print(" resource.$part{$_}.$name{$_},$symbp{$mapid} | \n");
}
$r->print(" ");
@@ -1340,7 +1411,7 @@ ENDMAPONE
foreach (@ids) {
my $rid = $_;
- my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+ my $uri=&Apache::lonnet::declutter($uris{$rid});
#--------------------------------------------------------------------
# @catmarker contains list of all possible parameters including part #s
@@ -1370,21 +1441,20 @@ ENDMAPONE
my $setdef=&mt("Set Defaults for All Resources in Course");
$r->print(<$setdef
-
-$coursename
+$coursename
ENDMAPONE
if ($uname) {
my %name=&Apache::lonnet::userenvironment($udom,$uname,
('firstname','middlename','lastname','generation', 'id'));
my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
.$name{'lastname'}.' '.$name{'generation'};
- $r->print(" ".&mt("User")." $uname \($person\) \n");
+ $r->print(" ".&mt("User")." $uname \($person\) \n");
} else {
- $r->print("".&mt("ALL")." ".&mt("USERS")." \n");
+ $r->print(" ".&mt("ALL")." ".&mt("USERS")." \n");
}
- if ($csec) {$r->print(&mt("Section")." $csec\n")};
- $r->print("\n");
+ if ($csec) {$r->print(&mt("Section")." $csec\n")};
+ $r->print("\n");
#---------------------------------------------------------------- print table
$r->print('');
$r->print(''.&mt('Parameter Name').' | ');
@@ -1392,16 +1462,15 @@ ENDMAPONE
$r->print(''.&mt('Parameter in Effect').' | ');
foreach (sort keys %name) {
- &print_row($r,$_,\%part,\%name,$mapid,\%default,
- \%type,\%display,$defbgone,$defbgtwo,$parmlev);
+ $r->print('');
+ &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+ \%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
# $r->print(" resource.$part{$_}.$name{$_},$symbp{$mapid} | \n");
}
$r->print(" ");
} # end of $parmlev eq general
}
$r->print(' |