--- loncom/homework/grades.pm	2007/11/08 01:48:18	1.485
+++ loncom/homework/grades.pm	2007/11/13 01:14:32	1.488
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.485 2007/11/08 01:48:18 albertel Exp $
+# $Id: grades.pm,v 1.488 2007/11/13 01:14:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -733,9 +733,12 @@ sub verifyreceipt {
     $receipt     =~ s/[^\-\d]//g;
     my ($symb)   = &get_symb($request);
 
-    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 $title.=
+	'<h3><span class="LC_info">'.
+	&mt('Verifying Submission Receipt [_1]',$receipt).
+	'</span></h3>'."\n".
+	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
+	'</h4>'."\n";
 
     my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -745,6 +748,19 @@ sub verifyreceipt {
 	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
     my $parts=['0'];
     if ($receiptparts) { ($parts)=&response_type($symb); }
+    
+    my $header = 
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row().
+	'<th>&nbsp;'.&mt('Fullname').'&nbsp;</th>'."\n".
+	'<th>&nbsp;'.&mt('Username').'&nbsp;</th>'."\n".
+	'<th>&nbsp;'.&mt('Domain').'&nbsp;</th>';
+    if ($receiptparts) {
+	$header.='<th>&nbsp;'.&mt('Problem Part').'&nbsp;</th>';
+    }
+    $header.=
+	&Apache::loncommon::end_data_table_header_row();
+
     foreach (sort 
 	     {
 		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
@@ -755,7 +771,9 @@ sub verifyreceipt {
 	my ($uname,$udom)=split(/\:/);
 	foreach my $part (@$parts) {
 	    if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
-		$contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
+		$contents.=
+		    &Apache::loncommon::start_data_table_row().
+		    '<td>&nbsp;'."\n".
 		    '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
 		    '\');" target="_self">'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
 		    '<td>&nbsp;'.$uname.'&nbsp;</td>'.
@@ -763,28 +781,23 @@ sub verifyreceipt {
 		if ($receiptparts) {
 		    $contents.='<td>&nbsp;'.$part.'&nbsp;</td>';
 		}
-		$contents.='</tr>'."\n";
+		$contents.= 
+		    &Apache::loncommon::end_data_table_row()."\n";
 		
 		$matches++;
 	    }
 	}
     }
     if ($matches == 0) {
-	$string = $title.'No match found for the above receipt.';
+	$string = $title.&mt('No match found for the above receipt.');
     } else {
 	$string = &jscriptNform($symb).$title.
-	    'The above receipt matches the following student'.
-	    ($matches <= 1 ? '.' : 's.')."\n".
-	    '<table border="0"><tr><td bgcolor="#777777">'."\n".
-	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
-	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
-	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\n".
-	    '<td><b>&nbsp;Domain&nbsp;</b></td>';
-	if ($receiptparts) {
-	    $string.='<td>&nbsp;Problem Part&nbsp;</td>';
-	}
-	$string.='</tr>'."\n".$contents.
-	    '</table></td></tr></table>'."\n";
+	    '<p>'.
+	    &mt('The above receipt matches the following [numerate,_1,student].',$matches).
+	    '</p>'.
+	    $header.
+	    $contents.
+	    &Apache::loncommon::end_data_table()."\n";
     }
     return $string.&show_grading_menu_form($symb);
 }
@@ -4891,8 +4904,8 @@ sub scantron_selectphase {
     $result.= <<SCANTRONFORM;
     <table width="100%" border="0">
     <tr>
-     <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
       <td bgcolor="#777777">
+       <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
        <input type="hidden" name="command" value="scantron_warning" />
         $default_form_data
         <table width="100%" border="0">
@@ -4930,8 +4943,8 @@ sub scantron_selectphase {
             </td>
           </tr>
         </table>
-       </td>
-     </form>
+      </form>
+     </td>
     </tr>
 SCANTRONFORM
    
@@ -4993,27 +5006,27 @@ SCANTRONFORM
 
     $r->print(<<SCANTRONFORM);
     <tr>
-      <form action='/adm/grades' name='scantron_download'>
-        <td bgcolor="#777777">
+     <td bgcolor="#777777">
+       <form action='/adm/grades' name='scantron_download'>
 	  $default_form_data
           <input type="hidden" name="command" value="scantron_download" />
           <table width="100%" border="0">
             <tr bgcolor="#e6ffff">
-              <td colspan="2">
+              <td>
                 &nbsp;<b>Download a scoring office file</b>
               </td>
             </tr>
             <tr bgcolor="#ffffe6">
-              <td> Filename of scoring office file: </td><td> $file_selector </td>
+              <td> Filename of scoring office file: $file_selector </td>
             </tr>
             <tr bgcolor="#ffffe6">
-              <td colspan="2">
+              <td>
                 <input type="submit" value="Download: Show List of Associated Files" />
               </td>
             </tr>
           </table>
-        </td>
-      </form>
+        </form>
+      </td>
     </tr>
 SCANTRONFORM