diff --git a/anatomy/templates/anatomy/exam_overview.html b/anatomy/templates/anatomy/exam_overview.html index 94c322a0..5c7c43de 100644 --- a/anatomy/templates/anatomy/exam_overview.html +++ b/anatomy/templates/anatomy/exam_overview.html @@ -37,22 +37,8 @@ {{ author }}, {% endfor %} - {% if can_edit %} -

- -

- {% endif %} -
- JSON creation time: {{exam.json_creation_time}} ({{exam.json_creation_time|date:"c"}}), - JSON creation id: {{exam.exam_json_id}} -
- JSON - JSON (unbased) - Refresh JSON cache - {% if request.user.is_superuser %} - - - {% endif %} + {% include 'generic/exam_footer.html' %} + {% include 'exam_overview_js.html' %} diff --git a/anatomy/templates/anatomy/exams.html b/anatomy/templates/anatomy/exams.html index 28d46ee3..c7f1d908 100644 --- a/anatomy/templates/anatomy/exams.html +++ b/anatomy/templates/anatomy/exams.html @@ -11,5 +11,5 @@ Candidates / Stats / {% endif %} - Add New Question + Add New Question {% endblock %} diff --git a/generic/templates/generic/exam_footer.html b/generic/templates/generic/exam_footer.html new file mode 100644 index 00000000..95c2fa9e --- /dev/null +++ b/generic/templates/generic/exam_footer.html @@ -0,0 +1,18 @@ +{% if can_edit %} +

+ +

+
Additional details +
+ JSON creation time: {{exam.json_creation_time}} ({{exam.json_creation_time|date:"c"}}), + JSON creation id: {{exam.exam_json_id}} +
+ JSON + JSON (unbased) + Refresh JSON cache + {% if request.user.is_superuser %} + + + {% endif %} +
+{% endif %} \ No newline at end of file diff --git a/generic/templates/generic/exam_overview_headers.html b/generic/templates/generic/exam_overview_headers.html index b2e8a4b7..c608da06 100644 --- a/generic/templates/generic/exam_overview_headers.html +++ b/generic/templates/generic/exam_overview_headers.html @@ -46,7 +46,7 @@ Markers:
-{% if can_edit %} +{% if can_edit and exam.exam_mode %}
Answer management @@ -109,10 +109,10 @@ Author(s): {% for author in exam.author.all %}
Extra - +
{% block css %} diff --git a/longs/templates/longs/exam_overview.html b/longs/templates/longs/exam_overview.html index a01491b0..34f0996a 100644 --- a/longs/templates/longs/exam_overview.html +++ b/longs/templates/longs/exam_overview.html @@ -25,8 +25,8 @@
View / Edit + title="View the question">View / Edit [id: {{question.pk}}]
@@ -50,22 +50,7 @@ {% endfor %} - {% if can_edit %} - -

-
- JSON creation time: {{exam.json_creation_time}} ({{exam.json_creation_time|date:"c"}}), - JSON creation id: {{exam.exam_json_id}} - {% if exam.recreate_json %}[JSON out of date]{% endif %} -
- JSON - JSON (unbased) - Refresh JSON cache - Refresh Question JSON cache - - - - {% endif %} + {% include 'generic/exam_footer.html' %} {% include 'exam_overview_js.html' %} diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html index 8a2c6131..e541d7c1 100644 --- a/rapids/templates/rapids/exam_overview.html +++ b/rapids/templates/rapids/exam_overview.html @@ -43,18 +43,7 @@ {{ author }}, {% endfor %} - {% if can_edit %} -

- {% endif %} -
- JSON creation time: {{exam.json_creation_time}} ({{exam.json_creation_time|date:"c"}}), - JSON creation id: {{exam.exam_json_id}} -
- JSON - JSON (unbased) - Refresh JSON cache - - + {% include 'generic/exam_footer.html' %} {% include 'exam_overview_js.html' %}