From ddb489ecd70db1e30fc43061e039997f754ee12c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Fri, 27 Aug 2021 23:08:35 +0100
Subject: [PATCH] .

---
 .../templates/anatomy/question_detail.html    | 28 ++++++++++---------
 longs/templates/longs/question_detail.html    | 26 +++++++++--------
 rapids/templates/rapids/question_detail.html  | 24 ++++++++--------
 3 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/anatomy/templates/anatomy/question_detail.html b/anatomy/templates/anatomy/question_detail.html
index 8926b684..fc4bd546 100644
--- a/anatomy/templates/anatomy/question_detail.html
+++ b/anatomy/templates/anatomy/question_detail.html
@@ -2,30 +2,32 @@
 
 {% block content %}
 {% load static %}
-{% if exam %}
-<div>
-
-    {% if previous > -1 %}
-    <a href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous question</a>
-    {% endif %}
-    This question is part of exam: {{exam.name}} [{{pos}}/{{exam_length}}]
-    {% if next %}
-    <a href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next question</a>
-    {% endif %}
-</div>
-{% endif %}
 <button id="save-annotations">Save Annotations</button>
 <div id="dicom-image" class="dicom-image" data-url="https://www.penracourses.org.uk{{ question.image.url}}"
     data-annotations='{{question.image_annotations}}' data-edit_annotation=true></div>
 <!-- testing -->
 <!--<div id="dicom-image" data-url="http://localhost:8000/static/abdoct.jpg"
     data-annotations='{{question.image_annotations}}' data-edit_annotation=true></div>-->
-<div class="question">
+<div class="floating-header">
     <a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a>
     <a href="{% url 'anatomy:question_clone' question.id %}" title="Clone the Question">Clone</a>
     <a href="{% url 'anatomy:question_delete' pk=question.pk %}" title="Delete the Question">Delete</a>
     <a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}"
         title="Edit the Question using the admin interface">Admin Edit</a>
+{% if exam %}
+<div>
+
+    {% if previous > -1 %}
+    <a href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous question</a>
+    {% endif %}
+    Viewing question as part of exam: {{exam.name}} [{{pos}}/{{exam_length}}]
+    {% if next %}
+    <a href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next question</a>
+    {% endif %}
+</div>
+{% endif %}
+</div>
+<div class="question">
     <div class="date">
         Created: {{ question.created_date|date:"d/m/Y" }}
     </div>
diff --git a/longs/templates/longs/question_detail.html b/longs/templates/longs/question_detail.html
index 6922e497..6b9a5157 100755
--- a/longs/templates/longs/question_detail.html
+++ b/longs/templates/longs/question_detail.html
@@ -3,19 +3,8 @@
 {% block content %}
 
 
-{% if exam %}
-<div>
-
-{% if previous > -1 %}
-<a href="{% url 'longs:exam_question_detail' exam.id previous %}">Previous question</a>
-{% endif %}
- This question is part of exam: <a href="{% url 'longs:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
-{% if next %}
-<a href="{% url 'longs:exam_question_detail' exam.id next %}">Next question</a>
-{% endif %}
-</div>
-{% endif %}
 
+<div class="floating-header">
 <a href="{% url 'longs:long_update' pk=question.pk %}" title="Edit the Long">Edit</a>
 <a href="{% url 'longs:long_clone' pk=question.pk %}" title="Clone the Long (duplicate everything but the images)">Clone</a>
 <a href="{% url 'longs:long_delete' pk=question.pk %}" title="Delete the Rapid">Delete</a>
@@ -23,6 +12,19 @@
 {% if request.user.is_superuser %}
 <a href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Long using the admin interface">Admin Edit</a>
 {% endif %}
+{% if exam %}
+<div>
+
+{% if previous > -1 %}
+<a href="{% url 'longs:exam_question_detail' exam.id previous %}">Previous question</a>
+{% endif %}
+ Viewing question as part of exam: <a href="{% url 'longs:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
+{% if next %}
+<a href="{% url 'longs:exam_question_detail' exam.id next %}">Next question</a>
+{% endif %}
+</div>
+{% endif %}
+</div>
 {% include 'longs/long_display_block.html' %}
 {% endblock %}
 
diff --git a/rapids/templates/rapids/question_detail.html b/rapids/templates/rapids/question_detail.html
index 0dd2a27e..5f7ab237 100755
--- a/rapids/templates/rapids/question_detail.html
+++ b/rapids/templates/rapids/question_detail.html
@@ -3,18 +3,6 @@
 {% block content %}
 
 <div class="floating-header">
-{% if exam %}
-<div>
-
-{% if previous > -1 %}
-<a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
-{% endif %}
- This question is part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
-{% if next %}
-<a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
-{% endif %}
-</div>
-{% endif %}
 
 <a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
 <a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
@@ -24,6 +12,18 @@
 <a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
 <a href="{% url 'rapids:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
 {% endif %}
+{% if exam %}
+<div>
+
+{% if previous > -1 %}
+<a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
+{% endif %}
+Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
+{% if next %}
+<a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
+{% endif %}
+</div>
+{% endif %}
 </div>
 {% include 'rapids/question_display_block.html' %}
 {% endblock %}
\ No newline at end of file