Merge branch 'master' of ssh://git.xkjq.uk:30001/ross/rad

longs/templates/longs/exam_overview.html

@@ -32,9 +32,11 @@
             <br />
             {% for series in question.series.all %}
             <div class="series-block">
-                Series {{forloop.counter0 }}:<br />
+                Series {{forloop.counter }}:<br />
                 {{series.get_block}}
             </div>
+            {% empty %}
+            No series
             {% endfor %}
             <div>
                 Author(s): {{question.get_authors}}

longs/templates/longs/mark_answer.html

@@ -49,7 +49,9 @@
         <button type="submit" name="next" class="save btn btn-default" title="Save answer and move to next question">Next answer</button>
         <!-- <button type="submit" name="skip" class="save btn btn-default">Skip</button> -->
         {% else %}
-        (no more answers for this question to mark)
+        {% if not unmarked %}
+        All question answers marker. <a href="{% url 'longs:mark_overview' pk=exam.pk %}">Return to marking overview</a>
+        {% endif %}
         {% endif %}
     </form>
 </div>