From 62435b4c271ceef50c1779215f62335e418feb15 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 7 Feb 2013 14:12:14 -0500
Subject: [PATCH] Clean up results display

---
 common/lib/xmodule/xmodule/combined_open_ended_modulev1.py    | 2 +-
 common/lib/xmodule/xmodule/css/combinedopenended/display.scss | 2 +-
 lms/templates/combined_open_ended.html                        | 3 ++-
 lms/templates/combined_open_ended_results.html                | 2 +-
 lms/templates/combined_open_ended_status.html                 | 2 --
 lms/templates/open_ended.html                                 | 2 +-
 lms/templates/self_assessment_prompt.html                     | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
index 08f7abcf6b..dd51e009f2 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
@@ -511,7 +511,7 @@ class CombinedOpenEndedV1Module():
         task_number = int(get['task_number'])
         self.update_task_states()
         response_dict = self.get_last_response(task_number)
-        context = {'results': response_dict['post_assessment'], 'task_number': task_number + 1}
+        context = {'results': response_dict['post_assessment'], 'task_number': task_number + 1, 'task_name' : response_dict['human_task']}
         html = self.system.render_template('combined_open_ended_results.html', context)
         return {'html': html, 'success': True}
 
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index b34439e0a1..d8072bb1b3 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -49,7 +49,7 @@ section.combined-open-ended-status {
       color: #2C2C2C;
       background-color : #d4d4d4;
       font-size: .9em;
-      padding: 0px;
+      padding: 2px;
       display: inline;
       width: 20%;
       .show-results {
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index afd6ade5db..935cff3b7b 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,10 +1,11 @@
 <section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}">
 
-    <h2>${display_name}</h2>
     <div class="status-container">
         ${status | n}
     </div>
 
+    <h2>${display_name}</h2>
+
     <div class="item-container">
         <h4>Prompt <a href="#" class="question-header">(Hide)</a> </h4>
         <div class="problem-container">
diff --git a/lms/templates/combined_open_ended_results.html b/lms/templates/combined_open_ended_results.html
index 65732cdbaa..698a4f52a4 100644
--- a/lms/templates/combined_open_ended_results.html
+++ b/lms/templates/combined_open_ended_results.html
@@ -1,4 +1,4 @@
 <div class="result-container">
-    <h4>Results from Step ${task_number}</h4>
+    <h4>Results from ${task_name}</h4>
     ${results | n}
 </div>
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 265c26c6ce..d00f763f56 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,4 +1,3 @@
-%if status_list[0]['state'] != 'initial':
 <div class="status-elements">
 <section id="combined-open-ended-status" class="combined-open-ended-status">
     %for i in xrange(0,len(status_list)):
@@ -17,4 +16,3 @@
     %endfor
 </section>
 </div>
-%endif
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 5697a5ab8b..64defedda4 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -3,7 +3,7 @@
    <div class="prompt">
     ${prompt|n}
    </div>
-  <h4>Answer</h4>
+  <h4>Response</h4>
   <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}">${previous_answer|h}</textarea>
 
   <div class="message-wrapper"></div>
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index 364009b134..564508cb7b 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -5,7 +5,7 @@
     ${prompt}
     </div>
 
-    <h4>Answer</h4>
+    <h4>Response</h4>
     <div>
     <textarea name="answer" class="answer short-form-response" cols="70" rows="20">${previous_answer|n}</textarea>
     </div>