From: Tom Walker <tomwalker0472@gmail.com>
Date: Sun, 20 Jul 2014 15:21:09 +0000 (+0100)
Subject: cleaning up templates
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1f393025f1f1b1c2fbccd1c6733d83a4c8dd2fff;p=django_quiz.git

cleaning up templates
---

diff --git a/quiz/templates/base.html b/quiz/templates/base.html
index de93368..aa953aa 100644
--- a/quiz/templates/base.html
+++ b/quiz/templates/base.html
@@ -1,3 +1,4 @@
+
 <!DOCTYPE html>
 <html xmlns:fb="http://www.facebook.com/2008/fbml" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
@@ -21,10 +22,14 @@
 
 <!-- Before the quiz content -->
 
+<div class="container">
+
 {% block content %}
 
 {% endblock %}
 
+</div>
+
 <!-- After the quiz content -->
 
 
diff --git a/quiz/templates/progress.html b/quiz/templates/progress.html
index 224d0e5..44b2010 100644
--- a/quiz/templates/progress.html
+++ b/quiz/templates/progress.html
@@ -7,8 +7,6 @@
 
 {% block content %}
 
-<div class="container">
-
   {% if cat_scores %}
 
   <h1>Question Category Scores</h1>
@@ -83,6 +81,5 @@
 
   {% endif %}
 
-</div>
 
 {% endblock %}
diff --git a/quiz/templates/question.html b/quiz/templates/question.html
index 8044515..325c37d 100644
--- a/quiz/templates/question.html
+++ b/quiz/templates/question.html
@@ -7,9 +7,6 @@
 
 {% block content %}
 
-<div class="container">
-
-
 {% if previous %}
 
   <p class="muted"><small>The previous question:</small></p>
@@ -69,6 +66,6 @@
 {% endif %}
 
 <hr>
-	</div>
+
 
 {% endblock %}
diff --git a/quiz/templates/quiz/category_list.html b/quiz/templates/quiz/category_list.html
index 3963805..c58cd05 100644
--- a/quiz/templates/quiz/category_list.html
+++ b/quiz/templates/quiz/category_list.html
@@ -5,7 +5,7 @@
 <h2>Category list</h2>
 
 <ul>
-  {% for cat in object_list %}
+  {% for cat in category_list %}
   <li>
 	<a href="{% url 'quiz_category_list_matching' category_name=cat.category %}">
 	  {{ cat.category }}
@@ -15,7 +15,3 @@
 </ul>
 
 {% endblock %}
-
-{% block right-sidebar %}
-<h2>Sponsored Advertisements</h2>
-{% endblock %}
diff --git a/quiz/templates/quiz/quiz_list.html b/quiz/templates/quiz/quiz_list.html
index 39f9758..f0e0fda 100644
--- a/quiz/templates/quiz/quiz_list.html
+++ b/quiz/templates/quiz/quiz_list.html
@@ -2,7 +2,7 @@
 {% block title %}All Quizzes{% endblock %}
 
 {% block content %}
-<h2>Quiz list</h2>
+<h2>List of quizzes</h2>
     {% if quiz_list %}
         <ul>
         {% for quiz in quiz_list %}
@@ -13,7 +13,3 @@
         <p>There are no available quizzes.</p>
     {% endif %}
 {% endblock %}
-
-{% block right-sidebar %}
-<h2>Sponsored Advertisements</h2>
-{% endblock %}
diff --git a/quiz/templates/result.html b/quiz/templates/result.html
index ca9ecb7..20e2021 100644
--- a/quiz/templates/result.html
+++ b/quiz/templates/result.html
@@ -2,13 +2,11 @@
 
 {% load quiz_tags %}
 
-{% block title %} Exam Paper Result {% endblock %}
-{% block description %} Exam Results {% endblock %}
+{% block title %} {{ quiz.title}} {% endblock %}
+{% block description %} Exam Results for {{ quiz.title }} {% endblock %}
 
 {% block content %}
 
-<div class="container">
-
   {% if previous %}
 
   <p class="muted"><small>The previous question:</small></p>
@@ -86,7 +84,4 @@
   {% endif %}
 
 
-
-</div>
-
 {% endblock %}
diff --git a/quiz/templates/signup.html b/quiz/templates/signup.html
deleted file mode 100644
index dbdcaad..0000000
--- a/quiz/templates/signup.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends 'base.html' %}
-{% block title %}Progress{% endblock %}
-
-{% block content %}
-<h1>Sign up</h1>
-
-<p>Your current score is {{ anon_score }} out of {{ anon_possible }}</p>
-
-{% endblock %}
diff --git a/quiz/templates/single_complete.html b/quiz/templates/single_complete.html
index 2c5e50c..6856a70 100644
--- a/quiz/templates/single_complete.html
+++ b/quiz/templates/single_complete.html
@@ -7,7 +7,6 @@
 
 {% block content %}
 
-<div class="container">
 
 {% if user.is_authenticated %}
   <p>You have already sat this exam and only one sitting is permitted.</p>
@@ -15,6 +14,5 @@
   <p>This exam is only accessible to signed in users.</p>
 {% endif %}
 
-</div>
 
 {% endblock %}
diff --git a/quiz/templates/view_quiz_category.html b/quiz/templates/view_quiz_category.html
index 9d9d555..067cbbb 100644
--- a/quiz/templates/view_quiz_category.html
+++ b/quiz/templates/view_quiz_category.html
@@ -2,7 +2,7 @@
 {% block title %}Quizzes related to {{ category.category }}{% endblock %}
 
 {% block content %}
-<h1>Quizzes in {{ category.category }}</h1>
+<h1>Quizzes in the <strong>{{ category.category }} </strong>category</h1>
 
   {% with object_list as quizzes %}
     {% if quizzes %}
diff --git a/quiz/templatetags/quiz_tags.py b/quiz/templatetags/quiz_tags.py
index d4dac7d..e0715c4 100644
--- a/quiz/templatetags/quiz_tags.py
+++ b/quiz/templatetags/quiz_tags.py
@@ -15,7 +15,6 @@ def correct_answer_for_all(context, question):
         user_was_incorrect = True
     else:
         user_was_incorrect = False
-    previous = {'answers': answers}
 
-    return {'previous': previous,
+    return {'previous': {'answers': answers},
             'user_was_incorrect': user_was_incorrect}
