From 9079c66a32e92192c0f606af2ac8d3dd2dd5eca4 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Wed, 16 Jan 2013 16:35:58 -0500
Subject: [PATCH] Some interface cleanup stuff for the combined open ended
 module.

---
 .../lib/xmodule/xmodule/combined_open_ended_module.py |  3 ++-
 .../xmodule/css/combinedopenended/display.scss        | 11 ++++++-----
 lms/templates/combined_open_ended.html                | 11 ++++++++---
 lms/templates/combined_open_ended_status.html         |  4 ++--
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a35573032a..f20103296b 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -305,6 +305,7 @@ class CombinedOpenEndedModule(XModule):
             'task_count': len(self.task_xml),
             'task_number': self.current_task_number + 1,
             'status': self.get_status(),
+            'display_name': self.display_name 
         }
 
         return context
@@ -603,4 +604,4 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         for child in ['task']:
             add_child(child)
 
-        return elt
\ No newline at end of file
+        return elt
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index c584082fae..628ff4fadc 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -40,6 +40,10 @@ section.combined-open-ended {
       width: 93%;
       position:relative;
   }
+  h4
+  {
+      margin-bottom:10px;
+  }
 }
 
 section.combined-open-ended-status {
@@ -49,15 +53,12 @@ section.combined-open-ended-status {
       color: #2C2C2C;
       font-family: monospace;
       font-size: 1em;
-      padding-top: 10px;
+      padding: 10px;
    }
 
    .statusitem-current {
-     background-color: #BEBEBE;
+     background-color: #ccc;
      color: #2C2C2C;
-     font-family: monospace;
-     font-size: 1em;
-     padding-top: 10px;
   }
 
     span {
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 71c22085e3..a32a496895 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,15 +1,20 @@
 <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}">
 
+    <h2>${display_name}</h2>
     <div class="status-container">
-        <h4>Status</h4><br/>
-        ${status | n}
+        <h4>Status</h4>
+        <div class="status-elements">
+            ${status | n}
+        </div>
     </div>
 
     <div class="item-container">
-        <h4>Problem</h4><br/>
+        <h4>Problem</h4>
+        <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"/>
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 34a5dd0d79..ff6f06e221 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -2,7 +2,7 @@
     %for i in xrange(0,len(status_list)):
         <%status=status_list[i]%>
         %if i==len(status_list)-1:
-            <div class="statusitem-current" data-status-number="${i}">
+            <div class="statusitem statusitem-current" data-status-number="${i}">
         %else:
             <div class="statusitem" data-status-number="${i}">
         %endif
@@ -25,4 +25,4 @@
             %endif
         </div>
     %endfor
-</section>
\ No newline at end of file
+</section>