More fixes for the merge and some display updates.

common/lib/xmodule/xmodule/combined_open_ended_rubric.py

@@ -23,7 +23,7 @@ class CombinedOpenEndedRubric(object):
         success = False
         try:
             rubric_categories = self.extract_categories(rubric_xml)
-            html = system.render_template('open_ended_rubric.html', 
+            html = self.system.render_template('open_ended_rubric.html', 
                     {'categories'  : rubric_categories,
                      'has_score': self.has_score,
                      'view_only': self.view_only})

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

@@ -611,7 +611,7 @@ section.open-ended-child {
   }
 
   div.open-ended-alert,
-  .message-wrapper {
+  .save_message {
     padding: 8px 12px;
     border: 1px solid #EBE8BF;
     border-radius: 3px;

lms/templates/open_ended.html

@@ -12,7 +12,7 @@
     % elif state in ['done', 'post_assessment'] and correct == 'correct':
     <span class="correct" id="status_${id}"></span> <p>Correct</p>
     % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
-    <span class="incorrect" id="status_${id}"></span> <p>This submission has been assessed as incorrect. </p>
+    <span class="incorrect" id="status_${id}"></span> <p>Incorrect. </p>
     % elif state == 'assessing':
       <span class="grading" id="status_${id}">Submitted for grading.</span>
     % endif