From 4df6fb51be0661aaf0f852e4f2bedc2bb72e1eef Mon Sep 17 00:00:00 2001
From: Prabhu Ramachandran
Date: Mon, 21 Nov 2011 15:46:54 +0530
Subject: ENH: Adding dept/insti/pos fields in profile.

Adding institute/department/position fields, prettifying form with some
help text.  Also prettified monitor and user data.  Updated commands to
show/dump new fields.
---
 templates/exam/monitor.html   |  2 ++
 templates/exam/user_data.html | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'templates')

diff --git a/templates/exam/monitor.html b/templates/exam/monitor.html
index a9eac24..1ce6c69 100644
--- a/templates/exam/monitor.html
+++ b/templates/exam/monitor.html
@@ -38,6 +38,7 @@
         <th> Name </th>
         <th> Username </th>
         <th> Roll number </th>  
+        <th> Institute </th>
         <th> Questions answered </th> 
         <th> Total marks </th>
         <th> Attempts </th>
@@ -47,6 +48,7 @@
         <td> <a href="{{URL_ROOT}}/exam/user_data/{{paper.username}}">{{ paper.name.title }}</a> </td>
         <td> <a href="{{URL_ROOT}}/exam/user_data/{{paper.username}}">{{ paper.username }}</a> </td>
         <td> {{ paper.rollno }} </td>
+        <td> {{ paper.institute }} </td>
         <td> {{ paper.answered }} </td> 
         <td> {{ paper.total }} </td>
         <td> {{ paper.attempts }} </td>
diff --git a/templates/exam/user_data.html b/templates/exam/user_data.html
index c180983..c2e8014 100644
--- a/templates/exam/user_data.html
+++ b/templates/exam/user_data.html
@@ -6,12 +6,17 @@
 
 <h1> Data for user {{ user_data.name.title }} </h1>
 
-<p> Name: {{ user_data.name.title }} </p>
-<p> Username: {{ user_data.username }} </p>
-<p> Roll number: {{ user_data.rollno }} </p>
-<p> Email: {{ user_data.email }} </p>
-<p> Date joined: {{ user_data.date_joined }} </p>
-<p> Last login: {{ user_data.last_login }} </p>
+<p> 
+Name: {{ user_data.name.title }} <br/>
+Username: {{ user_data.username }} <br/>
+Roll number: {{ user_data.rollno }} <br/>
+Email: {{ user_data.email }} <br/>
+Position: {{ user_data.position }} <br/>
+Department: {{ user_data.department }} <br/>
+Institute: {{ user_data.institute }} <br/>
+Date joined: {{ user_data.date_joined }} <br/>
+Last login: {{ user_data.last_login }} 
+</p>
 
 {% if user_data.papers %}
 
@@ -19,11 +24,13 @@
 
 <h2> Quiz: {{ paper.name }} </h2>
 
-<p> Answered questions: {{ paper.answered }} </p>
-<p> Total attempts at questions: {{ paper.attempts }} </p>
-<p> Total marks: {{ paper.total }} </p>
-<p> Start time: {{ paper.start_time }} </p>
-<p> User IP address: {{ paper.user_ip }} </p>
+<p>
+Answered questions: {{ paper.answered }} <br/>
+Total attempts at questions: {{ paper.attempts }} <br/>
+Total marks: {{ paper.total }} <br/>
+Start time: {{ paper.start_time }} <br/>
+User IP address: {{ paper.user_ip }} 
+</p>
 
 {% if paper.answers %}
 <h3> Answers </h3>
-- 
cgit