From e1cba4b0b4927ad7b44876d472135cb191371976 Mon Sep 17 00:00:00 2001
From: marco <marcotuts@gmail.com>
Date: Fri, 9 Aug 2013 11:26:59 -0400
Subject: [PATCH] cleaned up html structure for various pages, style fixed for
 show/hide prompt item

---
 .../css/combinedopenended/display.scss        |   4 +
 .../js/fixtures/combined-open-ended.html      | 121 +++++++++---------
 lms/static/sass/course/_rubric.scss           |   1 +
 .../combined_open_ended.html                  |   3 +-
 .../combined_open_ended_results.html          |  10 +-
 .../openended/open_ended_combined_rubric.html |   2 +-
 6 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index b63e04d20e..4565f73bc8 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -132,6 +132,10 @@ section.combined-open-ended-status {
       border-radius: 0 $baseline/4 $baseline/4 0;
       border-right: 0px;
     }
+
+    &:only-child {
+      border-radius: $baseline/4;
+    }
   
     .show-results {
       margin-top: .3em;
diff --git a/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html b/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html
index abea783ae8..5cd1113103 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html
@@ -1,75 +1,78 @@
 <section class="course-content">
-      <section class="xmodule_display xmodule_CombinedOpenEndedModule" data-type="CombinedOpenEnded">
+  <section class="xmodule_display xmodule_CombinedOpenEndedModule" data-type="CombinedOpenEnded">
     <section id="combined-open-ended" class="combined-open-ended" data-ajax-url="/courses/MITx/6.002x/2012_Fall/modx/i4x://MITx/6.002x/combinedopenended/CombinedOE" data-allow_reset="False" data-state="assessing" data-task-count="2" data-task-number="1">
-
-    <h2>Problem 1</h2>
-    <div class="status-container">
-            <h4>Status</h4>
-<div class="status-elements">
-<section id="combined-open-ended-status" class="combined-open-ended-status">
-        
-            <div class="statusitem" data-status-number="0">
-
-            Step 1 (Problem complete) : 1 / 1
+        <h2>Problem 1</h2>
+        <div class="status-container">
+          <h4>Status</h4>
+          <div class="status-elements">
+            <section id="combined-open-ended-status" class="combined-open-ended-status">
+              <div class="statusitem" data-status-number="0">
+                Step 1 (Problem complete) : 1 / 1
                 <span class="correct" id="status"></span> 
-
-        </div>
-        
-            <div class="statusitem statusitem-current" data-status-number="1">
-
-            Step 2 (Being scored) : None / 1
+              </div>
+              <div class="statusitem statusitem-current" data-status-number="1">
+                Step 2 (Being scored) : None / 1
                 <span class="grading" id="status"></span>
-
+              </div>
+            </section>
+          </div>
         </div>
-</section>
-</div>
-
-    </div>
-
-    <div class="item-container">
-        <h4>Problem</h4>
+        <div class="item-container">
+          <h4>Problem</h4>
         <div class="problem-container">
-        <div class="item"><section id="openended_open_ended" class="open-ended-child" data-state="assessing" data-child-type="openended"><div class="error"></div>
-   <div class="prompt">
-    
-		Some prompt.
-	
-   </div>
-  <textarea rows="30" cols="80" name="answer" class="answer short-form-response" id="input_open_ended" disabled="disabled">Test submission. Yaaaaaaay!</textarea><div class="message-wrapper"></div>
-  <div class="grader-status">
-      <span class="grading" id="status_open_ended">Submitted for grading.</span>
-
-  </div>
-
-  <input type="button" value="Submit assessment" class="submit-button" name="show" style="display: none;"><input name="skip" class="skip-button" type="button" value="Skip Post-Assessment" style="display: none;"><div class="open-ended-action"></div>
-
-  <span id="answer_open_ended"></span>
-</section></div>
+        <div class="item">
+          <section id="openended_open_ended" class="open-ended-child" data-state="assessing" data-child-type="openended">
+            <div class="error">
+            </div>
+            <div class="prompt">
+              Some prompt.
+            </div>
+            <textarea rows="30" cols="80" name="answer" class="answer short-form-response" id="input_open_ended" disabled="disabled">
+              Test submission. Yaaaaaaay!
+            </textarea>
+            <div class="message-wrapper"></div>
+            <div class="grader-status">
+              <span class="grading" id="status_open_ended">Submitted for grading.</span>
+            </div>
+            <input type="button" value="Submit assessment" class="submit-button" name="show" style="display: none;">
+            <input name="skip" class="skip-button" type="button" value="Skip Post-Assessment" style="display: none;">
+            <div class="open-ended-action"></div>
+            <span id="answer_open_ended"></span>
+          </section>
         </div>
-
-
-        <input type="button" value="Reset" class="reset-button" name="reset" style="display: none;">
-        <input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">
+      </div>
+      <input type="button" value="Reset" class="reset-button" name="reset" style="display: none;">
+      <input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">
     </div>
-
     <a name="results">
-    <div class="result-container">
-    </div>
-</a></section><a name="results">
-
-
-</a></section><a name="results">
-
-</a><div><a name="results">
-	</a><a href="https://github.com/MITx/content-mit-6002x/tree/master/combinedopenended/CombinedOE.xml">Edit</a> /
-	<a href="#i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa-modal" onclick="javascript:getlog('i4x_MITx_6_002x_combinedopenended_CombinedOE', {
+      <div class="result-container">
+      </div>
+    </a>
+  </section>
+  <a name="results">
+  </a>
+</section>
+<a name="results">
+</a>
+<div>
+  <a name="results">
+  </a>
+  <a href="https://github.com/MITx/content-mit-6002x/tree/master/combinedopenended/CombinedOE.xml">
+    Edit
+  </a> /
+  <a href="#i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa-modal" onclick="javascript:getlog('i4x_MITx_6_002x_combinedopenended_CombinedOE', {
         'location': 'i4x://MITx/6.002x/combinedopenended/CombinedOE',
         'xqa_key': 'KUBrWtK3RAaBALLbccHrXeD3RHOpmZ2A',
         'category': 'CombinedOpenEndedModule',
         'user': 'blah'
-     })" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_log">QA</a>
-</div>
-<div><a href="#i4x_MITx_6_002x_combinedopenended_CombinedOE_debug" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_trig">Staff Debug Info</a></div>
+     })" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_log">QA
+   </a>
+ </div>
+ <div>
+  <a href="#i4x_MITx_6_002x_combinedopenended_CombinedOE_debug" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_trig">
+      Staff Debug Info
+    </a>
+  </div>
 
 <section id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa-modal" class="modal xqa-modal" style="width:80%; left:20%; height:80%; overflow:auto">
   <div class="inner-wrapper">
diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss
index 6c1467bfb8..59aabdb917 100644
--- a/lms/static/sass/course/_rubric.scss
+++ b/lms/static/sass/course/_rubric.scss
@@ -1,4 +1,5 @@
 .rubric-header {
+  padding: $baseline/2 0; 
   .rubric-collapse {
     float: right;
   }
diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html
index 1a5c7e3c7d..083ca7dfb3 100644
--- a/lms/templates/combinedopenended/combined_open_ended.html
+++ b/lms/templates/combinedopenended/combined_open_ended.html
@@ -29,14 +29,13 @@
             <div class="visibility-control visibility-control-prompt">
                 <div class="inner">
                 </div>
-                <a href="" class="question-header">Hide Prompt</a>
+                <a href="" class="section-header section-header-prompt question-header">Hide Prompt</a>
             </div>
             <div class="problem-container">
             % for item in items:
                 <div class="item">${item['content'] | n}</div>
             % endfor
             </div>
-
             <input type="button" value="Reset" class="reset-button" name="reset"/>
             <input type="button" value="Next Step" class="next-step-button" name="reset"/>
         </div>
diff --git a/lms/templates/combinedopenended/combined_open_ended_results.html b/lms/templates/combinedopenended/combined_open_ended_results.html
index 688354ff4c..4f8160acc0 100644
--- a/lms/templates/combinedopenended/combined_open_ended_results.html
+++ b/lms/templates/combinedopenended/combined_open_ended_results.html
@@ -11,8 +11,14 @@
                 </div>
                 <span class="section-header section-header-rubric">Submitted Rubric</span>
             </div>
-            <div class="rubric-header"> 
-                ${result['task_name']} from grader ${i+1} 
+            <div class="rubric-header">
+                % if len(results)>1:
+                    <a href="#" class="rubric-previous-button">Previous</a>
+                % endif 
+                ${result['task_name']} from grader ${i+1}
+                % if len(results)>1:
+                    <a href="#" class="rubric-next-button">Next</a> 
+                % endif
                 <button class="rubric-collapse" href="#">Show Score Only</button>
             </div>
             ${result['result'] | n}
diff --git a/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html b/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
index 158ec1f981..5f763f371d 100644
--- a/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
+++ b/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
@@ -1,7 +1,7 @@
 <div class="rubric">
     % for i in range(len(categories)):
         <% category = categories[i] %>
-        <span class="rubric-category">${category['description']}</span> <br/>
+        <span class="rubric-category">${category['description']}</span>
         <ul class="rubric-list">
         % for j in range(len(category['options'])):
             <% option = category['options'][j] %>