.

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/>

generic/templates/generic/exam_overview_headers.html

@@ -13,11 +13,12 @@
 
 
 {% if exam.exam_mode %}
+    {% if exam.exam_open_access %}
+    {% else %}
         {% 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>
-    {% else %}
             {% if not candidate_count.0 and not candidate_count.1 %}
                 <div class="alert alert-danger" role="alert">
                     This exam does not have any candidates.
@@ -25,6 +26,7 @@
             {% endif %}
         {% endif %}
     {% endif %}
+{% endif %}
 
 
 This exam has {{question_number}} questions.
@@ -34,9 +36,14 @@ This exam has {{question_number}} questions.
 Exam mode: {{ exam.exam_mode }}<br />
 
 {% if exam.exam_mode %}
+    {% 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:
 {% for marker in exam.markers.all %}
     {{marker}}{% if not forloop.last %},{% endif %}

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
+        <a href="{% url 'rapids:question_detail' question.id %}" title="View the Question">View</a> 
-            href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> <a
+        <a href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> 
-                href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Question using the admin interface">Admin
+        {% 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 %}
-                Edit</a>
         {% if unmarked_answers_bool %}
             <div class="alert alert-warning" role="alert">
                 This questions has unmarked answers. Are you sure you want to review?