Merge pull request #94 from edx/will/line-breaks

Display line breaks for student response, rubric prompt, and feedback

apps/openassessment/templates/openassessmentblock/grade/oa_grade_complete.html

@@ -11,7 +11,7 @@
         {% for asmnt in assessments %}
         <div class="openassessment__peer_assessment_{{ forloop.counter }}">
             <div>Peer #{{ forloop.counter }}</div>
-            <div>Feedback: {{ asmnt.feedback }}</div>
+            <div>Feedback: {{ asmnt.feedback|linebreaks }}</div>
         </div>
         {% endfor %}
     </div>

apps/openassessment/templates/openassessmentblock/oa_base.html

@@ -53,7 +53,7 @@
                     <h2 class="openassessment__prompt__title">Open Response Assessment Problem</h2>
 
                     <div class="openassessment__prompt__copy ui-toggle-visibility__content">
-                        <p>{{ question }}</p>
+                        <p>{{ question|linebreaks }}</p>
                     </div>
                 </article>
             </div>

apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html

@@ -51,14 +51,12 @@
                             </header>
 
                             <div class="peer-assessment__display__response">
-                                {{ peer_submission.answer }}
+                                {{ peer_submission.answer|linebreaks }}
                             </div>
                         </div>
 
                         <form id="peer-assessment--001__assessment" class="peer-assessment__assessment" method="post">
                             <fieldset class="assessment__fields">
-                                <legend class="assessment__instruction">{{ rubric_instructions }}</legend>
-
                                 <ol class="list list--fields assessment__rubric">
                                     {% for criterion in rubric_criteria %}
                                     <!-- individual rubric question (radio-based choice) -->

apps/openassessment/templates/openassessmentblock/response/oa_response_graded.html

@@ -21,7 +21,7 @@
             <h3 class="submission__answer__display__title">Your Submitted Response</h3>
 
             <div class="submission__answer__display__content">
-                {{ student_submission.answer }}
+                {{ student_submission.answer|linebreaks }}
             </div>
         </article>
 

apps/openassessment/templates/openassessmentblock/response/oa_response_submitted.html

@@ -21,7 +21,7 @@
             <h3 class="submission__answer__display__title">Your Submitted Response</h3>
 
             <div class="submission__answer__display__content">
-                {{ student_submission.answer }}
+                {{ student_submission.answer|linebreaks }}
             </div>
         </article>
     </div>

apps/openassessment/templates/openassessmentblock/self/oa_self_assessment.html

@@ -35,14 +35,12 @@
                 </header>
 
                 <div class="self-assessment__display__response">
-                    {{ self_submission.answer }}
+                    {{ self_submission.answer|linebreaks }}
                 </div>
             </article>
 
             <form id="self-assessment--001__assessment" class="self-assessment__assessment" method="post">
                 <fieldset class="assessment__fields">
-                    <legend class="assessment__instruction">{{ rubric_instructions }}</legend>
-
                     <ol class="list list--fields assessment__rubric">
                         {% for criterion in rubric_criteria %}
                         <li class="field field--radio is--required assessment__rubric__question" id="assessment__rubric__question--{{ criterion.name }}">

apps/openassessment/xblock/static/xml/poverty_rubric_example.xml

@@ -5,8 +5,7 @@
     </title>
     <rubric>
         <prompt>
-            Given the state of the world today, what do you think should be done to
-            combat poverty?
+            Given the state of the world today, what do you think should be done to combat poverty?
             Read for conciseness, clarity of thought, and form.
         </prompt>
         <criterion>