From c195fe65cd38e53d99e690cd7f7503fdc67cfe23 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 7 Feb 2013 11:10:29 -0500
Subject: [PATCH] Restyle rubric list, submission container

---
 .../css/combinedopenended/display.scss        | 21 +++++++++++--------
 .../peergrading/peer_grading_problem.coffee   |  4 ++--
 lms/static/sass/course/_staff_grading.scss    | 17 ++++++++++++++-
 lms/templates/open_ended_rubric.html          |  4 ++--
 .../peer_grading/peer_grading_problem.html    |  4 ++--
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 3d97200a25..f4bb374622 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -401,7 +401,7 @@ section.open-ended-child {
     div.short-form-response {
           background: #F6F6F6;
           border: 1px solid #ddd;
-          margin-bottom: 20px;
+          margin-bottom: 0px;
           overflow-y: auto;
           height: 200px;
           @include clearfix;
@@ -475,14 +475,17 @@ section.open-ended-child {
     margin-left: .75rem;
   }
 
-  ul.rubric-list
-  {
-    list-style-type: none;
-    padding:0;
-    margin:0;
-    float:left;
-    display: block;
-  }
+    ul.rubric-list{
+        list-style-type: none;
+        padding:0;
+        margin:0;
+        li {
+             &.rubric-list-item{
+                 margin-bottom: 0px;
+                 padding: 0px;
+             }
+        }
+    }
 
   ol {
     list-style: decimal outside none;
diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
index deeb82900b..06a24193d4 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
@@ -323,7 +323,7 @@ class @PeerGradingProblem
     if response.success
 
       # load in all the data
-      @submission_container.html("<h3>Training Essay</h3>")
+      @submission_container.html("")
       @render_submission_data(response)
       # TODO: indicate that we're in calibration mode
       @calibration_panel.addClass('current-state')
@@ -350,7 +350,7 @@ class @PeerGradingProblem
   render_submission: (response) =>
     if response.success
       @submit_button.hide()
-      @submission_container.html("<h3>Submitted Essay</h3>")
+      @submission_container.html("")
       @render_submission_data(response)
 
       @calibration_panel.removeClass('current-state')
diff --git a/lms/static/sass/course/_staff_grading.scss b/lms/static/sass/course/_staff_grading.scss
index 5c71d0fb62..acca3327e3 100644
--- a/lms/static/sass/course/_staff_grading.scss
+++ b/lms/static/sass/course/_staff_grading.scss
@@ -5,6 +5,18 @@ div.peer-grading{
         margin: 0px;
     }
 
+    ul.rubric-list{
+        list-style-type: none;
+        padding:0;
+        margin:0;
+        li {
+             &.rubric-list-item{
+                 margin-bottom: 0px;
+                 padding: 0px;
+             }
+        }
+    }
+
     h1 {
         margin : 0 0 0 10px;
     }
@@ -18,6 +30,10 @@ div.peer-grading{
 
     div {
         margin: 0px;
+        &.submission-container{
+              overflow-y: auto;
+              height: 200px;
+        }
     }
 
     label {
@@ -132,7 +148,6 @@ div.peer-grading{
             padding: 2px;
             margin-bottom: 5px;
             background: #eee;
-            height: 10em;
             width:47.6%;
             h3
             {
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 34b8f9821e..2436cbb849 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -15,9 +15,9 @@
                 % for j in range(len(category['options'])):
                 <% option = category['options'][j] %>
                     %if option['selected'] and not view_only:
-                        <li class="selected-grade">
+                        <li class="selected-grade rubric-list-item">
                     %else:
-                        <li>
+                        <li class="rubric-list-item">
                     % endif
                     % if view_only:
                         % if option['selected']:
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html
index 290f4dbc80..5e3b231a4a 100644
--- a/lms/templates/peer_grading/peer_grading_problem.html
+++ b/lms/templates/peer_grading/peer_grading_problem.html
@@ -13,7 +13,7 @@
         </div>
 
         <div class="prompt-wrapper">
-            <h2>Question  <a href="#" class="question-header">(Hide)</a> </h2>
+            <h2>Prompt  <a href="#" class="question-header">(Hide)</a> </h2>
             <div class="prompt-information-container">
                 <section>
                 <div class="prompt-container">
@@ -25,7 +25,7 @@
 
 
     <section class="grading-wrapper">
-    <h2>Grading</h2>
+    <h2>Student Response</h2>
 
     <div class="grading-container">
         <div class="submission-wrapper">