Merge branch 'model_changes' of ...

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

Conflicts:
	production.cfg
	testapp/production.py

1 files changed, 28 insertions, 0 deletions

diff --git a/testapp/templates/exam/add_questionpaper.html b/testapp/templates/exam/add_questionpaper.html
new file mode 100644
index 0000000..4cce8a9
--- /dev/null
+++ b/testapp/templates/exam/add_questionpaper.html
@@ -0,0 +1,28 @@
+{% extends "manage.html" %}
+
+
+{% block subtitle %}Design Question Paper{% endblock %}
+
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
+<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
+{% endblock %}
+{% block script %}
+<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
+<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
+{% endblock %}
+
+{% block manage %}
+<input type=hidden id="url_root" value={{ URL_ROOT }}>
+<form>
+{% csrf_token %}
+Select mode to design Question Paper: 
+<select name='mode' id='mode' onChange='javascript:load_data();'>
+  <option>---------</option>
+  <option>Automatic</option>
+  <option>Manual</option>
+</select> 
+</form>
+
+{% endblock %}