From 713f2e01fe3da51545017e2fef5ce05628e90ff3 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Tue, 31 Aug 2021 20:17:22 +0100
Subject: [PATCH] .

---
 longs/templates/longs/long_display_block.html | 62 +++++++++----------
 longs/templates/longs/mark.html               |  2 +-
 longs/templates/longs/mark_answer.html        | 24 ++++++-
 3 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/longs/templates/longs/long_display_block.html b/longs/templates/longs/long_display_block.html
index bb2a95b4..4f75bc26 100755
--- a/longs/templates/longs/long_display_block.html
+++ b/longs/templates/longs/long_display_block.html
@@ -20,7 +20,7 @@
             </span>
         </span>
         {% endfor %}
-        <span><a href="{% url 'longs:long_series_id_create' pk=question.pk %}">Add new series</a><br />
+        <a href="{% url 'longs:long_series_id_create' pk=question.pk %}">Add new series</a><br />
     </div>
     <p><b>Author(s):</b> {% for author in question.author.all %} <a
             href="{% url 'longs:author_detail' pk=author.pk %}">{{author}}</a>, {% endfor %}</p>
@@ -28,38 +28,38 @@
             href="{% url 'longs:verified_detail' pk=verified.pk %}">{{verified}}</a>, {% endfor %}</p>
     <p><b>Scrapped:</b> {{ question.scrapped }} <a href="{% url 'longs:long_scrap' pk=question.pk %}">(toggle)</a>
 
-    <div class="long-answer">
-        <p class="pre-whitespace"><b>Feedback:</b>
-        <pre>{{ question.feedback | safe}}</pre>
-        </p>
-        <details>
-            <summary>
-                <b>Model answers</b>
-            </summary>
-            <p class="pre-whitespace"><b>Observations:</b>
-            <pre>{{ question.model_observations }}</pre>
+        <div class="long-answer">
+            <p class="pre-whitespace"><b>Feedback:</b>
+                <pre>{{ question.feedback | safe}}</pre>
             </p>
-            <p class="pre-whitespace"><b>Interpretation:</b>
-            <pre>{{ question.model_interpretation }}</pre>
-            </p>
-            <p class="pre-whitespace"><b>Principle Diagnosis:</b>
-            <pre>{{ question.model_principle_diagnosis }}</pre>
-            </p>
-            <p class="pre-whitespace"><b>Differential Diagnosis:</b>
-            <pre>{{ question.model_differential_diagnosis }}</pre>
-            </p>
-            <p class="pre-whitespace"><b>Managment:</b>
-            <pre>{{ question.model_management }}</pre>
-            </p>
-        </details>
+            <details>
+                <summary>
+                    <b>Model answers</b>
+                </summary>
+                <p class="pre-whitespace"><b>Observations:</b>
+                    <pre>{{ question.model_observations }}</pre>
+                </p>
+                <p class="pre-whitespace"><b>Interpretation:</b>
+                    <pre>{{ question.model_interpretation }}</pre>
+                </p>
+                <p class="pre-whitespace"><b>Principle Diagnosis:</b>
+                    <pre>{{ question.model_principle_diagnosis }}</pre>
+                </p>
+                <p class="pre-whitespace"><b>Differential Diagnosis:</b>
+                    <pre>{{ question.model_differential_diagnosis }}</pre>
+                </p>
+                <p class="pre-whitespace"><b>Managment:</b>
+                    <pre>{{ question.model_management }}</pre>
+                </p>
+            </details>
 
-        <p class="pre-whitespace">
-        <details>
-            <summary><b>Mark Scheme:</b></summary>
-            <pre>{{ question.mark_scheme | safe}}</pre>
-        </details>
-        </p>
-    </div>
+            <p class="pre-whitespace">
+                <details>
+                    <summary><b>Mark Scheme:</b></summary>
+                    <pre>{{ question.mark_scheme | safe}}</pre>
+                </details>
+            </p>
+        </div>
     </p>
     <div>
         Exam(s): {% for exam in question.exams.all %}
diff --git a/longs/templates/longs/mark.html b/longs/templates/longs/mark.html
index 7c465cca..041aaff3 100644
--- a/longs/templates/longs/mark.html
+++ b/longs/templates/longs/mark.html
@@ -11,7 +11,7 @@
     {% if not unmarked_count %}
     <div class="alert alert-info" role="alert">No answers to mark.</div>
     {% else %}
-    <div class="alert alert-warning" role="alert">{{unmarked_count}} question(s) to mark.</div>
+    <div class="alert alert-warning" role="alert">{{unmarked_count}} answer(s) to mark.</div>
 
     {% endif %}
     Answers:
diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index 28131114..ae999b88 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -14,9 +14,31 @@
 <div>
     <details open title="click to view/hide the mark scheme">
         <summary>Mark Scheme</summary>
-        {{ question.mark_scheme | safe}}
+    <p class="pre-whitespace"><b>Description:</b> {{ question.description }}</p>
+
+    <p class="pre-whitespace"><b>History:</b> {{ question.history }}</p>
+
+    <div class="pre-whitespace multi-image-block"><b>Series:</b>
+        {% for series in question.series.all %}
+        <span class="series-block">
+            <span>
+                Series {{ forloop.counter }}:
+                <a href="{% url 'longs:long_series_detail' pk=series.pk %}">
+                    {{series.get_block}}
+                </a>
+
+                <a href="#"
+                    onclick="return window.create_popup_window('/longs/series/{{series.pk}}', 'Series')">Popup</a>
+            </span>
+        </span>
+        {% endfor %}
+    </div>
     </details>
 </div>
+    <details closed title="click to view/hide the question details">
+        <summary>Question Details</summary>
+        {{ question.mark_scheme | safe}}
+    </details>
 <details open title="click to view/hide user answers">
     <summary>User answers</summary>
     <div>