will need to overhaul views to allow easier integration of new question types

diff --git a/quiz/views.py b/quiz/views.py
index f61c19d9cd41a6542d60d9bc686c9e25ac32f91e..fed4282ad02f8437b4853ae4c3f0305b3045fb98 100644 (file)
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -187,10 +187,12 @@ def load_anon_next_question(request, quiz):
 
     next_question_id = question_list[0]
     question = Question.objects.get(id=next_question_id)
+    question_type = next_question.__class__.__name__
 
     return render_to_response('question.html',
                               {'quiz': quiz,
                                'question': question,
+                               'question_type': question_type,
                                'previous': previous,
                                'show_advert': show_advert,
                                },
@@ -232,10 +234,12 @@ def user_load_next_question(request, sitting, quiz):
 
 
     next_question = Question.objects.get(id=question_ID)
+    question_type = next_question.__class__.__name__
 
     return render_to_response('question.html',
                               {'quiz': quiz,
                                'question': next_question,
+                               'question_type': question_type,
                                'previous': previous,
                                'show_advert': show_advert,
                                },

diff --git a/templates/quiz/question.html b/templates/quiz/question.html
index 85baa533667425bc3f6455f894b2b95a41708f7e..ea07a326245244b693b83f8a6a403e76a4e09288 100644 (file)
--- a/templates/quiz/question.html
+++ b/templates/quiz/question.html
@@ -11,10 +11,10 @@
 
 
 {% if previous %}
-       
-        <p class="muted"><small>The previous question:</small></p> 
+
+        <p class="muted"><small>The previous question:</small></p>
         <p>{{ previous.previous_question }}</p>
-        
+
         {% ifequal previous.previous_outcome 'correct' %}
                        <div class="alert alert-success">
                {% else %}
@@ -23,17 +23,19 @@
 
                        <p><small>Your answer was </small><em>{{ previous.previous_answer }}</em><small> which is </small><strong>{{ previous.previous_outcome }}</strong></p>
                    </div>
-                   
+
                        {% correct_answer previous %}
                    <p><strong>Explanation:</strong></p>
                    <div class="well " style="background-color: #fcf8e3;">
                        <p>{{ previous.previous_question.explanation }}</p>
                    </div>
-                       
-                   
+
+
 <hr>
-       
-{% endif %}<br />
+
+{% endif %}
+
+<br />
 
 
 {% if question %}
@@ -41,11 +43,11 @@
        <p><small class="muted">Question category:</small> <strong>{{ question.category }}</strong></p>
         <p class="lead">{{ question.content }}</p>
                {% answers_for_question question quiz %}
-               
+
 {% endif %}
-    
+
     <hr>
-    
+
 
 
 </div>