| $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 +1208,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 +1230,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 +1248,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");
@@ -1209,7 +1285,7 @@ ENDTABLEHEADFOUR
&print_row($r,$_,\%part,\%name,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,
- $parmlev);
+ $parmlev,$uname,$udom,$csec);
}
}
}
@@ -1253,7 +1329,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");
#--------------------------------------------------------------------
@@ -1314,9 +1390,10 @@ ENDMAPONE
$r->print(' | '.&mt('Parameter in Effect').' |
|---|
');
foreach (sort keys %name) {
+ $r->print('');
&print_row($r,$_,\%part,\%name,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,
- $parmlev);
+ $parmlev,$uname,$udom,$csec);
# $r->print("
| resource.$part{$_}.$name{$_},$symbp{$mapid} |
\n");
}
$r->print("");
@@ -1340,7 +1417,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
@@ -1391,15 +1468,15 @@ ENDMAPONE
$r->print(''.&mt('Parameter in Effect').' |