From 6a6962df9e13df7fe26402cc87dccb0cec9845c5 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 7 Feb 2013 09:26:27 -0500
Subject: [PATCH] Alter rubric list, restyle rubric

---
 .../lib/xmodule/xmodule/css/combinedopenended/display.scss | 7 +++++++
 .../xmodule/js/src/peergrading/peer_grading_problem.coffee | 2 +-
 lms/static/sass/course/_rubric.scss                        | 6 +++---
 lms/templates/open_ended_rubric.html                       | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 8d921f828b..9d4cbc6647 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -478,6 +478,13 @@ section.open-ended-child {
     margin-left: .75rem;
   }
 
+  ul.rubric-list
+  {
+    list-style-type: none;
+    padding:0;
+    margin:0;
+  }
+
   ol {
     list-style: decimal outside none;
     margin-bottom: lh();
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 9cd1a1cf1b..7dc410b19c 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
@@ -239,7 +239,7 @@ class @PeerGradingProblem
   # finds the scores for each rubric category
   get_score_list: () =>
     # find the number of categories:
-    num_categories = $('table.rubric tr').length
+    num_categories = $('ul.rubric-list li').length
 
     score_lst = []
     # get the score for each one
diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss
index 43dd88b626..92a8b0c574 100644
--- a/lms/static/sass/course/_rubric.scss
+++ b/lms/static/sass/course/_rubric.scss
@@ -46,11 +46,11 @@
       position: relative;
       font-size: 16px;
   }
-
-  ul
+  ul.rubric-list
   {
       list-style-type: none;
+      padding:0;
+      margin:0;
   }
-  
 }
 
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 3ce848cf8d..8d7f6be544 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -11,7 +11,7 @@
         % for i in range(len(categories)):
         <% category = categories[i] %>
             <b>${category['description']}</b><br/>
-            <ul>
+            <ul class="rubric-list">
                 % for j in range(len(category['options'])):
                 <% option = category['options'][j] %>
                 %if option['selected']:
@@ -27,7 +27,7 @@
                     % else:
                     <label class="rubric-label" for="score-${i}-${j}">
                         <input type="radio" class="score-selection" name="score-selection-${i}" id="score-${i}-${j}" value="${option['points']}"/>
-                        <span class="wrappable">${option['points']} points : ${option['text']}</span>
+                        <span class="wrappable"> ${option['points']} points : ${option['text']}</span>
                     </label>
                     % endif
                 </li>