From 1cf8326b323db42834ee1f7dcf9426cac618f282 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 7 Feb 2013 14:03:43 -0500
Subject: [PATCH] Make status bar, minor CSS fixes

---
 .../xmodule/css/combinedopenended/display.scss      |  9 +++++----
 lms/static/sass/course/_rubric.scss                 |  1 -
 lms/templates/combined_open_ended_status.html       | 13 +------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index f4bb374622..b34439e0a1 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -47,10 +47,11 @@ section.combined-open-ended-status {
 
     .statusitem {
       color: #2C2C2C;
-      font-size: 1em;
+      background-color : #d4d4d4;
+      font-size: .9em;
       padding: 0px;
-      display: block;
-      width: 70%;
+      display: inline;
+      width: 20%;
       .show-results {
           margin-top: .3em;
           text-align:right;
@@ -61,7 +62,7 @@ section.combined-open-ended-status {
    }
 
    .statusitem-current {
-     background-color: #d4d4d4;
+     background-color: #B2B2B2;
      color: #222;
   }
 
diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss
index 92a8b0c574..00c0f31a1e 100644
--- a/lms/static/sass/course/_rubric.scss
+++ b/lms/static/sass/course/_rubric.scss
@@ -21,7 +21,6 @@
   {
       position: relative;
       font-size: .9em;
-      background-color: white;
       display: block;
   }
   .grade {
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index bc552c0d76..265c26c6ce 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,5 +1,4 @@
 %if status_list[0]['state'] != 'initial':
-<h4>Status</h4>
 <div class="status-elements">
 <section id="combined-open-ended-status" class="combined-open-ended-status">
     %for i in xrange(0,len(status_list)):
@@ -10,17 +9,7 @@
             <div class="statusitem" data-status-number="${i}">
         %endif
 
-            ${status['task_number']}. ${status['human_task']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
-            % if status['state'] == 'initial':
-                <span class="unanswered" id="status"></span>
-            % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'correct':
-                <span class="correct" id="status"></span> 
-            % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'incorrect':
-                <span class="incorrect" id="status"></span> 
-            % elif status['state'] == 'assessing':
-                <span class="grading" id="status"></span>
-            % endif
-
+            ${status['human_task']} (${status['human_state']}) ${status['score']} / ${status['max_score']}
             %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
                <a href="#results" class="show-results-button"> Show results</a>
             %endif