[LON-CAPA-cvs] cvs: loncom /homework grades.pm /interface lonpickcode.pm

[albertel]

albertel		Mon Nov 12 20:14:33 2007 EDT

  Modified files:              
    /loncom/interface	lonpickcode.pm 
    /loncom/homework	grades.pm 
  Log:
  - xhtml
  - some small layout changes
  
  
Index: loncom/interface/lonpickcode.pm
diff -u loncom/interface/lonpickcode.pm:1.13 loncom/interface/lonpickcode.pm:1.14
--- loncom/interface/lonpickcode.pm:1.13	Fri Oct 12 16:08:38 2007
+++ loncom/interface/lonpickcode.pm	Mon Nov 12 20:14:11 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a CODE from the list of possible CODEs
 #
-# $Id: lonpickcode.pm,v 1.13 2007/10/12 20:08:38 banghart Exp $
+# $Id: lonpickcode.pm,v 1.14 2007/11/13 01:14:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,23 +106,21 @@
     } elsif ($context eq 2) {
         $table_head = ('<b>'.&mt('Select a set of saved CODEs to view.')."</b>");
     }
-    $r->print("<form method='POST' action='/adm/pickcode' name='pickcode'>");
+    $r->print("<form method='post' action='/adm/pickcode' name='pickcode'>");
     $r->print($enc_table_start);
     $r->print('<table width="100%">');
     $r->print('<tr><td bgcolor="#e6ffff">');
     $r->print($table_head);
     $r->print('</td></tr>');
     $r->print('<tr><td bgcolor="#ffffe6">');
+    $r->print("<input type='submit' name='submit' value='".&mt("View:")."' /> ");
     $r->print(&Apache::grades::scantron_CODElist());
     $r->print('</td></tr>');
+    $r->print('</table>');
+    $r->print($enc_table_close); # conditional
     $r->print("<input type='hidden' name='command' value='showcodes' />");
     $r->print("<input type='hidden' name='symb' value='".$env{'form.symb'}."' />");
     $r->print("<input type='hidden' name='url' value='".$env{'form.url'}."' />");
-    $r->print('<tr><td bgcolor="#ffffe6">');
-    $r->print("<input type='submit' name='submit' value='".&mt("View")."' />");
-    $r->print('</td></tr>');
-    $r->print('</table>');
-    $r->print($enc_table_close); # conditional
     $r->print("</form>");
     
 }
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.487 loncom/homework/grades.pm:1.488
--- loncom/homework/grades.pm:1.487	Thu Nov  8 15:47:56 2007
+++ loncom/homework/grades.pm	Mon Nov 12 20:14:32 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.487 2007/11/08 20:47:56 albertel Exp $
+# $Id: grades.pm,v 1.488 2007/11/13 01:14:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4904,8 +4904,8 @@
     $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">
@@ -4943,8 +4943,8 @@
             </td>
           </tr>
         </table>
-       </td>
-     </form>
+      </form>
+     </td>
     </tr>
 SCANTRONFORM
    
@@ -5006,27 +5006,27 @@
 
     $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