From 579b66d9dd641994aeaa99cdfd682e14fb302665 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 25 Jul 2013 11:44:42 -0400
Subject: [PATCH] Redesign header css

---
 .../css/combinedopenended/display.scss        | 29 +++++++++++++++----
 .../combined_open_ended.html                  | 15 ++++++----
 .../combined_open_ended_status.html           |  3 --
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index f2d8e5c497..2b20943d8b 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -16,6 +16,21 @@ h2 {
   }
 }
 
+div.name{
+    padding-bottom: 15px;
+    h2{
+        display: inline;
+    }
+
+    .progress-container
+        {
+            display: inline;
+            float: right;
+            padding-top: 3px;
+        }
+
+}
+
 .inline-error {
   color: darken($error-red, 10%);
 }
@@ -24,6 +39,13 @@ section.combined-open-ended {
   @include clearfix;
   .status-bar
   {
+    float: right;
+    display: inline-block;
+
+    .problemtype{
+        display: inline;
+        margin-right: 140px;
+    }
 
     .status-container
     {
@@ -31,15 +53,11 @@ section.combined-open-ended {
       display: inline-block;
       padding-right: 20px
     }
-    .progress-container
-    {
-        padding-bottom: 5px;
-        display: inline-block;
-    }
   }
   .item-container
   {
       padding-bottom: 10px;
+      display: inline-block;
   }
 
   .result-container
@@ -76,7 +94,6 @@ section.combined-open-ended-status {
       padding: 10px;
       display: inline;
       width: 20%;
-      margin-right: 20px;
       .show-results {
           margin-top: .3em;
           text-align:right;
diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html
index e09fb29482..c4623b781d 100644
--- a/lms/templates/combinedopenended/combined_open_ended.html
+++ b/lms/templates/combinedopenended/combined_open_ended.html
@@ -1,13 +1,18 @@
 <section id="combined-open-ended" class="combined-open-ended" data-location="${location}" 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-bar">
-        <div class="status-container">
-            ${status|n}
-        </div>
+    <div class="name">
+        <h2>${display_name}</h2>
         <div class="progress-container">
             Progress: ${human_state}
         </div>
     </div>
+    <div class="status-bar">
+        <div class="problemtype">
+            Open Response Assessment
+        </div>
+        Assessments: <div class="status-container">
+            ${status|n}
+        </div>
+    </div>
 
     <div class="item-container">
         <h4>Prompt <a href="#" class="question-header">(Hide)</a> </h4>
diff --git a/lms/templates/combinedopenended/combined_open_ended_status.html b/lms/templates/combinedopenended/combined_open_ended_status.html
index 66afb79021..50c0459ce9 100644
--- a/lms/templates/combinedopenended/combined_open_ended_status.html
+++ b/lms/templates/combinedopenended/combined_open_ended_status.html
@@ -10,9 +10,6 @@
                     ${status['human_task']}
 
             </div>
-            %if i<len(status_list)-1:
-                <i class="icon-caret-right"></i>
-            %endif
         %endfor
     </section>
 </div>