From cc72870aac434e461ac488a26f010388e67ef5eb Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 10 Dec 2012 11:00:28 -0500
Subject: [PATCH 1/3] Make oepn-ended responses and self-assessment answers use
 the same CSS

---
 common/lib/capa/capa/templates/openendedinput.html |  2 +-
 lms/static/sass/course/courseware/_courseware.scss | 13 ++++++-------
 lms/templates/self_assessment_prompt.html          |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/lib/capa/capa/templates/openendedinput.html b/common/lib/capa/capa/templates/openendedinput.html
index 8cc19a2705..22633d3a0a 100644
--- a/common/lib/capa/capa/templates/openendedinput.html
+++ b/common/lib/capa/capa/templates/openendedinput.html
@@ -1,5 +1,5 @@
 <section id="openended_${id}" class="openended">
-  <textarea rows="${rows}" cols="${cols}" name="input_${id}" id="input_${id}"
+  <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
        % if hidden:
       	    style="display:none;"
        % endif
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index 350665dbce..c575baa092 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -241,15 +241,14 @@ div.course-wrapper {
   
 }
 
+textarea.short-form-response {
+    height: 200px;
+    padding: 5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
 
 section.self-assessment {
-    textarea.answer {
-        height: 200px;
-        padding: 5px;
-        margin-top: 5px;
-        margin-bottom: 5px;
-    }
-
     textarea.hint {
         height: 100px;
         padding: 5px;
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index 88549e9f56..91472cbdaf 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -6,7 +6,7 @@
     </div>
 
     <div>
-    <textarea name="answer" class="answer" cols="70" rows="20">${previous_answer|h}</textarea>
+    <textarea name="answer" class="answer short-form-response" cols="70" rows="20">${previous_answer|h}</textarea>
     </div>
 
     <div class="rubric-wrapper">${initial_rubric}</div>

From 3156c2b3934a1682ea436ce0c99ec7b64a77eca3 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 10 Dec 2012 12:29:46 -0500
Subject: [PATCH 2/3] Add icon to the grading message

---
 common/lib/xmodule/xmodule/css/capa/display.scss   | 2 ++
 lms/static/sass/course/courseware/_courseware.scss | 1 +
 2 files changed, 3 insertions(+)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index bbde1063ed..72cffdbfc7 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -257,6 +257,8 @@ section.problem {
       }
 
       .grading {
+        background: url('../images/info-icon.png') left center no-repeat;
+        padding-left: 25px;
         text-indent: 0px;
         margin: 0px 7px 0 0;
       }
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index c575baa092..a006386490 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -246,6 +246,7 @@ textarea.short-form-response {
     padding: 5px;
     margin-top: 5px;
     margin-bottom: 5px;
+    width: 100%;
 }
 
 section.self-assessment {

From 7279d11cf2347f88352a9e69c98ac47d42ade517 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 10 Dec 2012 14:16:00 -0500
Subject: [PATCH 3/3] Add a reload button to open-ended input problems

---
 common/lib/capa/capa/templates/openendedinput.html | 3 +++
 common/lib/xmodule/xmodule/css/capa/display.scss   | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/common/lib/capa/capa/templates/openendedinput.html b/common/lib/capa/capa/templates/openendedinput.html
index 22633d3a0a..65fc7fb9bb 100644
--- a/common/lib/capa/capa/templates/openendedinput.html
+++ b/common/lib/capa/capa/templates/openendedinput.html
@@ -23,6 +23,9 @@
 
   <span id="answer_${id}"></span>
 
+    % if status == 'queued':
+    <input name="reload" class="reload" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
+    % endif
   <div class="external-grader-message">
     ${msg|n}
   </div>
diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 72cffdbfc7..b25ab3d3a2 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -240,6 +240,13 @@ section.problem {
       }
     }
 
+    .reload
+    {
+      float:right;
+      margin: 10px;
+    }
+
+
     .grader-status {
       padding: 9px;
       background: #F6F6F6;