.

physics/templates/physics/exam_scores_user.html

@@ -18,7 +18,9 @@
     </ul>
     <br /> Total mark: {{ total_score }} / {{max_score}}
     <div>
+            {% if cid %}
         <a href="{% url 'cid_scores' cid passcode %}">Other exams</a>
+            {% endif %}
     </div>
 </div>
 {% endblock %}

physics/templates/physics/exam_start.html

@@ -4,6 +4,9 @@
 
     <h2>Start exam: {{exam.name}}</h2>
 
+    {% if request.user %}
+    <a href="{% url 'physics:exam_take_user' pk=exam.pk sk=0 %}">Start Exam</a>
+    {% else %}
     Enter your CID and passcode in the below boxes.<br />
     <p><input id="cid-box" type="text" value="Candidate ID"></p>
     <p><input id="passcode-box" type="text" value="Passcode"></p>
@@ -45,4 +48,5 @@
             });
         });
     </script>
+    {% endif %}
 {% endblock %}

physics/templates/physics/exam_take.html

@@ -1,7 +1,11 @@
 {% extends 'base.html' %}
 
 {% block content %}
-    CID: {{cid}}
+    {% if request.user %}
+        User: {{request.user}}
+    {% else %}
+        CID: {{cid}}
+    {% endif %}
     <div id="timeup">
         Allocated time over.
     </div>

physics/templates/physics/exam_take_overview.html

@@ -1,7 +1,11 @@
 {% extends 'base.html' %}
 
 {% block content %}
-    CID: {{cid}}
+    {% if request.user %}
+        User: {{request.user}}
+    {% else %}
+        CID: {{cid}}
+    {% endif %}
 
     <h2>Exam: {{exam.name}}</h2>
 
@@ -15,7 +19,12 @@
     {{answer_count}} out of {{exam_length}} questions answered. Click to go to question.
     <div class="physics-finish-list">
         {% for question, answer in question_answer_tuples %}
-            <a href="{% url 'physics:exam_take' pk=exam.id sk=forloop.counter0 cid=cid passcode=passcode %}"><button {% if not answer %}class="unanswered"{% endif %}>{{forloop.counter}}: {{answer.answer}}</button></a>
+            {% if request.user %}
+                <a href="{% url 'physics:exam_take_user' pk=exam.id sk=forloop.counter0 %}"><button {% if not answer %}class="unanswered"{% endif %}>{{forloop.counter}}: {{answer.answer}}</button></a>
+
+            {% else %}
+                <a href="{% url 'physics:exam_take' pk=exam.id sk=forloop.counter0 cid=cid passcode=passcode %}"><button {% if not answer %}class="unanswered"{% endif %}>{{forloop.counter}}: {{answer.answer}}</button></a>
+            {% endif %}
         {% endfor %}
     </div>
     Start time: {{cid_user_exam.start_time}}<br/>