--- loncom/homework/grades.pm	2007/10/30 01:04:31	1.472
+++ loncom/homework/grades.pm	2007/10/31 18:01:34	1.473
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.472 2007/10/30 01:04:31 albertel Exp $
+# $Id: grades.pm,v 1.473 2007/10/31 18:01:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7390,9 +7390,8 @@ sub submit_options {
 </script>
 GRADINGMENUJS
     &commonJSfunctions($request);
-    my $result='<h3>&nbsp;<span class="LC_info">Manual Grading/View Submission</span></h3>';
     my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
-    $result.=$table;
+    my $result;
     my (undef,$sections) = &getclasslist('all','0');
     my $savedState = &savedState();
     my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
@@ -7411,16 +7410,20 @@ GRADINGMENUJS
 
     $result.='
     <div class="LC_grade_select_mode">
-      <div class="LC_grade_select_mode_header">
-        '.&mt('Select a Grading/Viewing Option').'
-      </div>
-      <div class="LC_grade_select_mode_body">
-        <div class="LC_grade_select_mode_selector">
-           <div class="LC_grade_select_mode_selector_header">
-              '.&mt('Sections').'
-           </div>
-           <div class="LC_grade_select_mode_selector_body">
-	    <select name="section" multiple="multiple" size="5">'."\n";
+      <div class="LC_grade_select_mode_current">
+        <h2>
+          '.&mt('Grade Current Resource').'
+        </h2>
+        <div class="LC_grade_select_mode_body">
+          <div class="LC_grades_resource_info">
+           '.$table.'
+          </div>
+          <div class="LC_grade_select_mode_selector">
+             <div class="LC_grade_select_mode_selector_header">
+                '.&mt('Sections').'
+             </div>
+             <div class="LC_grade_select_mode_selector_body">
+	       <select name="section" multiple="multiple" size="5">'."\n";
     if (ref($sections)) {
 	foreach my $section (sort (@$sections)) {
 	    $result.='<option value="'.$section.'" '.
@@ -7429,64 +7432,75 @@ GRADINGMENUJS
     }
     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
     $result.='
-           </div>
-        </div>
-        <div class="LC_grade_select_mode_selector">
-           <div class="LC_grade_select_mode_selector_header">
-              '.&mt('Groups').'
-           </div>
-           <div class="LC_grade_select_mode_selector_body">
-              '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
-           </div>
-        </div>
-        <div class="LC_grade_select_mode_selector">
-           <div class="LC_grade_select_mode_selector_header">
-              '.&mt('Access Status').'
-           </div>
-           <div class="LC_grade_select_mode_selector_body">
-              '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-           </div>
-        </div>
-        <div class="LC_grade_select_mode_selector">
-           <div class="LC_grade_select_mode_selector_header">
-              '.&mt('Submission Status').'
-           </div>
-           <div class="LC_grade_select_mode_selector_body">
-             <select name="submitonly" size="5">
-	       <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
-	       <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
-	       <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
-	       <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>
-           </div>
-        </div>
-        <div class="LC_grade_select_mode_type_body">
-          <div class="LC_grade_select_mode_type">
-            <label>
-              <input type="radio" name="radioChoice" value="submission" '.
-	  ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.&mt('<b>Current Resource:</b> For one or more students').'
-	    </label> 
+             </div>
+          </div>
+          <div class="LC_grade_select_mode_selector">
+             <div class="LC_grade_select_mode_selector_header">
+                '.&mt('Groups').'
+             </div>
+             <div class="LC_grade_select_mode_selector_body">
+                '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
+             </div>
           </div>
-          <div class="LC_grade_select_mode_type">
-	    <label>
-              <input type="radio" name="radioChoice" value="viewgrades" '.
-	($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
-	&mt('<b>Current Resource:</b> For all students in selected section or course').'
-            </label>
+          <div class="LC_grade_select_mode_selector">
+             <div class="LC_grade_select_mode_selector_header">
+                '.&mt('Access Status').'
+             </div>
+             <div class="LC_grade_select_mode_selector_body">
+                '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
+             </div>
           </div>
-          <div class="LC_grade_select_mode_type">
-	    <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+          <div class="LC_grade_select_mode_selector">
+             <div class="LC_grade_select_mode_selector_header">
+                '.&mt('Submission Status').'
+             </div>
+             <div class="LC_grade_select_mode_selector_body">
+               <select name="submitonly" size="5">
+	         <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
+	         <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
+	         <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
+	         <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>
+             </div>
           </div>
-          <div class="LC_grade_select_mode_type">
-            <label>
-              <input type="radio" name="radioChoice" value="pickStudentPage" '.
-	($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
-	&mt('The <b>complete</b> set/page/sequence/folder: For one student').'
-            </label>
+          <div class="LC_grade_select_mode_type_body">
+            <div class="LC_grade_select_mode_type">
+              <label>
+                <input type="radio" name="radioChoice" value="submission" '.
+                  ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
+             &mt('Select individual students to grade and view submissions.').'
+	      </label> 
+            </div>
+            <div class="LC_grade_select_mode_type">
+	      <label>
+                <input type="radio" name="radioChoice" value="viewgrades" '.
+                  ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
+                    &mt('Grade all selected students in a grading table.').'
+              </label>
+            </div>
+            <div class="LC_grade_select_mode_type">
+	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+            </div>
           </div>
-          <div class="LC_grade_select_mode_type">
-	    <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+        </div>
+      </div>
+      <div class="LC_grade_select_mode_page">
+        <h2>
+         '.&mt('Grade Complete Folder for One Student').'
+        </h2>
+        <div class="LC_grades_select_mode_body">
+          <div class="LC_grade_select_mode_type_body">
+            <div class="LC_grade_select_mode_type">
+              <label>
+                <input type="radio" name="radioChoice" value="pickStudentPage" '.
+	  ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
+  &mt('The <b>complete</b> page/sequence/folder: For one student').'
+              </label>
+            </div>
+            <div class="LC_grade_select_mode_type">
+	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+            </div>
           </div>
         </div>
       </div>