From 68199da821410205ef3c9741b8329555695caa4f Mon Sep 17 00:00:00 2001
From: marco <marcotuts@gmail.com>
Date: Fri, 9 Aug 2013 18:44:15 -0400
Subject: [PATCH] added oe-tools header areas to eventually consolitate all
 messaging

---
 .../css/combinedopenended/display.scss        | 20 +++++++++++++++++++
 .../js/fixtures/combined-open-ended.html      |  8 +++++---
 .../xmodule/xmodule/js/fixtures/rubric.html   | 12 +++++------
 lms/static/sass/course/_rubric.scss           | 10 ++++++++--
 .../combined_open_ended.html                  | 10 ++++++++--
 .../combined_open_ended_results.html          |  9 +++------
 .../self_assessment_prompt.html               |  2 --
 7 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 3500e6e47d..d4a79ff825 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -855,3 +855,23 @@ section.open-ended-child {
     padding: $baseline/2 0;
   }
 }
+
+//OE Tool Area Styling
+
+.oe-tools {
+  display: inline-block;
+  width: 100%;
+  border-radius: 5px;
+
+  .oe-tools-label {
+    font-size: 0.8em;
+    display: inline-block;
+    vertical-align: middle;
+    padding: 10px;
+  }
+
+  .reset-button {
+    vertical-align: middle; 
+  }
+}
+
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 5cd1113103..91d09f7922 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html
@@ -41,7 +41,10 @@
           </section>
         </div>
       </div>
-      <input type="button" value="Reset" class="reset-button" name="reset" style="display: none;">
+      <div class="oe-tools response-tools">
+        <span class="oe-tools-label">Response: </span>
+        <input type="button" value="Reset" class="reset-button" name="reset" style="display: none;">
+      </div>
       <input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">
     </div>
     <a name="results">
@@ -65,8 +68,7 @@
         'xqa_key': 'KUBrWtK3RAaBALLbccHrXeD3RHOpmZ2A',
         'category': 'CombinedOpenEndedModule',
         'user': 'blah'
-     })" id="i4x_MITx_6_002x_combinedopenended_CombinedOE_xqa_log">QA
-   </a>
+     })" 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">
diff --git a/common/lib/xmodule/xmodule/js/fixtures/rubric.html b/common/lib/xmodule/xmodule/js/fixtures/rubric.html
index 9802e3bf8d..6b867cc52b 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/rubric.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/rubric.html
@@ -77,9 +77,10 @@
             </section>
         </div>
     </div>
-
-    <input type="button" value="Reset" class="reset-button" name="reset" style="display: inline-block;">
-    <input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">
+    <div class="oe-tools response-tools">
+        <span class="oe-tools-label">Response: </span>
+        <input type="button" value="Reset" class="reset-button" name="reset" style="display: inline-block;">
+    </div>
 </div>
 
 <div class="combined-rubric-container" data-status="shown" data-number="0" style="">
@@ -89,8 +90,8 @@
     <span class="section-header section-header-rubric">Submitted Rubric</span>
 </div>
 <div class="rubric-header">
-    Scored rubric from grader 1
     <button class="rubric-collapse" href="#">Show Full Rubric</button>
+    Scored rubric from grader 1
 </div>
 <div class="rubric">
 
@@ -313,8 +314,7 @@ Demonstrates effective adjustment of language and tone to task and reader.
 </div>
 </div>
 
-
-
+<input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">
 
 <section class="legend-container">
 </section>
diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss
index 59aabdb917..b97eea5cd3 100644
--- a/lms/static/sass/course/_rubric.scss
+++ b/lms/static/sass/course/_rubric.scss
@@ -1,10 +1,16 @@
 .rubric-header {
-  padding: $baseline/2 0; 
+  background-color: #fafafa;
+  border-radius: 5px;
+
   .rubric-collapse {
-    float: right;
+    margin-right: $baseline/2;
   }
 }
 
+.button {
+  display: inline-block;
+}
+
 .rubric {
   margin: 0;
   color: #3C3C3C;
diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html
index 7d46df806e..84ac00fab3 100644
--- a/lms/templates/combinedopenended/combined_open_ended.html
+++ b/lms/templates/combinedopenended/combined_open_ended.html
@@ -37,12 +37,18 @@
                 <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 class="oe-tools response-tools">
+                <span class="oe-tools-label">Response: </span>
+                <input type="button" value="${_('Reset')}" class="reset-button" name="reset"/>
+            </div>
         </div>
 
         <div class="combined-rubric-container">
         </div>
+        <div class="oe-tools problem-tools">
+                <!--<span class="oe-tools-label">Once you have completed this form of assessment, you may continue.  </span>-->
+                <input type="button" value="${_('Next Step')}" class="next-step-button" name="reset"/>
+        </div>
 
         <section class="legend-container">
         </section>
diff --git a/lms/templates/combinedopenended/combined_open_ended_results.html b/lms/templates/combinedopenended/combined_open_ended_results.html
index 5dc79ed5d7..99ea6dc46d 100644
--- a/lms/templates/combinedopenended/combined_open_ended_results.html
+++ b/lms/templates/combinedopenended/combined_open_ended_results.html
@@ -11,7 +11,9 @@
                 </div>
                 <span class="section-header section-header-rubric">Submitted Rubric</span>
             </div>
-            <div class="rubric-header">
+            <div class="oe-tools rubric-header">
+                <span class="oe-tools-label">Assessment Tools: </span>
+                <button class="rubric-collapse" href="#">Show Score Only</button>
                 % if len(results)>1:
                     <a href="#" class="rubric-previous-button">Previous</a>
                 % endif 
@@ -19,7 +21,6 @@
                 % 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}
             <div class="written-feedback">
@@ -29,8 +30,4 @@
     %endif
 
 % endfor
-% if len(results)>1:
-        <a href="#" class="rubric-previous-button">Previous</a>
-        <a href="#" class="rubric-next-button">Next</a>
-% endif
 
diff --git a/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html b/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
index 99782e3185..543b8899f5 100644
--- a/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
+++ b/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
@@ -9,8 +9,6 @@
         </div>
         <span class="section-header section-header-response">Response</span>
     </div>
-
-    <h4>${_("Response")}</h4>
     <div>
     <textarea name="answer" class="answer short-form-response" cols="70" rows="20">${previous_answer|n}</textarea>
     </div>