Merge branch 'model_changes' of ...

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

Conflicts:
	production.cfg
	testapp/production.py

1 files changed, 27 insertions, 46 deletions

diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html
index 1d3e5de..ec1888a 100644
--- a/testapp/templates/exam/intro.html
+++ b/testapp/templates/exam/intro.html
@@ -1,53 +1,34 @@
 {% extends "base.html" %}
 
 {% block title %}Instructions and Rules {% endblock %}
-
+{% block pagetitle %}Online Test {% endblock %}
+{% block formtitle %}Important instructions & rules {% endblock %}
 {% block content %}
-<h2>Important rules and instructions</h2>
-
-<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 
-learn programming and be assessed in an interactive and fun manner.
-You will be presented with a series of programming questions and problems that 
-you will answer online and get immediate feedback for.
-</p>
-
-<p> Here are some important instructions and rules that you should understand 
-carefully.
-</p> 
-
-<ul>
-
-    <li>For any programming questions, you can submit solutions as many times as
-    you want without a penalty.  You may skip questions and solve them later.
-    </li>
-    
-    <li> You <strong>may</strong> use your computer's Python/IPython shell or 
-    an editor to solve
-    the problem and cut/paste the solution to the web interface.
-    </li>
-    
-    <li> <strong>You are <strong>not allowed</strong> to use any internet 
-    resources, i.e. no google etc.</strong> </li>
-    
-    <li> Do not copy or share the questions or answers with anyone until the
-    exam is complete <strong>for everyone</strong>.</li>
-    
-    <li> <strong>All</strong> your attempts at the questions are logged. 
-    Do not try to outsmart and break the testing system.  If you do, we know
-    who you are and we will expell you from the course.  You have been warned.
-    </li>
-    
-</ul>
 
-<p> We hope you enjoy taking this exam.</p>
 
-<form action="{{URL_ROOT}}/exam/start/" method="post" align="center">
-{% csrf_token %}
-<input type="submit" name="start" value="Start Exam!">
-</form>
 
-{% endblock content %}
\ No newline at end of file
+          <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 
+              learn programming and be assessed in an interactive and fun manner.
+              You will be presented with a series of programming questions and problems that 
+              you will answer online and get immediate feedback for.
+          </p>
+          <p> Here are some important instructions and rules that you should understand carefully.</p> 
+         <ul>
+          <li>For any programming questions, you can submit solutions as many times as you want without a penalty.  You may skip questions and solve  them later.
+          </li>
+          <li> You <strong>may</strong> use your computer's Python/IPython shell or an editor to solve the problem and cut/paste the solution to the web interface.
+          </li>
+          <li> <strong>You are <strong>not allowed</strong> to use any internet resources, i.e. no google etc.</strong> </li>
+          <li> Do not copy or share the questions or answers with anyone until the exam is complete <strong>for everyone</strong>.</li>
+          <li> <strong>All</strong> your attempts at the questions are logged. Do not try to outsmart and break the testing system.  If you do, we know who you are and we will expell you from the course.  You have been warned.
+          </li>
+         </ul>
+          <p> We hope you enjoy taking this exam !!!</p>
+
+          <form action="{{URL_ROOT}}/exam/start/{{ paper_id }}/" method="post" align="center">
+           {% csrf_token %}
+           <center><button class="btn" type="submit" name="start">Start Exam!</button></center>
+          </form>
+{% endblock content %}