Change around some names, restyle rubric

common/lib/xmodule/xmodule/combined_open_ended_modulev1.py

@@ -55,7 +55,7 @@ TRUE_DICT = ["True", True, "TRUE", "true"]
 
 HUMAN_TASK_TYPE = {
     'selfassessment' : "Self Assessment",
-    'openended' : "External Grader",
+    'openended' : "edX Assessment",
     }
 
 class CombinedOpenEndedV1Module():

common/lib/xmodule/xmodule/css/combinedopenended/display.scss

@@ -47,10 +47,10 @@ section.combined-open-ended-status {
 
     .statusitem {
       color: #2C2C2C;
-      font-size: .8em;
+      font-size: 1em;
       padding: 0px;
       display: block;
-      width: 55%;
+      width: 70%;
       .show-results {
           margin-top: .3em;
           text-align:right;

common/lib/xmodule/xmodule/openendedchild.py

@@ -68,10 +68,10 @@ class OpenEndedChild(object):
 
     #This is used to tell students where they are at in the module
     HUMAN_NAMES = {
-        'initial': 'Started',
-        'assessing': 'Being scored',
-        'post_assessment': 'Scoring finished',
-        'done': 'Problem complete',
+        'initial': 'Not started',
+        'assessing': 'In progress',
+        'post_assessment': 'In progress',
+        'done': 'Done',
     }
 
     def __init__(self, system, location, definition, descriptor, static_data, 

lms/templates/combined_open_ended.html

@@ -2,7 +2,7 @@
 
     <h2>${display_name}</h2>
     <div class="status-container">
-            ${status | n}
+        ${status | n}
     </div>
 
     <div class="item-container">

lms/templates/combined_open_ended_status.html

@@ -22,7 +22,7 @@
             % endif
 
             %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
-               <a href="#results" class="show-results-button">Show results</a>
+               <a href="#results" class="show-results-button"> Show results</a>
             %endif
         </div>
     %endfor

lms/templates/open_ended_rubric.html

@@ -22,7 +22,7 @@
                     % if view_only:
                     ## if this is the selected rubric block, show it highlighted
                     <div class="rubric-label">
-                        ${option['text']}
+                        ${option['points']} points : ${option['text']}
                     </div>
                     % else:
                     <label class="rubric-label" for="score-${i}-${j}">