--- loncom/homework/grades.pm	2007/10/11 22:34:33	1.454
+++ loncom/homework/grades.pm	2007/10/11 23:18:46	1.455
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.454 2007/10/11 22:34:33 banghart Exp $
+# $Id: grades.pm,v 1.455 2007/10/11 23:18:46 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7441,6 +7441,7 @@ GRADINGMENUJS
     $result.='<td><b>'.&mt('Sections').'</b></td>';
     $result.='<td><b>'.&mt('Groups').'</b></td>';
     $result.='<td><b>'.&mt('Access Status').'</td>'."\n";
+    $result.='<td><b>'.&mt('Submission Status').'</td>'."\n";
     $result.='</tr>';
     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
 	'&nbsp;<select name="section" multiple="multiple" size="3">'."\n";
@@ -7456,12 +7457,8 @@ GRADINGMENUJS
     $result.='</td><td>'."\n";
     $result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');
 
-    $result.='</td></tr>';
-
-    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.
-	'<input type="radio" name="radioChoice" value="submission" '.
-	($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
-	'</label> <select name="submitonly">'.
+    $result.='</td>';
+    $result.='<td><select name="submitonly" size="3">'.
 	'<option value="yes" '.
 	($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'.
 	'<option value="queued" '.
@@ -7471,19 +7468,29 @@ GRADINGMENUJS
 	'<option value="incorrect" '.
 	($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'.
 	'<option value="all" '.
-	($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";
+	($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>';
 
-    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.
+	'<input type="radio" name="radioChoice" value="submission" '.
+	($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+	'</label> </td></tr>'."\n";
+
+    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3">'.
 	'<label><input type="radio" name="radioChoice" value="viewgrades" '.
 	($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 colspan="2">'.
-	'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
+    $result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'.
+	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
+	'</td></tr>'."\n";
+
+
+    $result.='<tr bgcolor="#ffffe6" valign="top"><td colspan="3">'.
+	'<br /><label><input type="radio" name="radioChoice" value="pickStudentPage" '.
 	($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
-	'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
+	'The <b>complete</b> set/page/sequence/folder: For one student</label></td></tr>'."\n";
 
-    $result.='<tr bgcolor="#ffffe6"><td colspan="2"><br />'.
+    $result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'.
 	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
 	'</td></tr></table>'."\n";