From 6b064b2653ceacefda74f886bb51983824bf285a Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 14 Oct 2024 12:49:05 +0100
Subject: [PATCH] .

---
 anatomy/templates/anatomy/mark.html           |  4 +++-
 .../generic/exam_overview_headers.html        | 21 ++++++++++++-------
 rapids/templates/rapids/mark.html             |  7 +++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index 339de2d8..6e38c7bf 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -3,7 +3,9 @@
 {% block content %}
     <div class="col-md-6">
         <h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
-        <a href="{% url 'anatomy:question_detail' question.id %}" title="View the Question">View</a> <a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a> <a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}" title="Edit the Question using the admin interface">Admin Edit</a>
+        <a href="{% url 'anatomy:question_detail' question.id %}" title="View the Question">View</a> 
+        <a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a> 
+        {% if request.user.is_superuser %}<a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}" title="Edit the Question using the admin interface">Admin Edit</a>{% endif %}
         <h3>{{ question.question_type }}</h3>
         {% if question.structure %}
             Structure: {{question.structure}}<br/>
diff --git a/generic/templates/generic/exam_overview_headers.html b/generic/templates/generic/exam_overview_headers.html
index 1bfcabf1..3161ec17 100644
--- a/generic/templates/generic/exam_overview_headers.html
+++ b/generic/templates/generic/exam_overview_headers.html
@@ -13,15 +13,17 @@
 
 
 {% if exam.exam_mode %}
-    {% if not exam.cid_user_groups.count and not exam.user_user_groups.count %}
-        <div class="alert alert-danger" role="alert">
-            This exam does not have any user / cid groups added.
-        </div>
+    {% if exam.exam_open_access %}
     {% else %}
-        {% if not candidate_count.0 and not candidate_count.1 %}
+        {% if not exam.cid_user_groups.count and not exam.user_user_groups.count %}
             <div class="alert alert-danger" role="alert">
-                This exam does not have any candidates.
+                This exam does not have any user / cid groups added.
             </div>
+            {% if not candidate_count.0 and not candidate_count.1 %}
+                <div class="alert alert-danger" role="alert">
+                    This exam does not have any candidates.
+                </div>
+            {% endif %}
         {% endif %}
     {% endif %}
 {% endif %}
@@ -34,7 +36,12 @@ This exam has {{question_number}} questions.
 Exam mode: {{ exam.exam_mode }}<br />
 
 {% if exam.exam_mode %}
-    Cid candidates: <a href="{{exam.get_cid_edit_url}}">{{candidate_count.0}}</a>, User candidates: <a href="{{exam.get_user_edit_url}}">{{candidate_count.1}}</a><br />
+    {% if exam.exam_open_access %}
+        This exam is available to all registered users.<br />
+    {% else %}
+        Cid candidates: <a href="{{exam.get_cid_edit_url}}">{{candidate_count.0}}</a>, User candidates: <a href="{{exam.get_user_edit_url}}">{{candidate_count.1}}</a><br />
+    {% endif %}
+
 {% endif %}
 
 Markers:
diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index 2f379105..38607504 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -3,10 +3,9 @@
 {% block content %}
     <div class="col-md-6" id="main-col">
         <h2>{% if review %}Reviewing{% else %}Marking{% endif %} question {{question_details.current}} of {{question_details.total}}</h2>
-        <a href="{% url 'rapids:question_detail' question.id %}" title="View the Question">View</a> <a
-            href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> <a
-                href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Question using the admin interface">Admin
-                Edit</a>
+        <a href="{% url 'rapids:question_detail' question.id %}" title="View the Question">View</a> 
+        <a href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> 
+        {% if request.user.is_superuser %}<a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Question using the admin interface">Admin Edit</a>{% endif %}
         {% if unmarked_answers_bool %}
             <div class="alert alert-warning" role="alert">
                 This questions has unmarked answers. Are you sure you want to review?