From 28a0e441204dea73c01e416ba019c513d3bef57c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 6 Feb 2013 16:57:10 -0500
Subject: [PATCH] Quick rubric restyle

---
 lms/static/sass/course/_rubric.scss  | 18 +++++-----
 lms/templates/open_ended_rubric.html | 52 ++++++++++++----------------
 2 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss
index 5048d70253..a864fc2869 100644
--- a/lms/static/sass/course/_rubric.scss
+++ b/lms/static/sass/course/_rubric.scss
@@ -1,11 +1,10 @@
 .rubric {
-  margin: 40px 0px;
+  margin: 0px 0px;
   tr {
-      margin:10px 0px;
+      margin:0px 0px;
       height: 100%;
   }
   td {
-      padding: 20px 0px 25px 0px;
       height: 100%;
       border: 1px black solid;
       text-align: center;
@@ -21,10 +20,6 @@
   .rubric-label
   {
       position: relative;
-      padding: 0px 15px 15px 15px;
-      width: 130px;
-      min-height: 50px;
-      min-width: 50px;
       font-size: .9em;
       background-color: white;
       display: block;
@@ -33,7 +28,6 @@
     position: absolute;
     bottom:0px;
     right:0px;
-    margin:10px;
   }
   .selected-grade,
   .selected-grade .rubric-label {
@@ -42,10 +36,14 @@
   }
    input[type=radio]:checked + .rubric-label {
     background: white;
-    color: $base-font-color; }
+    color: $base-font-color;
+    white-space:nowrap;
+    }
+  .wrappable {
+      white-space:normal;
+  }
   input[class='score-selection'] {
       position: relative;
-      margin-left: 10px;
       font-size: 16px;
   }
 }
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index eb3fc564b4..25f98102e6 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -1,4 +1,4 @@
-<form class="rubric-template" id="inputtype_${id}">
+<form class="rubric-template" id="inputtype_${id}" xmlns="http://www.w3.org/1999/html">
     <h3>Rubric</h3>
     % if view_only and has_score:
     <p>This is the rubric that was used to grade your submission. The highlighted selection matches how the grader feels you performed in each category.</p>
@@ -7,38 +7,32 @@
     % else:
     <p>Select the criteria you feel best represents this submission in each category.</p>
     % endif
-    <table class="rubric">
-        <tr class="points-header">
-            <th></th>
-        % for i in range(max_score + 1):
-            <th>   
-                ${i} points
-            </th>
-        % endfor
-        </tr>
+    <div class="rubric">
         % for i in range(len(categories)):
-            <% category = categories[i] %>
-        <tr>
-            <th>${category['description']}</th>
-            % for j in range(len(category['options'])):
+        <% category = categories[i] %>
+            <b>${category['description']}</b><br/>
+            <ul>
+                % for j in range(len(category['options'])):
                 <% option = category['options'][j] %>
-            %if option['selected']:
-            <td class="selected-grade">
-            %else:
-            <td>
-            % endif
-                % if view_only:
+                %if option['selected']:
+                <li class="selected-grade">
+                    %else:
+                <li>
+                    % endif
+                    % if view_only:
                     ## if this is the selected rubric block, show it highlighted
-                        <div class="rubric-label">
+                    <div class="rubric-label">
                         ${option['text']}
-                        </div>
-                % else:
-                    <input type="radio" class="score-selection" name="score-selection-${i}" id="score-${i}-${j}" value="${option['points']}"/>
-                    <label class="rubric-label" for="score-${i}-${j}">${option['text']}</label>
-                % endif
-            </td>
-            % endfor
-        </tr>
+                    </div>
+                    % 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['text']}</span>
+                    </label>
+                    % endif
+                </li>
+                % endfor
+            </ul>
         % endfor
     </table>
 </form>