Merge branch 'model_changes' of ...

https://github.com/hardythe1/online_test into master.

Conflicts:
	production.cfg
	testapp/production.py

1 files changed, 32 insertions, 30 deletions

diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html
index fb6cb58..aa8b678 100644
--- a/testapp/templates/exam/monitor.html
+++ b/testapp/templates/exam/monitor.html
@@ -1,26 +1,34 @@
-{% extends "base.html" %}
+{% extends "manage.html" %}
 
 {% block title %} Quiz results {% endblock title %}
 
 {% block meta %} <meta http-equiv="refresh" content="30"/> {% endblock meta %}
 
-{% block content %}
-
-{% if not quizzes and not quiz %}
-<h1> Quiz results </h1>
-
-<p> No quizzes available. </p>
-
-{% endif %}
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+{% endblock %}
+{% block subtitle %}
+  {% if not quizzes and not quiz %}
+	Quiz Results
+  {% endif %}
+  {% if quizzes %}
+	Available Quizzes
+  {% endif %}
+  {% if quiz %}
+	{{ quiz.description }} Results
+  {% endif %}
+{% endblock %}
+{% block manage %}
+  {% if not quizzes and not quiz %}
+    <center><h5> No quizzes available. </h5></center>
+  {% endif %}
 
 {# ############################################################### #}
 {# This is rendered when we are just viewing exam/monitor #}
 {% if quizzes %}
-<h1> Available quizzes </h1>
-
 <ul>
-{% for quiz in quizzes %}
-<li><a href="{{URL_ROOT}}/exam/monitor/{{quiz.id}}/">{{ quiz.description }}</a></li>
+{% for q in quizzes %}
+<li><a href="{{URL_ROOT}}/exam/manage/monitor/{{q.id}}/">{{ q.quiz.description }}</a></li>
 {% endfor %}
 </ul>
 {% endif %}
@@ -28,27 +36,24 @@
 {# ############################################################### #}
 {# This is rendered when we are just viewing exam/monitor/quiz_num #}
 {% if quiz %}
-<h1> {{ quiz.description }} results </h1>
+
 {% if papers %}
 {# <p> Quiz: {{ quiz_name }}</p> #}
 <p>Number of papers: {{ papers|length }} </p>
-
 <table border="1" cellpadding="3">
     <tr>
-        <th> Name </th>
-        <th> Username </th>
-        <th> Roll number </th>  
-        <th> Institute </th>
-        <th> Questions answered </th> 
-        <th> Total marks </th>
-        <th> Attempts </th>
+    <th> Name </th>
+    <th> Username </th>
+    <th> Roll number </th>  
+    <th> Institute </th>
+    <th> Questions answered </th> 
+    <th> Total marks </th>
+    <th> Attempts </th>
     </tr>
     {% for paper in papers %}
     <tr> 
-        <td> <a href="{{URL_ROOT}}/exam/user_data/{{paper.user.username}}">
-                {{ paper.user.get_full_name.title }}</a> </td>
-        <td> <a href="{{URL_ROOT}}/exam/user_data/{{paper.user.username}}">
-                {{ paper.user.username }}</a> </td>
+        <td> <a href="{{URL_ROOT}}/exam/manage/user_data/{{paper.user.username}}">{{ paper.user.get_full_name.title }}</a> </td>
+        <td> <a href="{{URL_ROOT}}/exam/manage/user_data/{{paper.user.username}}">{{ paper.user.username }}</a> </td>
         <td> {{ paper.profile.roll_number }} </td>
         <td> {{ paper.profile.institute }} </td>
         <td> {{ paper.get_answered_str }} </td> 
@@ -61,7 +66,4 @@
 <p> No answer papers so far. </p>
 {% endif %} {# if papers #}
 {% endif %}
-
-<a href="{{URL_ROOT}}/admin/">Admin</a>
-
-{% endblock content %}
+{% endblock %}