--- loncom/interface/lonparmset.pm	2005/02/05 06:21:57	1.182
+++ loncom/interface/lonparmset.pm	2005/03/17 21:08:43	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.182 2005/02/05 06:21:57 albertel Exp $
+# $Id: lonparmset.pm,v 1.186 2005/03/17 21:08:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -195,6 +195,101 @@ sub parmval {
     return ($result,@outpar);
 }
 
+
+##################################################
+##################################################
+#
+# Store a parameter
+#
+# Takes
+# - resource id
+# - name of parameter
+# - level
+# - new value
+# - new type
+sub storeparm {
+    my ($sresid,$spnam,$snum,$nval,$ntype)=@_;
+    $spnam=~s/\_([^\_]+)$/\.$1/;
+# ---------------------------------------------------------- Construct prefixes
+    
+    my $symbparm=$symbp{$sresid}.'.'.$spnam;
+    my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
+    
+    my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
+    my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
+    
+    my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
+    my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
+    my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
+    
+    my $storeunder='';
+    if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
+    if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
+    if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
+    if ($snum==6) { $storeunder=$seclevel; }
+    if ($snum==5) { $storeunder=$seclevelm; }
+    if ($snum==4) { $storeunder=$seclevelr; }
+    
+    my $delete;
+    if ($nval eq '') { $delete=1;}
+    my %storecontent = ($storeunder         => $nval,
+			$storeunder.'.type' => $ntype);
+    my $reply='';
+    if ($snum>3) {
+# ---------------------------------------------------------------- Store Course
+#
+# Expire sheets
+	&Apache::lonnet::expirespread('','','studentcalc');
+	if (($snum==7) || ($snum==4)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
+	} elsif (($snum==8) || ($snum==5)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
+	} else {
+	    &Apache::lonnet::expirespread('','','assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	}
+    } else {
+# ------------------------------------------------------------------ Store User
+#
+# Expire sheets
+	&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+	if ($snum==1) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$symbp{$sresid});
+	} elsif ($snum==2) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$mapp{$sresid});
+	} else {
+	    &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],$udom,$uname);
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,$udom,$uname);
+	}
+    }
+    
+    if ($reply=~/^error\:(.*)/) {
+	return "<font color=red>Write Error: $1</font>";
+    }
+    return '';
+}
+
 ##################################################
 ##################################################
 
@@ -312,8 +407,9 @@ sub startpage {
     my $overallhelp=
 	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
     my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Parameters</title>
 <script>
@@ -814,85 +910,9 @@ sub assessparms {
 
 # ---------------------------------------------------------- Anything to store?
     if ($ENV{'form.pres_marker'}) {
-	my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
-	$spnam=~s/\_([^\_]+)$/\.$1/;
-# ---------------------------------------------------------- Construct prefixes
-
-	my $symbparm=$symbp{$sresid}.'.'.$spnam;
-	my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
-	
-	my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
-	my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
-	my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
-	
-	my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
-	my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
-	my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
-	
-	my $storeunder='';
-	if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
-	if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
-	if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
-	if ($snum==6) { $storeunder=$seclevel; }
-	if ($snum==5) { $storeunder=$seclevelm; }
-	if ($snum==4) { $storeunder=$seclevelr; }
-	
-	my $delete;
-	if ($ENV{'form.pres_value'} eq '') { $delete=1;}
-        my %storecontent = ($storeunder         => $ENV{'form.pres_value'},
-                            $storeunder.'.type' => $ENV{'form.pres_type'});
-	my $reply='';
-	if ($snum>3) {
-# ---------------------------------------------------------------- Store Course
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread('','','studentcalc');
-	    if (($snum==7) || ($snum==4)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
-	    } elsif (($snum==8) || ($snum==5)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread('','','assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-	    } else {
-		$reply=&Apache::lonnet::cput
-		    ('resourcedata',\%storecontent,
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-	    }
-	} else {
-# ------------------------------------------------------------------ Store User
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
-	    if ($snum==1) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$symbp{$sresid});
-	    } elsif ($snum==2) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],$udom,$uname);
-	    } else {
-		$reply=&Apache::lonnet::cput
-		    ('resourcedata',\%storecontent,$udom,$uname);
-	    }
-	}
-
-	if ($reply=~/^error\:(.*)/) {
-	    $message.="<font color=red>Write Error: $1</font>";
-	}
+	$message.=&storeparm(split(/\&/,$ENV{'form.pres_marker'}),
+			     $ENV{'form.pres_value'},
+			     $ENV{'form.pres_type'});
 # ---------------------------------------------------------------- Done storing
 	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
     }
@@ -988,9 +1008,9 @@ sub assessparms {
         $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
     }
 
-    $r->print('<tr><td colspan="3"><hr /><input type="checkbox"');
+    $r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
     if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show">'.&mt('Show More Options').'<hr /></td></tr>');
+    $r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
 #    $r->print("<tr><td>Show: $showoptions</td></tr>");
 #    $r->print("<tr><td>pscat: @pscat</td></tr>");
 #    $r->print("<tr><td>psprt: @psprt</td></tr>");
@@ -1184,15 +1204,15 @@ ENDTABLEHEADFOUR
 		    ||
 		    ($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=   ();
@@ -1757,12 +1777,13 @@ sub crsenv {
     my $Value=&mt('Value');
     my $Set=&mt('Set');
     my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDENV);
-<html>
+$html
+<head>
 <script type="text/javascript" language="Javascript" >
 $browse_js
 </script>
-<head>
 <title>LON-CAPA Course Environment</title>
 </head>
 $bodytag
@@ -1808,8 +1829,9 @@ sub overview {
                              'Set/Modify Course Assessment Parameters');
     my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Environment</title>
 </head>