--- loncom/homework/grades.pm	2006/07/02 01:03:04	1.369
+++ loncom/homework/grades.pm	2007/06/14 21:36:12	1.404
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.369 2006/07/02 01:03:04 banghart Exp $
+# $Id: grades.pm,v 1.404 2007/06/14 21:36:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::loncoursedata;
 use Apache::lonmsg();
 use Apache::Constants qw(:common);
 use Apache::lonlocal;
+use Apache::lonenc;
 use String::Similarity;
 use lib '/home/httpd/lib/perl';
 use LONCAPA;
@@ -101,10 +102,10 @@ sub get_symb {
 sub nameUserString {
     my ($type,$fullname,$uname,$udom) = @_;
     if ($type eq 'header') {
-	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>';
+	return '<b>&nbsp;Fullname&nbsp;</b><span class="LC_internal_info">(Username)</span>';
     } else {
-	return '&nbsp;'.$fullname.'<font color="#999999">&nbsp;('.$uname.
-	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+	return '&nbsp;'.$fullname.'<span class="LC_internal_info">&nbsp;('.$uname.
+	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';
     }
 }
 
@@ -112,43 +113,45 @@ sub nameUserString {
 #--- Indicate if a response type is coded handgraded or not. ---
 sub response_type {
     my ($symb) = shift;
-    my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
-    my $allkeys = &Apache::lonnet::metadata($url,'keys');
-    my %vPart;
-    foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
-	$vPart{$partid}=1;
-    }
-    my %seen = ();
-    my (@partlist,%handgrade,%responseType);
-    foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
-	if (/^\w+response_.*/ || /^Task_/) {
-	    my ($responsetype,$part) = split(/_/,$_,2);
-	    my ($partid,$respid) = split(/_/,$part);
-	    if ($responsetype eq 'Task') { $respid='0'; }
-	    if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
-		next;
-	    }
-	    if (%vPart && !exists($vPart{$partid})) {
-		next;
-	    }
-	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
-	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
-	    $handgrade{$part} = ($value eq 'yes' ? 'yes' : 'no'); 
-	    if (!exists($responseType{$partid})) { $responseType{$partid}={}; }
-	    $responseType{$partid}->{$respid}=$responsetype;
-	    next if ($seen{$partid} > 0);
-	    $seen{$partid}++;
-	    push @partlist,$partid;
-	}
-    }
-    return (\@partlist,\%handgrade,\%responseType);
+
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $res = $navmap->getBySymb($symb);
+    my $partlist = $res->parts();
+    my %vPart = 
+	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
+    my (%response_types,%handgrade);
+    foreach my $part (@{ $partlist }) {
+	next if (%vPart && !exists($vPart{$part}));
+
+	my @types = $res->responseType($part);
+	my @ids = $res->responseIds($part);
+	for (my $i=0; $i < scalar(@ids); $i++) {
+	    $response_types{$part}{$ids[$i]} = $types[$i];
+	    $handgrade{$part.'_'.$ids[$i]} = 
+		&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
+				     '.handgrade',$symb);
+	}
+    }
+    return ($partlist,\%handgrade,\%response_types);
+}
+
+sub flatten_responseType {
+    my ($responseType) = @_;
+    my @part_response_id =
+	map { 
+	    my $part = $_;
+	    map {
+		[$part,$_]
+		} sort(keys(%{ $responseType->{$part} }));
+	} sort(keys(%$responseType));
+    return @part_response_id;
 }
 
 sub get_display_part {
     my ($partID,$symb)=@_;
     my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
     if (defined($display) and $display ne '') {
-	$display.= " (<font color=\"#999900\">id $partID</font>)";
+	$display.= " (<span class=\"LC_internal_info\">id $partID</span>)";
     } else {
 	$display=$partID;
     }
@@ -161,32 +164,32 @@ sub showResourceInfo {
     my ($symb,$probTitle,$checkboxes) = @_;
     my $col=3;
     if ($checkboxes) { $col=4; }
-    my $result ='<table border="0">'.
-	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
-	$probTitle.'</font></td></tr>'."\n";
+    my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
+    $result .='<table border="0">';
     my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my %resptype = ();
     my $hdgrade='no';
     my %partsseen;
-    for my $part_resID (sort keys(%$handgrade)) {
-	my $handgrade=$$handgrade{$part_resID};
-	my ($partID,$resID) = split(/_/,$part_resID);
-	my $responsetype = $responseType->{$partID}->{$resID};
-	$hdgrade = $handgrade if ($handgrade eq 'yes');
-	$result.='<tr>';
-	if ($checkboxes) {
-	    if (exists($partsseen{$partID})) {
-		$result.="<td>&nbsp;</td>";
-	    } else {
-		$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='on' /></td>";
+    foreach my $partID (sort keys(%$responseType)) {
+	foreach my $resID (sort keys(%{ $responseType->{$partID} })) {
+	    my $handgrade=$$handgrade{$partID.'_'.$resID};
+	    my $responsetype = $responseType->{$partID}->{$resID};
+	    $hdgrade = $handgrade if ($handgrade eq 'yes');
+	    $result.='<tr>';
+	    if ($checkboxes) {
+		if (exists($partsseen{$partID})) {
+		    $result.="<td>&nbsp;</td>";
+		} else {
+		    $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
+		}
+		$partsseen{$partID}=1;
 	    }
-	    $partsseen{$partID}=1;
-	}
-	my $display_part=&get_display_part($partID,$symb);
-	$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
-	    $resID.'</font></td>'.
-	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
+	    my $display_part=&get_display_part($partID,$symb);
+	    $result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'.
+		$resID.'</span></td>'.
+		'<td><b>Type: </b>'.$responsetype.'</td></tr>';
 #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+	}
     }
     $result.='</table>'."\n";
     return $result,$responseType,$hdgrade,$partlist,$handgrade;
@@ -214,7 +217,7 @@ sub get_order {
 sub cleanRecord {
     my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
 	$uname,$udom) = @_;
-    my $grayFont = '<font color="#999999">';
+    my $grayFont = '<span class="LC_internal_info">';
     if ($response =~ /^(option|rank)$/) {
 	my %answer=&Apache::lonnet::str2hash($answer);
 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
@@ -225,11 +228,11 @@ sub cleanRecord {
 	    } else {
 		$toprow.='<td><i>'.$answer{$foil}.'&nbsp;</i></td>';
 	    }
-	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+	    $bottomrow.='<td>'.$grayFont.$foil.'</span>&nbsp;</td>';
 	}
 	return '<blockquote><table border="1">'.
 	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
-	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
 	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'match') {
 	my %answer=&Apache::lonnet::str2hash($answer);
@@ -240,18 +243,18 @@ sub cleanRecord {
 	    my $item=shift(@items);
 	    if ($grading{$foil} == 1) {
 		$toprow.='<td><b>'.$item.'&nbsp;</b></td>';
-		$middlerow.='<td><b>'.$grayFont.$answer{$foil}.'&nbsp;</font></b></td>';
+		$middlerow.='<td><b>'.$grayFont.$answer{$foil}.'&nbsp;</span></b></td>';
 	    } else {
 		$toprow.='<td><i>'.$item.'&nbsp;</i></td>';
-		$middlerow.='<td><i>'.$grayFont.$answer{$foil}.'&nbsp;</font></i></td>';
+		$middlerow.='<td><i>'.$grayFont.$answer{$foil}.'&nbsp;</span></i></td>';
 	    }
-	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+	    $bottomrow.='<td>'.$grayFont.$foil.'</span>&nbsp;</td>';
 	}
 	return '<blockquote><table border="1">'.
 	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
-	    '<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'.
+	    '<tr valign="top"><td>'.$grayFont.'Item ID</span></td>'.
 	    $middlerow.'</tr>'.
-	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
 	    $bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'radiobutton') {
 	my %answer=&Apache::lonnet::str2hash($answer);
@@ -268,11 +271,11 @@ sub cleanRecord {
 	    } else {
 		$toprow.='<td>false</td>';
 	    }
-	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+	    $bottomrow.='<td>'.$grayFont.$foil.'</span>&nbsp;</td>';
 	}
 	return '<blockquote><table border="1">'.
 	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
-	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
 	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'essay') {
 	if (! exists ($env{'form.'.$symb})) {
@@ -589,17 +592,18 @@ sub verifyreceipt {
     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
 	$env{'form.receipt'};
     $receipt     =~ s/[^\-\d]//g;
-    my $symb     = &Apache::lonnet::symbread();
+    my ($symb)   = &get_symb($request);
 
-    my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
-	$receipt.'</h3></font>'."\n".
-	'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br /><br />'."\n";
+    my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.
+	$receipt.'</h3></span>'."\n".
+	'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n";
 
     my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');
     
     my $receiptparts=0;
-    if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+    if ($env{"course.$courseid.receiptalg"} eq 'receipt2' ||
+	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
     my $parts=['0'];
     if ($receiptparts) { ($parts)=&response_type($symb); }
     foreach (sort 
@@ -663,8 +667,8 @@ sub listStudents {
     $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
 	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
 
-    my $result='<h3><font color="#339933">&nbsp;'.$viewgrade.
-	' Submissions for a Student or a Group of Students</font></h3>';
+    my $result='<h3><span class="LC_info">&nbsp;'.$viewgrade.
+	' Submissions for a Student or a Group of Students</span></h3>';
 
     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
 
@@ -704,16 +708,16 @@ LISTJAVASCRIPT
     &commonJSfunctions($request);
     $request->print($result);
 
-    my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
-    my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
+    my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
+    my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
 	"\n".$table.
-	'&nbsp;<b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
+	'&nbsp;<b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
 	'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
 	'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
 	'&nbsp;<b>View Answer: </b><label><input type="radio" name="vAns" value="no"  /> no </label>'."\n".
 	'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
-	'<label><input type="radio" name="vAns" value="all" checked="on" /> all students </label><br />'."\n".
+	'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n".
 	'&nbsp;<b>Submissions: </b>'."\n";
     if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
 	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
@@ -759,7 +763,7 @@ LISTJAVASCRIPT
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
 	'value="Next->" /> <br />'."\n";
     $gradeTable.=&check_buttons();
-    $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>';
+    $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>';
     my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');
     $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">';
@@ -876,15 +880,15 @@ LISTJAVASCRIPT
     if ($ctr == 0) {
 	my $num_students=(scalar(keys(%$fullname)));
 	if ($num_students eq 0) {
-	    $gradeTable='<br />&nbsp;<font color="red">There are no students currently enrolled.</font>';
+	    $gradeTable='<br />&nbsp;<span class="LC_warning">There are no students currently enrolled.</span>';
 	} else {
 	    my $submissions='submissions';
 	    if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
 	    if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
 	    if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }
-	    $gradeTable='<br />&nbsp;<font color="red">'.
+	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.
 		'No '.$submissions.' found for this resource for any students. ('.$num_students.
-		' students checked for '.$submissions.')</font><br />';
+		' students checked for '.$submissions.')</span><br />';
 	}
     } elsif ($ctr == 1) {
 	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
@@ -948,8 +952,8 @@ sub processGroup {
     my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
     my $total      = scalar(@stuchecked)-1;
 
-    foreach (@stuchecked) {
-	my ($uname,$udom,$fullname) = split(/:/);
+    foreach my $student (@stuchecked) {
+	my ($uname,$udom,$fullname) = split(/:/,$student);
 	$env{'form.student'}        = $uname;
 	$env{'form.userdom'}        = $udom;
 	$env{'form.fullname'}       = $fullname;
@@ -1339,7 +1343,7 @@ INNERJS
 
     pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
     pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
-    pDoc.write("<font color=\\"green\\" size=+1>&nbsp;Compose Message for \"+fullname+\"</font><br /><br />");
+    pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Compose Message for \"+fullname+\"</span></h3><br /><br />");
 
     pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
     pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
@@ -1424,7 +1428,7 @@ INNERJS
     hDoc.$docopen;
     hDoc.write('$start_page_highlight_central');
     hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
-    hDoc.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br /><br />");
+    hDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Keyword Highlight Options</span></h3><br /><br />");
 
     hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
     hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
@@ -1470,11 +1474,12 @@ sub get_increment {
 #--- displays the grading box, used in essay type problem and grading by page/sequence
 sub gradeBox {
     my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
-    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+    my $checkIcon = '<img alt="'.&mt('Check Mark').
+	'" src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
     my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
     my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 
-		  '<font color="red">problem weight assigned by computer</font>');
+		  '<span class="LC_info">problem weight assigned by computer</span>');
     $wgt       = ($wgt > 0 ? $wgt : '1');
     my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
 		  '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
@@ -1493,10 +1498,10 @@ sub gradeBox {
     my $increment = &get_increment();
     $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
     while ($thisweight<=$wgt) {
-	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+	$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
 	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
 	    $thisweight.')" value="'.$thisweight.'" '.
-	    ($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></nobr></td>\n";
+	    ($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
 	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
         $thisweight += $increment;
 	$ctr++;
@@ -1513,14 +1518,14 @@ sub gradeBox {
     $result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
 	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
     if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
-	$result.='<option> </option>'.
-	    '<option selected="on">excused</option>';
+	$result.='<option></option>'.
+	    '<option selected="selected">excused</option>';
     } else {
-	$result.='<option selected="on"> </option>'.
+	$result.='<option selected="selected"></option>'.
 	    '<option>excused</option>';
     }
     $result.='<option>reset status</option></select>'."\n";
-    $result.="&nbsp&nbsp\n";
+    $result.="&nbsp;&nbsp;\n";
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
 	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
 	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
@@ -1538,10 +1543,11 @@ sub handback_box {
     my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
     my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my (@respids);
-    foreach my $part_resp (sort(keys(%$handgrade))) {
-        my ($part,$resp) = split(/_/,$part_resp);
+     my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($part,$resp) = @{ $part_response_id };
         if ($part eq $partid) {
-            push @respids,$resp;
+            push(@respids,$resp);
         }
     }
     my $result;
@@ -1569,23 +1575,27 @@ sub handback_box {
 }
 
 sub show_problem {
-    my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
+    my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode,$form) = @_;
     my $rendered;
+    my %form = ((ref($form) eq 'HASH')? %{$form} : ());
     &Apache::lonxml::remember_problem_counter();
     if ($mode eq 'both' or $mode eq 'text') {
 	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
-					     $env{'request.course.id'});
+						       $env{'request.course.id'},
+						       undef,\%form);
     }
     if ($removeform) {
 	$rendered=~s|<form(.*?)>||g;
 	$rendered=~s|</form>||g;
-	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
+	$rendered=~s|(<input[^>]*name\s*=\s*"?)(\w+)("?)|$1would_have_been_$2$3|g;
     }
     my $companswer;
     if ($mode eq 'both' or $mode eq 'answer') {
 	&Apache::lonxml::restore_problem_counter();
-	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
-						    $env{'request.course.id'});
+	$companswer=
+	    &Apache::loncommon::get_student_answers($symb,$uname,$udom,
+						    $env{'request.course.id'},
+						    %form);
     }
     if ($removeform) {
 	$companswer=~s|<form(.*?)>||g;
@@ -1616,6 +1626,43 @@ sub show_problem {
     return $result;
 }
 
+sub files_exist {
+    my ($r, $symb) = @_;
+    my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');
+
+    foreach my $student (@students) {
+        my ($uname,$udom,$fullname) = split(/:/,$student);
+        my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
+					      $udom,$uname);
+        my ($string,$timestamp)= &get_last_submission(\%record);
+        foreach my $submission (@$string) {
+            my ($partid,$respid) =
+		($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
+            my $files=&get_submitted_files($udom,$uname,$partid,$respid,
+					   \%record);
+            return 1 if (@$files);
+        }
+    }
+    return 0;
+}
+
+sub download_all_link {
+    my ($r,$symb) = @_;
+    my $all_students = 
+	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));
+
+    my $parts =
+	join("\n",&Apache::loncommon::get_env_multiple('form.vPart'));
+
+    my $identifier = &Apache::loncommon::get_cgi_id();
+    &Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students,
+                            'cgi.'.$identifier.'.symb' => $symb,
+                            'cgi.'.$identifier.'.parts' => $parts,);
+    $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
+	      &mt('Download All Submitted Documents').'</a>');
+    return
+}
+
 # --------------------------- show submissions of a student, option to grade 
 sub submission {
     my ($request,$counter,$total) = @_;
@@ -1629,9 +1676,9 @@ sub submission {
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
 
     if (!&canview($usec)) {
-	$request->print('<font color="red">Unable to view requested student.('.
-			$uname.'@'.$udom.' in section '.$usec.' in course id '.
-			$env{'request.course.id'}.')</font>');
+	$request->print('<span class="LC_warning">Unable to view requested student.('.
+			$uname.':'.$udom.' in section '.$usec.' in course id '.
+			$env{'request.course.id'}.')</span>');
 	$request->print(&show_grading_menu_form($symb));
 	return;
     }
@@ -1640,7 +1687,8 @@ sub submission {
     if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
     if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
     my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
-    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+    my $checkIcon = '<img alt="'.&mt('Check Mark').
+	'" src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
 
     # header info
@@ -1649,9 +1697,11 @@ sub submission {
 	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
 	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
 	    &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-
-	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
-			'<font size=+1>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n");
+	if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
+	    &download_all_link($request, $symb);
+	}
+	$request->print('<h3>&nbsp;<span class="LC_info">Submission Record</span></h3>'."\n".
+			'<h4>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n");
 
 	if ($env{'form.handgrade'} eq 'no') {
 	    my $checkMark='<br /><br />&nbsp;<b>Note:</b> Part(s) graded correct by the computer is marked with a '.
@@ -1752,7 +1802,7 @@ KEYWORDS
 # Load the other essays for similarity check
 #
             my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
-	    my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+	    my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
 	    $apath=&escape($apath);
 	    $apath=~s/\W/\_/gs;
 	    %oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
@@ -1858,8 +1908,12 @@ KEYWORDS
 	    $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0]; 
 	} else {
 	    my %seenparts;
-	    for my $part (sort keys(%$handgrade)) {
-		my ($partid,$respid) = split(/_/,$part);
+	    my @part_response_id = &flatten_responseType($responseType);
+	    foreach my $part (@part_response_id) {
+		next if ($env{'form.lastSub'} eq 'hdgrade' 
+			 && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');
+
+		my ($partid,$respid) = @{ $part };
 		my $display_part=&get_display_part($partid,$symb);
 		if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
 		    if (exists($seenparts{$partid})) { next; }
@@ -1876,14 +1930,14 @@ KEYWORDS
 		my $responsetype = $responseType->{$partid}->{$respid};
 		if (!exists($record{"resource.$partid.$respid.submission"})) {
 		    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
-			$display_part.' <font color="#999999">( ID '.$respid.
-			' )</font>&nbsp; &nbsp;'.
-			'<font color="red">Nothing submitted - no attempts</font><br /><br />';
+			$display_part.' <span class="LC_internal_info">( ID '.$respid.
+			' )</span>&nbsp; &nbsp;'.
+			'<span class="LC_warning">Nothing submitted - no attempts</span><br /><br />';
 		    next;
 		}
 		foreach (@$string) {
 		    my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
-		    if ($part ne ($partid.'_'.$respid)) { next; }
+		    if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
 		    my ($ressub,$subval) = split(/:/,$_,2);
 		    # Similarity check
 		    my $similar='';
@@ -1892,10 +1946,10 @@ KEYWORDS
 			    &most_similar($uname,$udom,$subval);
 			if ($osim) {
 			    $osim=int($osim*100.0);
-			    $similar="<hr /><h3><font color=\"#FF0000\">Essay".
+			    $similar="<hr /><h3><span class=\"LC_warning\">Essay".
 				" is $osim% similar to an essay by ".
 				&Apache::loncommon::plainname($oname,$odom).
-				'</font></h3><blockquote><i>'.
+				'</span></h3><blockquote><i>'.
 				&keywords_highlight($oessay).
 				'</i></blockquote><hr />';
 			}
@@ -1903,14 +1957,14 @@ KEYWORDS
 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
 		    if ($env{'form.lastSub'} eq 'lastonly' || 
 			($env{'form.lastSub'} eq 'hdgrade' && 
-			 $$handgrade{$part} eq 'yes')) {
+			 $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
 			my $display_part=&get_display_part($partid,$symb);
 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
-			    $display_part.' <font color="#999999">( ID '.$respid.
-			    ' )</font>&nbsp; &nbsp;';
+			    $display_part.' <span class="LC_internal_info">( ID '.$respid.
+			    ' )</span>&nbsp; &nbsp;';
 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
 			if (@$files) {
-			    $lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
+			    $lastsubonly.='<br /><span class="LC_warning">Like all files provided by users, this file may contain virusses</span><br />';
 			    my $file_counter = 0;
 			    foreach my $file (@$files) {
 			        $file_counter ++;
@@ -1993,11 +2047,14 @@ KEYWORDS
     my %seen = ();
     my @partlist;
     my @gradePartRespid;
-    for my $part_resp (sort(keys(%$handgrade))) {
-	my ($partid,$respid) = split(/_/, $part_resp);
+    my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($partid,$respid) = @{ $part_response_id };
+	my $part_resp = join('_',@{ $part_response_id });
 	next if ($seen{$partid} > 0);
 	$seen{$partid}++;
-	next if ($$handgrade{$part_resp} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
+	next if ($$handgrade{$part_resp} ne 'yes' 
+		 && $env{'form.lastSub'} eq 'hdgrade');
 	push @partlist,$partid;
 	push @gradePartRespid,$partid.'.'.$respid;
 	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
@@ -2025,7 +2082,7 @@ KEYWORDS
 	    '<option>3</option><option>5</option>'.
 	    '<option>7</option><option>10</option></select>'."\n";
 	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
-	$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
+	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
 	$endform.=$ntstu.'student(s) &nbsp;&nbsp;';
 	$endform.='<input type="button" value="Previous" '.
 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> &nbsp;'."\n".
@@ -2049,22 +2106,27 @@ sub get_last_submission {
 	my %lasthash=();
 	my ($version);
 	for ($version=1;$version<=$$returnhash{'version'};$version++) {
-	    foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) {
-		$lasthash{$_}=$$returnhash{$version.':'.$_};
-		   $timestamp = scalar(localtime($$returnhash{$version.':timestamp'}));
+	    foreach my $key (sort(split(/\:/,
+					$$returnhash{$version.':keys'}))) {
+		$lasthash{$key}=$$returnhash{$version.':'.$key};
+		$timestamp = 
+		    scalar(localtime($$returnhash{$version.':timestamp'}));
 	    }
 	}
-	foreach ((keys %lasthash)) {
-	    if ($_ =~ /\.submission$/) {
-		my ($partid,$foo) = split(/submission$/,$_);
-		my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
-		    '<font color="red">Draft Copy</font> ' : '';
-		push @string, (join(':',$_,$draft.$lasthash{$_}));
-	    }
+	foreach my $key (keys(%lasthash)) {
+	    next if ($key !~ /\.submission$/);
+
+	    my ($partid,$foo) = split(/submission$/,$key);
+	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
+		'<span class="LC_warning">Draft Copy</span> ' : '';
+	    push(@string, join(':', $key, $draft.$lasthash{$key}));
 	}
     }
-    @string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string;
-    return \@string,\$timestamp;
+    if (!@string) {
+	$string[0] =
+	    '<span class="LC_warning">Nothing submitted - no attempts.</span>';
+    }
+    return (\@string,\$timestamp);
 }
 
 #--- High light keywords, with style choosen by user.
@@ -2074,8 +2136,8 @@ sub keywords_highlight {
     my $styleon   = $env{'form.kwstyle'} eq ''  ? '' : $env{'form.kwstyle'};
     (my $styleoff = $styleon) =~ s/\</\<\//;
     my @keylist   = split(/[,\s+]/,$env{'form.keywords'});
-    foreach (@keylist) {
-	$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
+    foreach my $keyword (@keylist) {
+	$string =~ s/\b\Q$keyword\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$keyword$styleoff<\/font>/gi;
     }
     return $string;
 }
@@ -2101,16 +2163,28 @@ sub processHandGrade {
 		next;
 	    }
 	    if ($errorflag eq 'not_allowed') {
-		$request->print("<font color=\"red\">Not allowed to modify grades for $uname:$udom</font>");
+		$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>");
 		$ctr++;
 		next;
 	    }
 	    my $includemsg = $env{'form.includemsg'.$ctr};
 	    my ($subject,$message,$msgstatus) = ('','','');
+            my $restitle = &Apache::lonnet::gettitle($symb);
+            my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
+                                                $symb,$udom,$uname);
+            my ($feedurl,$baseurl,$showsymb,$messagetail);
+            $feedurl = &Apache::lonnet::clutter($url);
+            if ($encrypturl =~ /^yes$/i) {
+                $baseurl = &Apache::lonenc::encrypted($feedurl,1);
+                $showsymb = &Apache::lonenc::encrypted($symb,1);
+            } else {
+                $baseurl = $feedurl;
+                $showsymb = $symb;
+            }
 	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
 		$subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
 		unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
-		$subject.=' ['.&Apache::lonnet::declutter($url).']';
+		$subject.=' ['.$restitle.']';
 		my (@msgnum) = split(/,/,$includemsg);
 		foreach (@msgnum) {
 		    $message.=$env{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
@@ -2118,14 +2192,16 @@ sub processHandGrade {
 		$message =&Apache::lonfeedback::clear_out_html($message);
 		if ($env{'form.withgrades'.$ctr}) {
 		    $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
-		    $message.=" for <a href=\"".
-		    &Apache::lonnet::clutter($url).
-		    "?symb=$symb\">$env{'form.probTitle'}</a>";
-		}
-		$msgstatus = &Apache::lonmsg::user_normal_msg($uname,$udom,
-							      $subject,
-							      $message);
-		$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
+		    $messagetail = " for <a href=\"".
+		                   $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
+		}
+		$msgstatus = 
+                    &Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
+						     $message.$messagetail,
+                                                     undef,$baseurl,undef,
+                                                     undef,undef,$showsymb,
+                                                     $restitle);
+		$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
 				$msgstatus);
 	    }
 	    if ($env{'form.collaborator'.$ctr}) {
@@ -2141,7 +2217,23 @@ sub processHandGrade {
 			    next;
 			} else {
 			    if ($message ne '') {
-				$msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message);
+                                $encrypturl=
+                                  &Apache::lonnet::EXT('resource.0.encrypturl',
+                                                       $symb,$udom,$collaborator);
+                                if ($encrypturl =~ /^yes$/i) {
+                                    $baseurl = &Apache::lonenc::encrypted($feedurl,1);
+                                    $showsymb = &Apache::lonenc::encrypted($symb,1);
+                                } else {
+                                    $baseurl = $feedurl;
+                                    $showsymb = $symb;
+                                }
+                                if ($env{'form.withgrades'.$ctr}) {
+                                    $messagetail = " for <a href=\"".
+                                    $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
+
+                                }
+				$msgstatus = 
+                                    &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
 			    }
 			}
 		    }
@@ -2300,7 +2392,7 @@ sub processHandGrade {
 	$ctr++;
     }
     if ($total < 0) {
-	my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
+	my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n";
 	$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
 	$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
 	$the_end.=&show_grading_menu_form($symb);
@@ -2417,17 +2509,8 @@ sub saveHandGrade {
         }
 	&Apache::lonnet::cstore(\%newrecord,$symb,
 				$env{'request.course.id'},$domain,$stuname);
-	my @ungraded_parts;
-	foreach my $part (@parts) {
-	    if ( !defined($record{'resource.'.$part.'.awarded'})
-		 && !defined($newrecord{'resource.'.$part.'.awarded'}) ) {
-		push(@ungraded_parts, $part);
-	    }
-	}
-	if ( !@ungraded_parts ) {
-	    &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
-						   $cnum,$domain,$stuname);
-	}
+	&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
+				     $cdom,$cnum,$domain,$stuname);
     }
     if ($aggregateflag) {
         &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
@@ -2436,12 +2519,33 @@ sub saveHandGrade {
     return ('',$pts,$wgt);
 }
 
+sub check_and_remove_from_queue {
+    my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;
+    my @ungraded_parts;
+    foreach my $part (@{$parts}) {
+	if (    $record->{   'resource.'.$part.'.awarded'} eq ''
+	     && $record->{   'resource.'.$part.'.solved' } ne 'excused'
+	     && $newrecord->{'resource.'.$part.'.awarded'} eq ''
+	     && $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
+		) {
+	    push(@ungraded_parts, $part);
+	}
+    }
+    if ( !@ungraded_parts ) {
+	&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
+					       $cnum,$domain,$stuname);
+    }
+}
+
 sub handback_files {
     my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
     my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
     my ($partlist,$handgrade,$responseType) = &response_type($symb);
-        foreach my $part_resp (sort(keys(%$handgrade))) {
-            my ($part_id, $resp_id) = split(/_/,$part_resp);
+
+    my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($part_id,$resp_id) = @{ $part_response_id };
+	my $part_resp = join('_',@{ $part_response_id });
             if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
                 # if multiple files are uploaded names will be 'returndoc2','returndoc3'
                 my $file_counter = 1;
@@ -2461,12 +2565,12 @@ sub handback_files {
             	                                $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
             	                                $save_file_name);
                     if ($result !~ m|^/uploaded/|) {
-                        $request->print('<font color="red"> An errror occured ('.$result.
-                        ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</font><br />');
+                        $request->print('<span class="LC_error">An error occurred ('.$result.
+                        ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
                     } else {
                         # mark the file as read only
                         my @files = ($save_file_name);
-                        my @what = ($symb,'handback');
+                        my @what = ($symb,$env{'request.course.id'},'handback');
                         &Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
 			if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
 			    $$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
@@ -2485,10 +2589,22 @@ sub handback_files {
 		$message .= ' The returned file(s) are named: '. $file_msg;
 		$message .= " and can be found in your portfolio space.";
 		my $url = (&Apache::lonnet::decode_symb($symb))[2];
-		$url = &Apache::lonnet::declutter($url);
-		my $msgstatus = &Apache::lonmsg::user_normal_msg($stuname,$domain,
-								 $subject.' (File Returned) ['.$url.']',$message);                    
-
+		my $feedurl = &Apache::lonnet::clutter($url);
+                my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
+                                                    $symb,$domain,$stuname);
+                my ($baseurl,$showsymb);
+                if ($encrypturl =~ /^yes$/i) {
+                    $baseurl = &Apache::lonenc::encrypted($feedurl,1);
+                    $showsymb = &Apache::lonenc::encrypted($symb,1);
+                } else {
+                    $baseurl = $feedurl;
+                    $showsymb = $symb;
+                }
+                my $restitle = &Apache::lonnet::gettitle($symb);
+		my $msgstatus = 
+                   &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject.
+			 ' (File Returned) ['.$restitle.']',$message,undef,
+                         $baseurl,undef,undef,undef,$showsymb,$restitle);
             }
         }
     return;
@@ -2846,8 +2962,8 @@ sub viewgrades {
                  $env{'course.'.$env{'request.course.id'}.'.domain'});
     &Apache::lonnet::clear_EXT_cache_status();
 
-    my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
-    $result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n";
+    my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
+    $result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n";
 
     #view individual student submission form - called using Javascript viewOneStudent
     $result.=&jscriptNform($symb);
@@ -2874,16 +2990,18 @@ sub viewgrades {
 	'<table border=0><tr bgcolor="#ffffdd"><td>';
     #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem
-    my ($partlist,$handgrade) = &response_type($symb);
+    my ($partlist,$handgrade,$responseType) = &response_type($symb);
     my %weight = ();
     my $ctsparts = 0;
     $result.='<table border="0">';
     my %seen = ();
-    for (sort keys(%$handgrade)) {
-	my ($partid,$respid) = split (/_/,$_,2);
+    my @part_response_id = &flatten_responseType($responseType);
+    foreach my $part_response_id (@part_response_id) {
+    	my ($partid,$respid) = @{ $part_response_id };
+	my $part_resp = join('_',@{ $part_response_id });
 	next if $seen{$partid};
 	$seen{$partid}++;
-	my $handgrade=$$handgrade{$_};
+	my $handgrade=$$handgrade{$part_resp};
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
@@ -2910,7 +3028,7 @@ sub viewgrades {
 	$result.= '</td><td><select name="SELVAL_'.$partid.'"'.
 	    'onChange="javascript:writeRadText(\''.$partid.'\','.
 		$weight{$partid}.')"> '.
-	    '<option selected="on"> </option>'.
+	    '<option selected="selected"> </option>'.
 	    '<option>excused</option>'.
 	    '<option>reset status</option></select></td>'.
             '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
@@ -2918,7 +3036,7 @@ sub viewgrades {
     }
     $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
 	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
-    $result.='<input type="button" value="Reset" '.
+    $result.='<input type="button" value="Revert to Default" '.
 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
 
     #table listing all the students in a section/class
@@ -2973,8 +3091,8 @@ sub viewgrades {
 	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
     if (scalar(%$fullname) eq 0) {
 	my $colspan=3+scalar(@parts);
-	$result='<font color="red">There are no students in section "'.$env{'form.section'}.
-	    '" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';
+	$result='<span class="LC_warning">There are no students in section "'.$env{'form.section'}.
+	    '" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</span>';
     }
     $result.=&show_grading_menu_form($symb);
     return $result;
@@ -2991,7 +3109,7 @@ sub viewstudentgrade {
 	"\n".$ctr.'&nbsp;</td><td>&nbsp;'.
 	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
 	'\')"; TARGET=_self>'.$fullname.'</a> '.
-	'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
+	'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";
     $student=~s/:/_/; # colon doen't work in javascript for names
     foreach my $apart (@$parts) {
 	my ($part,$type) = &split_part_type($apart);
@@ -3028,8 +3146,8 @@ sub viewstudentgrade {
 	    $result.='&nbsp;<select name="'.
 		'GD_'.$student.'_'.$part.'_solved" '.
 		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
-	    $result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>' 
-		: '<option selected="on"> </option><option>excused</option>')."\n";
+	    $result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>' 
+		: '<option selected="selected"> </option><option>excused</option>')."\n";
 	    $result.='<option>reset status</option>';
 	    $result.="</select>&nbsp;</td>\n";
 	} else {
@@ -3051,9 +3169,9 @@ sub editgrades {
     my ($request) = @_;
 
     my $symb=&get_symb($request);
-    my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
-    $title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";
-    $title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";
+    my $title='<h3><span class="LC_info">Current Grade Status</span></h3>';
+    $title.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4><br />'."\n";
+    $title.='<h4><b>Section: </b>'.$env{'form.section'}.'</h4>'."\n";
 
     my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $result.= '<table border="0"><tr bgcolor="#deffff">'.
@@ -3121,7 +3239,7 @@ sub editgrades {
 	my $usec=$classlist->{"$uname:$udom"}[5];
 	if (!&canmodify($usec)) {
 	    my $numcols=scalar(@partid)*4+2;
-	    $noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
+	    $noupdate.=$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">Not allowed to modify student</span></td></tr>";
 	    next;
 	}
         my %aggregate = ();
@@ -3356,7 +3474,7 @@ sub csvuploadmap_header {
     my $ignore=&mt('Ignore First Line');
     $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
-<h3><font color="#339933">Uploading Class Grades</font></h3>
+<h3><span class="LC_info">Uploading Class Grades</span></h3>
 $result
 <hr />
 <h3>Identify fields</h3>
@@ -3442,9 +3560,10 @@ sub upcsvScores_form {
     $result.=$table;
     $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
     $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>Specify a file containing the class scores for current resource'.
+    $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource').
 	'.</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
+    my $upload=&mt("Upload Scores");
     my $upfile_select=&Apache::loncommon::upfile_select_html();
     my $ignore=&mt('Ignore First Line');
     $result.=<<ENDUPFORM;
@@ -3454,11 +3573,13 @@ sub upcsvScores_form {
 <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
 <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 $upfile_select
-<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
+<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
 <label><input type="checkbox" name="noFirstLine" />$ignore</label>
 </form>
 ENDUPFORM
-    $result.='</td></tr></table>'."\n";
+    $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+                           &mt("How do I create a CSV file from a spreadsheet"))
+    .'</td></tr></table>'."\n";
     $result.='</td></tr></table><br /><br />'."\n";
     $result.=&show_grading_menu_form($symb);
     return $result;
@@ -3516,7 +3637,7 @@ sub csvuploadoptions {
     my $ignore=&mt('Ignore First Line');
     $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
-<h3><font color="#339933">Uploading Class Grade Options</font></h3>
+<h3><span class="LC_info">Uploading Class Grade Options</span></h3>
 <input type="hidden" name="command"    value="csvuploadassign" />
 <!--
 <p>
@@ -3650,7 +3771,7 @@ sub csvuploadassign {
 		$grades{$store_key}=$entries{$fields{$dest}};
 	    }
 	}
-	if (! %grades) { push(@skipped,"$username:$domain no data to store"); }
+	if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
 	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
 #	&Apache::lonnet::logthis(" storing ".(join('-',%grades)));
 	my $result=&Apache::lonnet::cstore(\%grades,$symb,
@@ -3660,22 +3781,22 @@ sub csvuploadassign {
 	    $request->print('.');
 	} else {
 	    $request->print("<p>
-                              <font color='red'>
-                                 Failed to store student $username\@$domain.
-                                 Message when trying to store was ($result)
-                              </font>
+                              <span class=\"LC_error\">
+                                 Failed to save student $username:$domain.
+                                 Message when trying to save was ($result)
+                              </span>
                              </p>" );
 	}
 	$request->rflush();
 	$countdone++;
     }
-    $request->print("<br />Stored $countdone students\n");
+    $request->print("<br />Saved $countdone students\n");
     if (@skipped) {
-	$request->print('<p><font size="+1"><b>Skipped Students</b></font></p>');
+	$request->print('<p><h4><b>Skipped Students</b></h4></p>');
 	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
     }
     if (@notallowed) {
-	$request->print('<p><font size="+1" color="red"><b>Students Not Allowed to Modify</b></font></p>');
+	$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>');
 	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
     }
     $request->print("<br />\n");
@@ -3714,8 +3835,8 @@ LISTJAVASCRIPT
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
 
-    my $result='<h3><font color="#339933">&nbsp;'.
-	'Manual Grading by Page or Sequence</font></h3>';
+    my $result='<h3><span class="LC_info">&nbsp;'.
+	'Manual Grading by Page or Sequence</span></h3>';
 
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
     $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
@@ -3727,7 +3848,7 @@ LISTJAVASCRIPT
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
 	$result.='<option value="'.$ctr.'" '.
-	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').
+	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
 	    '>'.$showtitle.'</option>'."\n";
 	$ctr++;
     }
@@ -3742,12 +3863,12 @@ LISTJAVASCRIPT
     $result.='<input type="hidden" name="page" />'."\n".
 	'<input type="hidden" name="title" />'."\n";
 
-    $result.='&nbsp;<b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
+    $result.='&nbsp;<b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
 	'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";
 
     $result.='&nbsp;<b>Submission Details: </b>'.
 	'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
-	'<label><input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions</label>'."\n".
+	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> by dates and submissions</label>'."\n".
 	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";
 
     $result.='<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
@@ -3756,6 +3877,9 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
 
+    $result.='&nbsp;<b>'.&mt('Use CODE:').' </b>'.
+	'<input type="text" name="CODE" value="" /><br />'."\n";
+
     $result.='&nbsp;<input type="button" '.
 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
 
@@ -3786,8 +3910,8 @@ LISTJAVASCRIPT
 	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
 	$ptr++;
     }
-    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%2 == 0);
-    $studentTable.='</td></tr></table></td></tr></table>'."\n";
+    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td></tr>' if ($ptr%2 == 0);
+    $studentTable.='</table></td></tr></table>'."\n";
     $studentTable.='<input type="button" '.
 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
 
@@ -3810,9 +3934,10 @@ sub getSymbMap {
 					       1,0,1);
     for my $sequence ($navmap->getById('0.0'), @sequences) {
 	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
-	    my $title = $minder.'.'.$sequence->compTitle();
-	    push @titles, $title; # minder in case two titles are identical
-	    $symbx{$title} = $sequence->symb();
+	    my $title = $minder.'.'.
+		&HTML::Entities::encode($sequence->compTitle(),'"\'&');
+	    push(@titles, $title); # minder in case two titles are identical
+	    $symbx{$title} = &HTML::Entities::encode($sequence->symb(),'"\'&');
 	    $minder++;
 	}
     }
@@ -3841,13 +3966,18 @@ sub displayPage {
     &Apache::lonnet::clear_EXT_cache_status();
 
     if (!&canview($usec)) {
-	$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
+	$request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>');
 	$request->print(&show_grading_menu_form($symb));
 	return;
     }
-    my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
+    my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
 	'</h3>'."\n";
+    if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+	$result.='<h3>&nbsp;CODE: '.$env{'form.CODE'}.'</h3>'."\n";
+    } else {
+	delete($env{'form.CODE'});
+    }
     &sub_page_js($request);
     $request->print($result);
 
@@ -3855,7 +3985,7 @@ sub displayPage {
     my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
-	$request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>');
+	$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>');
 	$request->print(&show_grading_menu_form($symb));
 	return; 
     }
@@ -3872,7 +4002,12 @@ sub displayPage {
 	'<input type="hidden" name="overRideScore" value="no" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
 
-    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+    if (defined($env{'form.CODE'})) {
+	$studentTable.=
+	    '<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
+    }
+    my $checkIcon = '<img alt="'.&mt('Check Mark').
+	'" src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
 
     $studentTable.='&nbsp;<b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
@@ -3890,18 +4025,19 @@ sub displayPage {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+        if (ref($curRes) && $curRes->is_problem()) {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
 	    $studentTable.='<td valign="top">';
+	    my %form = ('CODE' => $env{'form.CODE'},);
 	    if ($env{'form.vProb'} eq 'yes' ) {
 		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
-					     undef,'both');
+					     undef,'both',\%form);
 	    } else {
-		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'});
+		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
 		$companswer =~ s|<form(.*?)>||g;
 		$companswer =~ s|</form>||g;
 #		while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
@@ -3916,7 +4052,7 @@ sub displayPage {
 
 	    if ($env{'form.lastSub'} eq 'datesub') {
 		if ($record{'version'} eq '') {
-		    $studentTable.='<br />&nbsp;<font color="red">No recorded submission for this problem</font><br />';
+		    $studentTable.='<br />&nbsp;<span class="LC_warning">No recorded submission for this problem</span><br />';
 		} else {
 		    my %responseType = ();
 		    foreach my $partid (@{$parts}) {
@@ -3952,9 +4088,9 @@ sub displayPage {
         $curRes = $iterator->next();
     }
 
-    $studentTable.='</td></tr></table></td></tr></table>'."\n".
+    $studentTable.='</table></td></tr></table>'."\n".
 	'<input type="button" value="Save" '.
-	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
+	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
 	'</form>'."\n";
     $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);
@@ -3978,7 +4114,7 @@ sub displaySubByDates {
     my %orders;
     $mark{'correct_by_student'} = $checkIcon;
     if (!exists($$record{'1:timestamp'})) {
-	return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />';
+	return '<br />&nbsp;<span class="LC_warning">Nothing submitted - no attempts</span><br />';
     }
 
     my $interaction;
@@ -4012,8 +4148,8 @@ sub displaySubByDates {
 				               : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
 		    #&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey});
 		    $displaySub[0].='<b>Part:</b>&nbsp;'.$display_part.'&nbsp;';
-		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
-			$responseId.')</font>&nbsp;<b>';
+		    $displaySub[0].='<span class="LC_internal_info">(ID&nbsp;'.
+			$responseId.')</span>&nbsp;<b>';
 		    if ($$record{"$where.$partid.tries"} eq '') {
 			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
 		    } else {
@@ -4078,11 +4214,11 @@ sub updateGradeByPage {
     my ($uname,$udom) = split(/:/,$env{'form.student'});
     my $usec=$classlist->{$env{'form.student'}}[5];
     if (!&canmodify($usec)) {
-	$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
+	$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>');
 	$request->print(&show_grading_menu_form($env{'form.symb'}));
 	return;
     }
-    my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
+    my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
 	'</h3>'."\n";
 
@@ -4092,7 +4228,7 @@ sub updateGradeByPage {
     my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
-	$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');
+	$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>');
 	my ($symb)=&get_symb($request);
 	$request->print(&show_grading_menu_form($symb));
 	return; 
@@ -4114,7 +4250,7 @@ sub updateGradeByPage {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+        if (ref($curRes) && $curRes->is_problem()) {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
@@ -4169,9 +4305,8 @@ sub updateGradeByPage {
 		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
 		     (($score eq 'excused') ? 'excused' : $newpts).
 		    '&nbsp;<br />';
-
 		$question++;
-		next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
+		next if ($dropMenu eq 'reset status' || ($newpts eq $oldpts && $score ne 'excused'));
 
 		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
 		$newrecord{'resource.'.$partid.'.solved'}   = $score if $score ne '';
@@ -4181,9 +4316,24 @@ sub updateGradeByPage {
 		$changeflag++;
 	    }
 	    if (scalar(keys(%newrecord)) > 0) {
+		my %record = 
+		    &Apache::lonnet::restore($symbx,$env{'request.course.id'},
+					     $udom,$uname);
+
+		if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+		    $newrecord{'resource.CODE'} = $env{'form.CODE'};
+		} elsif (&Apache::lonnet::validCODE($record{'resource.CODE'})) {
+		    $newrecord{'resource.CODE'} = '';
+		}
 		&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
 					$udom,$uname);
+		%record = &Apache::lonnet::restore($symbx,
+						   $env{'request.course.id'},
+						   $udom,$uname);
+		&check_and_remove_from_queue($parts,\%record,undef,$symbx,
+					     $cdom,$cnum,$udom,$uname);
 	    }
+	    
             if ($aggregateflag) {
                 &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                       $env{'course.'.$env{'request.course.id'}.'.domain'},
@@ -4234,7 +4384,7 @@ sub getSequenceDropDown {
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
 	$result.='<option value="'.$$symbx{$_}.'" '.
-	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').
+	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
 	    '>'.$showtitle.'</option>'."\n";
 	$ctr++;
     }
@@ -4262,7 +4412,7 @@ sub scantron_uploads {
     my $result=	'<select name="scantron_selectfile">';
     $result.="<option></option>";
     foreach my $filename (sort(&scantron_filenames())) {
-	$result.="<option".($filename eq $file2grade ? ' selected="on"':'').">$filename</option>\n";
+	$result.="<option".($filename eq $file2grade ? ' selected="selected"':'').">$filename</option>\n";
     }
     $result.="</select>";
     return $result;
@@ -4297,14 +4447,14 @@ sub scantron_CODElist {
 }
 
 sub scantron_CODEunique {
-    my $result='<nobr>
+    my $result='<span style="white-space: nowrap;">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="yes" checked="checked" /> Yes </label>
-                </nobr>
-                <nobr>
+                </span>
+                <span style="white-space: nowrap;">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="no" /> No </label>
-                </nobr>';
+                </span>';
     return $result;
 }
 
@@ -4423,6 +4573,7 @@ SCANTRONFORM
     <tr>
       <form action='/adm/grades' name='scantron_download'>
         <td bgcolor="#777777">
+	  $default_form_data
           <input type="hidden" name="command" value="scantron_download" />
           <table width="100%" border="0">
             <tr bgcolor="#e6ffff">
@@ -4539,6 +4690,7 @@ sub scantron_fixup_scanline {
 		$answer=$alphabet[$args->{'response'}];
 	    } elsif ($on eq 'number') {
 		$answer=$args->{'response'}+1;
+		if ($answer == 10) { $answer = '0'; }
 	    } else {
 		substr($answer,$args->{'response'},1)=$on;
 	    }
@@ -4605,10 +4757,11 @@ sub scantron_parse_scanline {
 	substr($questions,0,$$scantron_config{'Qlength'})='';
 	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
 	if ($$scantron_config{'Qon'} eq 'letter') {
-	    if ($currentquest eq '?') {
+	    if ($currentquest eq '?'
+		|| $currentquest eq '*') {
 		push(@{$record{'scantron.doubleerror'}},$questnum);
 		$record{"scantron.$questnum.answer"}='';
-	    } elsif (!$currentquest 
+	    } elsif (!defined($currentquest)
 		     || $currentquest eq $$scantron_config{'Qoff'}
 		     || $currentquest !~ /^[A-Z]$/) {
 		$record{"scantron.$questnum.answer"}='';
@@ -4619,19 +4772,26 @@ sub scantron_parse_scanline {
 		$record{"scantron.$questnum.answer"}=$currentquest;
 	    }
 	} elsif ($$scantron_config{'Qon'} eq 'number') {
-	    if ($currentquest eq '?') {
+	    if ($currentquest eq '?'
+		|| $currentquest eq '*') {
 		push(@{$record{'scantron.doubleerror'}},$questnum);
 		$record{"scantron.$questnum.answer"}='';
-		} elsif (!$currentquest 
-			 || $currentquest eq $$scantron_config{'Qoff'} 
-			 || $currentquest !~ /^\d$/) {
+	    } elsif (!defined($currentquest)
+		     || $currentquest eq $$scantron_config{'Qoff'} 
+		     || $currentquest !~ /^\d$/) {
 		$record{"scantron.$questnum.answer"}='';
 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
 		    push(@{$record{"scantron.missingerror"}},$questnum);
 		}
 	    } else {
-		$record{"scantron.$questnum.answer"}=
-		    $alphabet[$currentquest-1];
+		# wrap zero back to J
+		if ($currentquest eq '0') {
+		    $record{"scantron.$questnum.answer"}=
+			$alphabet[9];
+		} else {
+		    $record{"scantron.$questnum.answer"}=
+			$alphabet[$currentquest-1];
+		}
 	    }
 	} else {
 	    my @array=split($$scantron_config{'Qon'},$currentquest,-1);
@@ -4748,7 +4908,7 @@ sub scantron_process_corrections {
 	}
     }
     if ($err) {
-	$r->print("<font color='red'>Unable to accept last correction, an error occurred :$errmsg:</font>");
+	$r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>");
     } else {
 	&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
 	&scantron_putfile($scanlines,$scan_data);
@@ -4761,21 +4921,29 @@ sub reset_skipping_status {
     &scantron_putfile(undef,$scan_data);
 }
 
-sub allow_skipping {
+sub start_skipping {
     my ($scan_data,$i)=@_;
     my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
-    delete($remembered{$i});
+    if ($env{'form.scantron_options_redo'} =~ /^redo_/) {
+	$remembered{$i}=2;
+    } else {
+	$remembered{$i}=1;
+    }
     &scan_data($scan_data,'remember_skipping',join(':',%remembered));
 }
 
 sub should_be_skipped {
-    my ($scan_data,$i)=@_;
+    my ($scanlines,$scan_data,$i)=@_;
     if ($env{'form.scantron_options_redo'} !~ /^redo_/) {
 	# not redoing old skips
+	if ($scanlines->{'skipped'}[$i]) { return 1; }
 	return 0;
     }
     my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
-    if (exists($remembered{$i})) { return 0; }
+
+    if (exists($remembered{$i}) && $remembered{$i} != 2 ) {
+	return 0;
+    }
     return 1;
 }
 
@@ -4787,6 +4955,7 @@ sub remember_current_skipped {
 	    $to_remember{$i}=1;
 	}
     }
+
     &scan_data($scan_data,'remember_skipping',join(':',%to_remember));
     &scantron_putfile(undef,$scan_data);
 }
@@ -4794,7 +4963,7 @@ sub remember_current_skipped {
 sub check_for_error {
     my ($r,$result)=@_;
     if ($result ne 'ok' && $result ne 'not_found' ) {
-	$r->print("An error occured ($result) when trying to Remove the existing corrections.");
+	$r->print("An error occurred ($result) when trying to Remove the existing corrections.");
     }
 }
 
@@ -4802,27 +4971,26 @@ sub scantron_warning_screen {
     my ($button_text)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
-    my $CODElist="a";
+    my $CODElist;
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
 	$scantron_config{'CODElength'}) {
 	$CODElist=$env{'form.scantron_CODElist'};
-	if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }
+	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
 	$CODElist=
 	    '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
-	    $CODElist.'</tt></td></tr>';
+	    $env{'form.scantron_CODElist'}.'</tt></td></tr>';
     }
     return (<<STUFF);
 <p>
-<font color="red">Please double check the information
-                 below before clicking on '$button_text'</font>
+<span class="LC_warning">Please double check the information
+                 below before clicking on '$button_text'</span>
 </p>
 <table>
 <tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>
 <tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>
 $CODElist
 </table>
-</font>
 <br />
 <p> If this information is correct, please click on '$button_text'.</p>
 <p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
@@ -4842,13 +5010,13 @@ sub scantron_do_warning {
 	 $env{'form.scantron_format'} eq '' ) {
 	$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
 	if ( $env{'form.selectpage'} eq '') {
-	    $r->print('<p><font color="red">You have not selected a Sequence to grade</font></p>');
+	    $r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>');
 	} 
 	if ( $env{'form.scantron_selectfile'} eq '') {
-	    $r->print('<p><font color="red">You have not selected a file that contains the student\'s response data.</font></p>');
+	    $r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>');
 	} 
 	if ( $env{'form.scantron_format'} eq '') {
-	    $r->print('<p><font color="red">You have not selected a the format of the student\'s response data.</font></p>');
+	    $r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>');
 	} 
     } else {
 	my $warning=&scantron_warning_screen('Grading: Validate Records');
@@ -4892,7 +5060,6 @@ sub scantron_validate_file {
     }
     if ($env{'form.scantron_options_redo'} eq 'redo_skipped') {
 	&remember_current_skipped();
-	&scantron_remove_file('skipped');
 	$env{'form.scantron_options_redo'}='redo_skipped_ready';
     }
 
@@ -5062,8 +5229,8 @@ sub scantron_putfile {
 
 sub scantron_get_line {
     my ($scanlines,$scan_data,$i)=@_;
-    if (&should_be_skipped($scan_data,$i)) { return undef; }
-    if ($scanlines->{'skipped'}[$i]) { return undef; }
+    if (&should_be_skipped($scanlines,$scan_data,$i)) { return undef; }
+    #if ($scanlines->{'skipped'}[$i]) { return undef; }
     if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
     return $scanlines->{'orig'}[$i]; 
 }
@@ -5083,12 +5250,21 @@ sub scantron_put_line {
     my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
     if ($skip) {
 	$scanlines->{'skipped'}[$i]=$newline;
-	&allow_skipping($scan_data,$i);
+	&start_skipping($scan_data,$i);
 	return;
     }
     $scanlines->{'corrected'}[$i]=$newline;
 }
 
+sub scantron_clear_skip {
+    my ($scanlines,$scan_data,$i)=@_;
+    if (exists($scanlines->{'skipped'}[$i])) {
+	undef($scanlines->{'skipped'}[$i]);
+	return 1;
+    }
+    return 0;
+}
+
 sub scantron_filter_not_exam {
     my ($curres)=@_;
     
@@ -5249,7 +5425,7 @@ sub scantron_get_correction {
 	    if ($closest > 0) {
 		foreach my $testcode (@{$closest}) {
 		    my $checked='';
-		    if (!$i) { $checked=' checked="on" '; }
+		    if (!$i) { $checked=' checked="checked" '; }
 		    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
 		    $r->print("\n<br />");
 		    $i++;
@@ -5257,7 +5433,7 @@ sub scantron_get_correction {
 	    }
 	}
 	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
-	    my $checked; if (!$i) { $checked=' checked="on" '; }
+	    my $checked; if (!$i) { $checked=' checked="checked" '; }
 	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");
 	    $r->print("\n<br />");
 	}
@@ -5575,6 +5751,10 @@ SCANTRONFORM
 
 	&Apache::lonxml::clear_problem_counter();
   	&Apache::lonnet::appenv(%$scan_record);
+
+	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
+	    &scantron_putfile($scanlines,$scan_data);
+	}
 	
 	my $i=0;
 	foreach my $resource (@resources) {
@@ -5585,8 +5765,9 @@ SCANTRONFORM
 		      'grade_domain'  =>$udom,
 		      'grade_courseid'=>$env{'request.course.id'},
 		      'grade_symb'    =>$resource->symb());
-	    if (exists($scan_record->{'scantron.CODE'}) &&
-		$scan_record->{'scantron.CODE'}) {
+	    if (exists($scan_record->{'scantron.CODE'})
+		&& 
+		&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
 		$form{'CODE'}=$scan_record->{'scantron.CODE'};
 	    } else {
 		$form{'CODE'}='';
@@ -5687,13 +5868,13 @@ sub scantron_upload_scantron_data_save {
     my $uploadedfile=$fname;
     $fname='scantron_orig_'.$fname;
     if (length($env{'form.upfile'}) < 2) {
-	$r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
+	$r->print("<span class=\"LC_error\">Error:</span> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
     } else {
 	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
 	if ($result =~ m|^/uploaded/|) {
-	    $r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+	    $r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
 	} else {
-	    $r->print("<font color='red'>Error:</font> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
+	    $r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
 	}
     }
     if ($symb) {
@@ -5822,7 +6003,7 @@ sub gradingmenu {
 </script>
 GRADINGMENUJS
     &commonJSfunctions($request);
-    my $result='<h3>&nbsp;<font color="#339933">Manual Grading/View Submission</font></h3>';
+    my $result='<h3>&nbsp;<span class="LC_info">Manual Grading/View Submission</span></h3>';
     my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
     $result.=$table;
     my (undef,$sections) = &getclasslist('all','0');
@@ -5852,38 +6033,38 @@ GRADINGMENUJS
     if (ref($sections)) {
 	foreach (sort (@$sections)) {
 	    $result.='<option value="'.$_.'" '.
-		($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
+		($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
 	}
     }
-    $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></select> &nbsp; ';
+    $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
 
-    $result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
+    $result.=&mt('Student Status').':'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
 
     $result.='</td></tr>';
 
     $result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'.
 	'<input type="radio" name="radioChoice" value="submission" '.
-	($saveCmd eq 'submission' ? 'checked' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+	($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
 	'</label> <select name="submitonly">'.
 	'<option value="yes" '.
-	($saveSub eq 'yes' ? 'selected="on"' : '').' />'.&mt('with submissions').'</option>'.
+	($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'.
 	'<option value="queued" '.
-	($saveSub eq 'queued' ? 'selected="on"' : '').' />'.&mt('in grading queue').'</option>'.
+	($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>'.
 	'<option value="graded" '.
-	($saveSub eq 'graded' ? 'selected="on"' : '').' />'.&mt('with ungraded submissions').'</option>'.
+	($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>'.
 	'<option value="incorrect" '.
-	($saveSub eq 'incorrect' ? 'selected="on"' : '').' />'.&mt('with incorrect submissions').'</option>'.
+	($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'.
 	'<option value="all" '.
-	($saveSub eq 'all' ? 'selected="on"' : '').' />'.&mt('with any status').'</option></select></td></tr>'."\n";
+	($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";
 
     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
 	'<label><input type="radio" name="radioChoice" value="viewgrades" '.
-	($saveCmd eq 'viewgrades' ? 'checked' : '').' /> '.
+	($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
 	'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";
 
     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
 	'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
-	($saveCmd eq 'pickStudentPage' ? 'checked' : '').' /> '.
+	($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
 	'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
 
     $result.='<tr bgcolor="#ffffe6"><td><br />'.
@@ -5897,6 +6078,10 @@ GRADINGMENUJS
 	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
 	' '.&mt('scores from file').' </td></tr>'."\n";
 
+    $result.='<tr bgcolor="#ffffe6"><td>'.
+        '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.
+        ' '.&mt('clicker file').' </td></tr>'."\n";
+
     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
 	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
 	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
@@ -5916,9 +6101,9 @@ GRADINGMENUJS
 	'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
 	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
 
-    $result.='</form></td></tr></table>'."\n".
+    $result.='</table>'."\n".
 	'</td></tr></table>'."\n".
-	'</td></tr></table>'."\n";
+	'</td></tr></table></form>'."\n";
     return $result;
 }
 
@@ -5944,6 +6129,184 @@ sub init_perm {
     }
 }
 
+sub gather_clicker_ids {
+    my %clickerids=();
+
+    my $classlist = &Apache::loncoursedata::get_classlist();
+
+    # Set up a couple variables.
+    my $usernameidx = &Apache::loncoursedata::CL_SNAME();
+    my $domainidx   = &Apache::loncoursedata::CL_SDOM();
+
+    foreach my $student (keys %$classlist) {
+
+        my $username = $classlist->{$student}->[$usernameidx];
+        my $domain   = $classlist->{$student}->[$domainidx];
+        my $clickers =
+	   (&Apache::lonnet::userenvironment($domain,$username,'clickers'))[1];
+        foreach my $id (split(/\,/,$clickers)) {
+            if (exists($clickerids{$id})) {
+               $clickerids{$id}.=','.$username.':'.$domain;
+            } else {
+               $clickerids{$id}=$username.':'.$domain;
+            }
+        }
+    }
+    return %clickerids;
+}
+
+sub gather_adv_clicker_ids {
+    my %clickerids=();
+    my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+    foreach my $element (sort keys %coursepersonnel) {
+        foreach my $person (split(/\,/,$coursepersonnel{$element})) {
+            my ($puname,$pudom)=split(/\:/,$person);
+            my $clickers =
+               (&Apache::lonnet::userenvironment($pudom,$puname,'clickers'))[1];
+               foreach my $id (split(/\,/,$clickers)) {
+               if (exists($clickerids{$id})) {
+                  $clickerids{$id}.=','.$puname.':'.$pudom;
+               } else {
+                  $clickerids{$id}=$puname.':'.$pudom;
+               }
+           }
+        }
+    }
+    return %clickerids;
+}
+
+sub process_clicker {
+    my ($r)=@_;
+    my ($symb)=&get_symb($r);
+    if (!$symb) {return '';}
+    my $result=&checkforfile_js();
+    $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
+    $result.=$table;
+    $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
+    $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
+    $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource').
+        '.</b></td></tr>'."\n";
+    $result.='<tr bgcolor=#ffffe6><td>'."\n";
+    my $upload=&mt("Upload File");
+    my $type=&mt("Type");
+    my $attendance=&mt("Award points just for participation");
+    my $personnel=&mt("Correctness determined from response by course personnel");
+    my $specific=&mt("Correctness determined from response with clicker ID"); 
+    my $pcorrect=&mt("Percentage points for correct solution");
+    my $pincorrect=&mt("Percentage points for incorrect solution");
+    my $selectform=&Apache::loncommon::select_form('iclicker','upfiletype',
+                                  ('iclicker' => 'iClicker'));
+
+    $result.=<<ENDUPFORM;
+<script type="text/javascript">
+function sanitycheck() {
+// Accept only integer percentages
+   document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);
+   document.forms.gradesupload.pincorrect.value=Math.round(document.forms.gradesupload.pincorrect.value);
+// Find out grading choice
+   for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) {
+      if (document.forms.gradesupload.gradingmechanism[i].checked) {
+         gradingchoice=document.forms.gradesupload.gradingmechanism[i].value;
+      }
+   }
+// By default, new choice equals user selection
+   newgradingchoice=gradingchoice;
+// Not good to give more points for false answers than correct ones
+   if (Math.round(document.forms.gradesupload.pcorrect.value)<Math.round(document.forms.gradesupload.pincorrect.value)) {
+      document.forms.gradesupload.pcorrect.value=document.forms.gradesupload.pincorrect.value;
+   }
+// If new choice is attendance only, and old choice was correctness-based, restore defaults
+   if ((gradingchoice=='attendance') && (document.forms.gradesupload.waschecked.value!='attendance')) {
+      document.forms.gradesupload.pcorrect.value=100;
+      document.forms.gradesupload.pincorrect.value=100;
+   }
+// If the values are different, cannot be attendance only
+   if ((Math.round(document.forms.gradesupload.pcorrect.value)!=Math.round(document.forms.gradesupload.pincorrect.value)) &&
+       (gradingchoice=='attendance')) {
+       newgradingchoice='personnel';
+   }
+// Change grading choice to new one
+   for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) {
+      if (document.forms.gradesupload.gradingmechanism[i].value==newgradingchoice) {
+         document.forms.gradesupload.gradingmechanism[i].checked=true;
+      } else {
+         document.forms.gradesupload.gradingmechanism[i].checked=false;
+      }
+   }
+// Remember the old state
+   document.forms.gradesupload.waschecked.value=newgradingchoice;
+}
+</script>
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="command" value="processclickerfile" />
+<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
+<input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
+<input type="file" name="upfile" size="50" />
+<br /><label>$type: $selectform</label>
+<br /><label>$attendance: <input type="radio" name="gradingmechanism" value="attendance" checked="checked" onClick="sanitycheck()" /></label>
+<br /><label>$personnel: <input type="radio" name="gradingmechanism" value="personnel" onClick="sanitycheck()" /></label>
+<br /><label>$specific: <input type="radio" name="gradingmechanism" value="specific" onClick="sanitycheck()" /></label>
+<input type="text" name="specificid" size="15" />
+<input type="hidden" name="waschecked" value="attendance" />
+<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="100" onChange="sanitycheck()" /></label>
+<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="100" onChange="sanitycheck()" /></label>
+<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
+</form>
+ENDUPFORM
+    $result.='</td></tr></table>'."\n".
+             '</td></tr></table><br /><br />'."\n";
+    $result.=&show_grading_menu_form($symb);
+    return $result;
+}
+
+sub process_clicker_file {
+    my ($r)=@_;
+    my ($symb)=&get_symb($r);
+    if (!$symb) {return '';}
+    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+    if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
+       $result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
+       return $result.&show_grading_menu_form($symb);
+    }
+    my %clickerids=&gather_clicker_ids();
+    my %correctids=();
+    if ($env{'form.gradingmechanism'} eq 'personnel') {
+       %correctids=&gather_adv_clicker_ids();
+    }
+    if ($env{'form.gradingmechanism'} eq 'specific') {
+       my $correctid=$env{'form.specificid'};
+       $correctid=~tr/a-z/A-Z/;
+       $correctid=~s/\s//gs;
+       $correctids{$correctid}='specified';
+    }
+    if ($env{'form.gradingmechanism'} eq 'attendance') {
+       $result.=&mt('Score based on attendance only');
+    } else {
+       my $number=0;
+       $result.='<h3>'.&mt('Correctness determined by the following IDs').'</h3>';
+       foreach my $id (sort(keys(%correctids))) {
+          $result.='<tt>'.$id.'</tt> - ';
+          if ($correctids{$id} eq 'specified') {
+             $result.=&mt('specified');
+          } else {
+             my ($uname,$udom)=split(/\:/,$correctids{$id});
+             $result.=&Apache::loncommon::plainname($uname,$udom);
+          }
+          $result.='<br />';
+          $number++;
+       }
+       if ($number==0) {
+          $result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';
+          return $result.&show_grading_menu_form($symb);
+       }
+    }
+    return $result.&show_grading_menu_form($symb);
+}
+
 sub handler {
     my $request=$_[0];
 
@@ -6011,6 +6374,10 @@ sub handler {
 	    $request->print(&editgrades($request));
 	} elsif ($command eq 'verify' && $perm{'vgr'}) {
 	    $request->print(&verifyreceipt($request));
+        } elsif ($command eq 'processclicker' && $perm{'mgr'}) {
+            $request->print(&process_clicker($request));
+        } elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {
+            $request->print(&process_clicker_file($request));
 	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
 	    $request->print(&upcsvScores_form($request));
 	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {