From b7ad768a6cc4fe5c8a05e20b1968f13a678c22cc Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Tue, 28 Feb 2012 12:09:28 +0530
Subject: changes to remove the inline css from every page

---
 testapp/templates/exam/add_question.html  | 12 +++--------
 testapp/templates/exam/add_quiz.html      | 13 ++++-------
 testapp/templates/exam/complete.html      | 16 ++------------
 testapp/templates/exam/edit_question.html | 14 ++++--------
 testapp/templates/exam/edit_quiz.html     | 12 ++++-------
 testapp/templates/exam/grade_user.html    | 11 +++++++---
 testapp/templates/exam/intro.html         | 19 ++++------------
 testapp/templates/exam/login.html         | 36 +++++++------------------------
 testapp/templates/exam/monitor.html       | 15 +++----------
 testapp/templates/exam/question.html      | 23 ++++++--------------
 testapp/templates/exam/quit.html          | 17 ++-------------
 testapp/templates/exam/register.html      | 36 ++++++++++++-------------------
 12 files changed, 62 insertions(+), 162 deletions(-)

(limited to 'testapp/templates/exam')

diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html
index d5503b5..59a1d64 100644
--- a/testapp/templates/exam/add_question.html
+++ b/testapp/templates/exam/add_question.html
@@ -2,17 +2,11 @@
 
 {% block subtitle %}Add Question{% endblock %}
 
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+{% endblock %}
 
 {% block manage %}
-  <style type="text/css">
-    table th, table td 
-    {
-	 padding: 10px 10px 9px;
-	 line-height: 18px;
-	 text-align: left;
-    }
-  </style>
-
 <form action="" method="post">
   {% csrf_token %}
   <center><table class=span1>
diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html
index 4dae30b..dedc627 100644
--- a/testapp/templates/exam/add_quiz.html
+++ b/testapp/templates/exam/add_quiz.html
@@ -3,16 +3,11 @@
 
 {% block subtitle %}Add Quiz{% endblock %}
 
-{% block manage %}
-   <style type='text/css'>
-      table th, table td 
-      {
-	  padding: 10px 10px 9px;
-	  line-height: 18px;
-	  text-align: left;
-      }
-   </style>
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+{% endblock %}
 
+{% block manage %}
 <form name=frm action="" method="post">
   {% csrf_token %}
   <center>
diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html
index f5c658f..dfeee6c 100644
--- a/testapp/templates/exam/complete.html
+++ b/testapp/templates/exam/complete.html
@@ -2,22 +2,10 @@
 
 {% block title %}Good bye!{% endblock %}
 
+{% block pagetitle %}Online Test{% endblock %}
 {% block content %}
-<div class="container">
-  <div class="content">
-    <div class="page-header">
-       <h1><Strong><center>Online Test</center></strong></h1>
-    </div>
-    <div class=row>
-      <div class=span14>
+
         <center><h2> Good bye! </h2></center>
         <center><h4> {{message}} </h4></center>
         <center><h4>You may now close the browser.</h4></center>
-       </div>
-    </div>
-  </div>
-  <footer>
-    <p>&copy; FOSSEE group, IIT Bombay</p>
-  </footer>
-</div>
 {% endblock content %}
diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html
index 7613cc6..6a4f1ec 100644
--- a/testapp/templates/exam/edit_question.html
+++ b/testapp/templates/exam/edit_question.html
@@ -2,21 +2,15 @@
 
 {% block subtitle %}Edit Question{% endblock %}
 
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+{% endblock %}
 
 {% block manage %}
-   <style type="text/css">
-     table th, table td 
-     {
-	 padding: 10px 10px 9px;
- 	 line-height: 18px solid;
-	 text-align: left;
-     }
-   </style>
-
 <form action="{{URL_ROOT}}/exam/manage/editquestion/" method="post">
   {% csrf_token %}
   {% for form in forms %}
-  <table>
+  <table class=span1>
   {{ form.as_table }}
   </table>
   <hr>
diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html
index 27b179f..56eb0c0 100644
--- a/testapp/templates/exam/edit_quiz.html
+++ b/testapp/templates/exam/edit_quiz.html
@@ -3,15 +3,11 @@
 
 {% block subtitle %}Edit Quiz(zes){% endblock %}
 
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+{% endblock %}
+
 {% block manage %}
-   <style type='text/css'>
-      table th, table td 
-      {
-	  padding: 10px 10px 9px;
-	  line-height: 18px;
-	  text-align: left;
-      }
-   </style>
 <form name=frm action="{{URL_ROOT}}/exam/manage/editquiz/" method="post">
   {% csrf_token %}
   {% for form in forms %}
diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html
index 5b0e1a7..fccdaaa 100644
--- a/testapp/templates/exam/grade_user.html
+++ b/testapp/templates/exam/grade_user.html
@@ -3,6 +3,10 @@
 {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %}
 
 {% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %}
+ 
+{% block css %}
+	 <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/gradeuser.css" type="text/css" /> 
+{% endblock %}
 
 {% block manage %}
 
@@ -32,12 +36,13 @@ Start time: {{ paper.start_time }} <br/>
 {% if paper.answers.count %}
 <h3> Answers </h3><br>
 <form id="q{{ paper.quiz.id }}_form"
-    action="{{URL_ROOT}}/exam/manage/grade_user/{{data.user.username}}/" method="post">
+    action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/" method="post">
 {% csrf_token %}
 {% for question, answers in paper.get_question_answers.items %}
 <p><strong> 
-    <a href="{{URL_ROOT}}/admin/exam/question/{{question.id}}">
-        Question: {{ question.id }}. {{ question.summary }} </a> 
+    <!--a href="{{URL_ROOT}}/admin/exam/question/{{question.id}}">
+        Question: {{ question.id }}. {{ question.summary }} </a--> 
+	<a href="{{URL_ROOT}}/admin/exam/question/{{question.id}}" rel="floatbox" rev="width:468 height:255 scrolling:no" text="{{question}}" title="{{ question.description }} Correct Answer : {{ question.test }}">        Question: {{ question.id }}. {{ question.summary }} </a>
     (Points: {{ question.points }})</strong> </p>
 {% if question.type == "mcq" %}
 <p> Choices: 
diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html
index 167a4b2..ef218a2 100644
--- a/testapp/templates/exam/intro.html
+++ b/testapp/templates/exam/intro.html
@@ -3,14 +3,10 @@
 {% block title %}Instructions and Rules {% endblock %}
 
 {% block content %}
-  <div class="container">
-    <div class="content">
-      <div class="page-header">
-          <h1><Strong><center>Online Test</center></strong></h1>
-      </div>
-      <div class=row>
-        <div class=span14>
-          <h3><center>Important instructions & rules</center></h3><br>
+
+{% block pagetitle %}Online Test {% endblock %}
+{% block formtitle %}Important instructions & rules {% endblock %}
+
           <p> Welcome <strong>{{user.first_name.title}} {{user.last_name.title}}</strong>, to the programming quiz! </p>
           <p>
               This examination system has been developed with the intention of making you 
@@ -35,11 +31,4 @@
            {% csrf_token %}
            <center><button class="btn" type="submit" name="start">Start Exam!</button></center>
           </form>
-        </div>
-      </div>
-    </div>
-   <footer>
-   <p>&copy; FOSSEE group, IIT Bombay</p>
-   </footer>
-  </div>
 {% endblock content %}
diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html
index 07a91fc..078e7a7 100644
--- a/testapp/templates/exam/login.html
+++ b/testapp/templates/exam/login.html
@@ -1,30 +1,16 @@
 {% extends "base.html" %}
 
 {% block title %}Login{% endblock title %}
-
+{% block pagetitle %} Online Test {% endblock %}
+{% block formtitle %}Login{% endblock %}
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/login.css" type="text/css" /> 
+{% endblock %}
 {% block content %}
-<div class="container">
-  <div class="content">
-    <div class="page-header">
-      <h1><Strong><center>Online Test</center></strong></h1>
-    </div>
-    <div class=row>
-      <div class=span14>
-        <h3><center>Login</center></h3><br>
+
         <form action="" method="post">
         {% csrf_token %}
-          <style type="text/css">
-            label 
-	    {
-		  padding-top: 6px;
-		  font-size: 15px;
-		  line-height: 18px;
-		  float: left;
-		  width: 80px;
-		  text-align: center;
-		  color: #404040;
-            }
-	  </style>
+          
         <center><table class=span1>
         {{ form.as_table }}
         </table></center>
@@ -32,11 +18,5 @@
         <br><center><a href="{{URL_ROOT}}/exam/forgotpassword/">Forgot Password?</a></center><br>
         <center><a href="{{URL_ROOT}}/exam/register/">New User? Sign-Up </a></center>
         </form>
-      </div>
-    </div>
-  </div>
-  <footer>
-      <p>&copy; FOSSEE group, IIT Bombay</p>
-  </footer>
-</div>
+      
 {% endblock content %}
diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html
index a0287e7..9385e73 100644
--- a/testapp/templates/exam/monitor.html
+++ b/testapp/templates/exam/monitor.html
@@ -4,6 +4,9 @@
 
 {% block meta %} <meta http-equiv="refresh" content="30"/> {% endblock meta %}
 
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+{% endblock %}
 
 {% block manage %}
   {% if not quizzes and not quiz %}
@@ -30,18 +33,6 @@
 {% if papers %}
 {# <p> Quiz: {{ quiz_name }}</p> #}
 <p>Number of papers: {{ papers|length }} </p>
-  <style type="text/css">
-     table td 
-     {
- 	vertical-align: top;
-	border-top: 1px solid #ddd;
-     }
-     table tbody th 
-     {
-	border-top: 1px solid #ddd;
-	vertical-align: top;
-     }
-  </style>
 <table border="1" cellpadding="3">
     <tr>
     <th> Name </th>
diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html
index 113a9ae..f5dcdf4 100644
--- a/testapp/templates/exam/question.html
+++ b/testapp/templates/exam/question.html
@@ -48,6 +48,7 @@
 
 {% block onload %} onload="update_time()" {% endblock onload %}
 
+{% block pagetitle %}<br><h4>Test for {{ user.first_name.title }} {{ user.last_name.title }} </h4> {% endblock %}
 {% block content %}
 <div class="topbar">
   <div class="fill">
@@ -61,16 +62,10 @@
    </div>
 </div>
 
-<div class="container">
-   <div class="content">
-      <div class="page-header">
-         <br><center><h4>Test for {{ user.first_name.title }} {{ user.last_name.title }} </h4></center>
-      </div>
-      <div class>
-         <div class>
-     	 <h4><u> {{ question.summary }} </u></h4>
-	 <h5>{{ question.description|safe }} </h5>
-	 <h5>(Marks : {{ question.points }}) </h5>
+         
+     	 <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font></h4><br> 
+	 <font size=3 face=arial>	{{ question.description|safe }} </font>
+
          {% if error_message %}<h5>ERROR:<h5><pre>{{ error_message }}</pre>{% endif %}
          <p id="status"></p>
          <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/" method="post">
@@ -93,11 +88,5 @@
          <h5>{{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }} </h5>
          <p id="time_left"><strong>  Time left:   </strong></p>
          <hr/>
-         </div>
-      </div>
-   </div>
-   <footer>
-     <p>&copy; FOSSEE group, IIT Bombay</p>
-   </footer>
-</div>
+      
 {% endblock content %}
diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html
index 118ea07..40a0a92 100644
--- a/testapp/templates/exam/quit.html
+++ b/testapp/templates/exam/quit.html
@@ -1,26 +1,13 @@
 {% extends "base.html" %}
 
 {% block title %}Quit exam {% endblock %}
-
+{% block pagetitle %}Online Test {% endblock %}
 {% block content %}
-<div class="container">
-  <div class="content">
-    <div class="page-header">
-      <h1><Strong><center>Online Test</center></strong></h1>
-    </div>
-    <div class=row>
-      <div class=span14>
+
         <center><h4>Your current answers are saved.</h4></center>
 	<center><h4> Are you sure you wish to quit the exam?</h4></center>
 	<form action="{{URL_ROOT}}/exam/complete/" method="post">
 	{% csrf_token %}
 	<center><button class="btn" type="submit" name="yes">Yes!</button>&nbsp;<button class="btn" type="submit" name="no">No!</button></center>
 	</form>
-      </div>
-    </div>
-  </div>
-  <footer>
-     <p>&copy; FOSSEE group, IIT Bombay</p>
-  </footer>
-</div>
 {% endblock content %}
diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html
index e416470..5ff79cc 100644
--- a/testapp/templates/exam/register.html
+++ b/testapp/templates/exam/register.html
@@ -2,27 +2,19 @@
 
 {% block title %}Registration form {% endblock %}
 
+{% block pagetitle %}Online Test {% endblock %}
+{% block formtitle %}Please fill in the following details {% endblock %}
+
 {% block content %}
-<div class="container">
-   <div class="content">
-       <div class="page-header">
-           <h1><center>Online Test</center></h1>
-       </div>
-       <div>
-         <div>
-            <h3><center>Please fill in the following details</center></h3><br>
-            <form action="" method="post">
-	    {% csrf_token %}
-	    <center><table class=span1>
-	    {{ form.as_table }}
-	    </table></center>
-	    <center><button class="btn" type="submit">Register</button>&nbsp;&nbsp;<button class="btn" type="reset">Cancel</button></center>
-   	    </form>
-	 </div>
-       </div>
-    </div>
-    <footer>
-       <p>&copy; FOSSEE group, IIT Bombay</p>
-    </footer>
-</div>
+
+
+
+<form action="" method="post">
+    {% csrf_token %}
+    <center><table class=span1>
+    {{ form.as_table }}
+    </table></center>
+    <center><button class="btn" type="submit">Register</button>&nbsp;&nbsp;<button class="btn" type="reset">Cancel</button></center>
+</form>
+
 {% endblock content %}
-- 
cgit