Merge branch 'model_changes' of ...

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

Conflicts:
	production.cfg
	testapp/production.py

1 files changed, 9 insertions, 13 deletions

diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html
index 9fb442a..61a3a97 100644
--- a/testapp/templates/exam/user_data.html
+++ b/testapp/templates/exam/user_data.html
@@ -1,11 +1,11 @@
-{% extends "base.html" %}
+{% extends "manage.html" %}
 
 {% block title %} Data for user {{ data.user.get_full_name.title }} {% endblock title %}
 
-{% block content %}
-
-<h1> Data for user {{ data.user.get_full_name.title }} </h1>
+{% block manage %}
 
+{% block subtitle %}Data for user {{ data.user.get_full_name.title }}{% endblock %}
+<form action="" method="post">
 <p> 
 Name: {{ data.user.get_full_name.title }} <br/>
 Username: {{ data.user.username }} <br/>
@@ -21,7 +21,7 @@ Last login: {{ data.user.last_login }}
 </p>
 
 {% if data.papers %}
-<p><a href="{{URL_ROOT}}/exam/grade_user/{{ data.user.username }}/">
+<p><a href="{{URL_ROOT}}/exam/manage/gradeuser/{{ data.user.username }}/">
     Grade/correct paper</a>
 </p>
 
@@ -66,19 +66,15 @@ User IP address: {{ paper.user_ip }}
 {% endif %} {# if data.papers #}
 <br />
 <hr />
-<a href="{{URL_ROOT}}/exam/grade_user/{{ data.user.username }}/">
+<a href="{{URL_ROOT}}/exam/manage/gradeuser/{{ data.user.username }}/">
     Grade/correct paper</a>
 <br/>
 {% if data.papers.count > 1 %}
-<a href="{{URL_ROOT}}/exam/monitor/">
-    Monitor quiz</a>
+<a href="{{URL_ROOT}}/exam/manage/monitor/">Monitor quiz</a>
 {% else %}
 {% with data.papers.0 as paper %}
-<a href="{{URL_ROOT}}/exam/monitor/{{paper.quiz.id}}/">
-    Monitor quiz</a>
+<a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.quiz.id}}/">Monitor quiz</a>
 {% endwith %}
 {% endif %}
-<br />
-<a href="{{URL_ROOT}}/admin/">Admin</a>
 
-{% endblock content %}
+{% endblock %}