--- loncom/interface/lonparmset.pm	2003/10/10 16:56:16	1.133
+++ loncom/interface/lonparmset.pm	2003/11/18 22:21:00	1.137
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.133 2003/10/10 16:56:16 www Exp $
+# $Id: lonparmset.pm,v 1.137 2003/11/18 22:21:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -285,7 +285,7 @@ sub plink {
 
 
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname,$have_assesments)=@_;
+    my ($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader)=@_;
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
@@ -354,7 +354,9 @@ sub startpage {
 $selscript
 </head>
 $bodytag
+ENDHEAD
 
+    unless ($trimheader) {$r->print(<<ENDHEAD2);
 <form method="post" action="/adm/parmset" name="envform">
 <h4>$lt{'cep'}</h4>
 <input type="submit" name="crsenv" value="$lt{'scep'}" />
@@ -370,9 +372,12 @@ $bodytag
 <input type="submit" name="overview" value="$lt{'mcap'}" />
 </form>
 <hr />
+ENDHEAD2
+}
+    $r->print(<<ENDHEAD3);
 <form method="post" action="/adm/parmset" name="parmform">
 <h4>$lt{'captm'}</h4>
-ENDHEAD
+ENDHEAD3
 
     if (!$have_assesments) {
 	$r->print('<font color="red">'.&mt('There are no assesment parameters in this course to set.').'</font><br />');	
@@ -485,21 +490,23 @@ sub print_row {
         } # end of $brief if/else
     } # end of $parmlev if/else
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
-        $r->print('<td bgcolor=#CCCCFF align="center">'.
+    $r->print('<td bgcolor=#CCCCFF align="center">'.
                   &valout($outpar[$result],$typeoutpar[$result]).'</td>');
-    }
-    my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
+
+    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+        my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                         '.'.$$name{$which},$symbp{$rid});
+
 # this doesn't seem to work, and I don't think is correct
 #    my $sessionvaltype=&Apache::lonnet::EXT('resource.'.$$part{$which}.
 #                                      '.'.$$name{$which}.'.type',$symbp{$rid});
 # this seems to work
-    my $sessionvaltype=$typeoutpar[$result];
-    if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
-    $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
+        my $sessionvaltype=$typeoutpar[$result];
+        if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
+        $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
                   &valout($sessionval,$sessionvaltype).'&nbsp;'.
                   '</font></td>');
+    }
     $r->print('</tr>');
     $r->print("\n");
 }
@@ -518,20 +525,6 @@ sub print_td {
     $r->print('</td>'."\n");
 }
 
-sub get_env_multiple {
-    my ($name) = @_;
-    my @values;
-    if (defined($ENV{$name})) {
-        # exists is it an array
-        if (ref($ENV{$name})) {
-            @values=@{ $ENV{$name} };
-        } else {
-            $values[0]=$ENV{$name};
-        }
-    }
-    return(@values);
-}
-
 =pod
 
 =item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
@@ -693,14 +686,15 @@ sub assessparms {
     $udom=$ENV{'form.udom'};
     unless ($udom) { $udom=$r->dir_config('lonDefDomain'); }
 
-    my @pscat=&get_env_multiple('form.pscat');
+    my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
     my $pschp=$ENV{'form.pschp'};
-    my @psprt=&get_env_multiple('form.psprt');
+    my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
     my $showoptions=$ENV{'form.showoptions'};
 
     my $pssymb='';
     my $parmlev='';
+    my $trimheader='';
     my $prevvisit=$ENV{'form.prevvisit'};
 
 #    unless ($parmlev==$ENV{'form.parmlev'}) {
@@ -723,11 +717,13 @@ sub assessparms {
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
+        $trimheader='yes';
     } elsif ($ENV{'form.symb'}) {
 	$pssymb=$ENV{'form.symb'};
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
+        $trimheader='yes';
     } else {
 	$ENV{'form.url'}='';
     }
@@ -917,7 +913,7 @@ sub assessparms {
     my $have_assesments=1;
     if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
 
-    &startpage($r,$id,$udom,$csec,$uname,$have_assesments);
+    &startpage($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader);
 
     if (!$have_assesments) {
 	untie(%bighash);
@@ -1301,8 +1297,8 @@ ENDTABLEHEADFOUR
                 my $showtitle=$maptitles{$maptitle}.($maptitle!~/^uploaded/?' ['.$maptitle.']':'');
                 $r->print(<<ENDMAPONE);
 <center><h4>
-<font color="red">Set Defaults for All Resources in $foldermap<br />
-<i>$showtitle</i><br />
+Set Defaults for All Resources in $foldermap<br />
+<font color="red"><i>$showtitle</i></font><br />
 Specifically for
 ENDMAPONE
                 if ($uname) {
@@ -1310,17 +1306,17 @@ ENDMAPONE
                       ('firstname','middlename','lastname','generation', 'id'));
                     my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
                            .$name{'lastname'}.' '.$name{'generation'};
-                    $r->print(&mt("User")." <i>$uname \($person\) </i> ".
+                    $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
                         &mt('in')." \n");
                 } else {
-                    $r->print("<i>".&mt('all').'</i> '.&mt('users in')." \n");
+                    $r->print("<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n");
                 }
             
-                if ($csec) {$r->print(&mt("Section")." <i>$csec</i> ".
+                if ($csec) {$r->print(&mt("Section")." <font color=\"red\"><i>$csec</i></font> ".
 				      &mt('of')." \n")};
 
-                $r->print("<i>$coursename</i><br />");
-                $r->print("</font></h4>\n");
+                $r->print("<font color=\"red\"><i>$coursename</i></font><br />");
+                $r->print("</h4>\n");
 #---------------------------------------------------------------- print table
                 $r->print('<p><table border="2">');
                 $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
@@ -1384,21 +1380,20 @@ ENDMAPONE
 	    my $setdef=&mt("Set Defaults for All Resources in Course");
             $r->print(<<ENDMAPONE);
 <center><h4>$setdef
-<font color="red">
-<i>$coursename</i><br />
+<font color="red"><i>$coursename</i></font><br />
 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")." <i>$uname \($person\) </i> \n");
+                $r->print(" ".&mt("User")."<font color=\"red\"> <i>$uname \($person\) </i></font> \n");
             } else {
-                $r->print("<i>".&mt("ALL")."</i> ".&mt("USERS")." \n");
+                $r->print("<i><font color=\"red\"> ".&mt("ALL")."</i> ".&mt("USERS")."</font> \n");
             }
             
-            if ($csec) {$r->print(&mt("Section")." <i>$csec</i>\n")};
-            $r->print("</font></h4>\n");
+            if ($csec) {$r->print(&mt("Section")."<font color=\"red\"> <i>$csec</i></font>\n")};
+            $r->print("</h4>\n");
 #---------------------------------------------------------------- print table
             $r->print('<p><table border="2">');
             $r->print('<tr><th>'.&mt('Parameter Name').'</th>');