merge conflicts resolved

lms/templates/combinedopenended/openended/open_ended.html

@@ -31,8 +31,8 @@
 
   <div class="file-upload"></div>
 
-  <input type="button" value="${_("Submit")}" class="submit-button" name="show"/>
-  <input name="skip" class="skip-button" type="button" value="${_("Skip Post-Assessment")}"/>
+  <input type="button" value="${_('Submit')}" class="submit-button" name="show"/>
+  <input name="skip" class="skip-button" type="button" value="${_('Skip Post-Assessment')}"/>
 
   <div class="open-ended-action"></div>
 

lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html

@@ -4,23 +4,23 @@
     <div class="error"></div>
     <div class="prompt">
     ${prompt}
+    </div>
     <div class="visibility-control visibility-control-response">
         <div class="inner">
         </div>
-        <span class="section-header section-header-response">Response</span>
+        <span class="section-header section-header-response">${_("Response")}</span>
     </div>
     <div>
     <textarea name="answer" class="answer short-form-response" cols="70" rows="20">${previous_answer|n}</textarea>
-    </div>
 
-    <div class="open-ended-action"></div>
+    <div class="message-wrapper"></div>
+    <div class="grader-status"></div>
 
     <div class="rubric-wrapper">${initial_rubric}</div>
 
-    <div class="hint-wrapper"></div>
-
-    <div class="message-wrapper"></div>
-
     <div class="file-upload"></div>
-    <input type="button" value="${_("Submit")}" class="submit-button" name="show"/>
+    <input type="button" value="${_('Submit')}" class="submit-button" name="show"/>
+
+    <div class="open-ended-action"></div>
+    <span id="answer_${id}"></span>
 </section>