Merge branch 'model_changes' of ...

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

Conflicts:
	production.cfg
	testapp/production.py

1 files changed, 39 insertions, 0 deletions

diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html
new file mode 100644
index 0000000..e3ba17a
--- /dev/null
+++ b/testapp/templates/exam/add_question.html
@@ -0,0 +1,39 @@
+{% extends "manage.html" %}
+
+
+{% block subtitle %}Add Question{% 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 type="text/javascript" src="{{ URL_ROOT }}/static/exam/js/min.js"></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_question.js"></script>
+{% endblock %}
+
+{% block onload %} onload='javascript:textareaformat();' {% endblock %}
+
+{% block manage %}
+<form action="" method="post" name=frm onSubmit="return autosubmit();">
+  {% csrf_token %}
+  <center><table class=span1>
+  <tr><td>Summary: <td>{{ form.summary }}{{ form.summary.errors }}
+  <tr><td>Points:<td><button class="btn-mini" type="button" onClick="increase(frm);">+</button>{{ form.points }}<button class="btn-mini" type="button" onClick="decrease(frm);"">-</button>{{ form.points.errors }} &nbsp; Active: &nbsp; {{ form.active }}{{form.active.errors}} &nbsp; Type: &nbsp;{{ form.type }}{{form.type.errors}}
+  <tr><td><strong>Rendered: </strong><td><p id='my'></p>
+  <tr><td>Description: <td>{{ form.description}}  {{form.description.errors}}
+  <tr><td>Test: <td>{{ form.test }}{{form.test.errors}}
+  <tr><td>Snippet: <td>{{ form.snippet }}{{ form.snippet.errors }}</td></tD></td></tr>
+  <tr><td>Tags: <td>{{ form.tags }}
+  <tr><td id='label_option'>Options: <td>{{ form.options }}  {{form.options.errors}} 
+
+
+  </table></center>
+  <center><button class="btn" type="submit" name="savequestion">Save</button>
+  <button class="btn" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/questions/");'>Cancel</button> </center>
+</form>
+{% endblock %}
+