60 files changed, 23 insertions, 17 deletions
diff --git a/testapp/code_server.py b/testapp/exam/code_server.py
index 792197d..792197d 100755
--- a/testapp/code_server.py
+++ b/testapp/exam/code_server.py
diff --git a/testapp/output/README.txt b/testapp/exam/output/README.txt
index 3163ed4..3163ed4 100644
--- a/testapp/output/README.txt
+++ b/testapp/exam/output/README.txt
diff --git a/testapp/exam/settings.py b/testapp/exam/settings.py
new file mode 100644
index 0000000..682516f
--- /dev/null
+++ b/testapp/exam/settings.py
@@ -0,0 +1,20 @@
+"""
+settings for exam app.
+"""
+# The ports the code server should run on.  This will run one separate
+# server for each port listed in the following list.
+SERVER_PORTS = [8001]  # range(8001, 8026)
+
+# The server pool port.  This is the server which returns available server
+# ports so as to minimize load.  This is some random number where no other
+# service is running.  It should be > 1024 and less < 65535 though.
+SERVER_POOL_PORT = 53579
+
+# Timeout for the code to run in seconds.  This is an integer!
+SERVER_TIMEOUT = 2
+
+# The root of the URL, for example you might be in the situation where you
+# are not hosted as host.org/exam/  but as host.org/foo/exam/ for whatever
+# reason set this to the root you have to serve at.  In the above example
+# host.org/foo/exam set URL_ROOT='/foo'
+URL_ROOT = ''
diff --git a/testapp/static/exam/css/autotaggit.css b/testapp/exam/static/exam/css/autotaggit.css
index ed856ce..ed856ce 100644
--- a/testapp/static/exam/css/autotaggit.css
+++ b/testapp/exam/static/exam/css/autotaggit.css
diff --git a/testapp/static/exam/css/base.css b/testapp/exam/static/exam/css/base.css
index 051ba22..051ba22 100644
--- a/testapp/static/exam/css/base.css
+++ b/testapp/exam/static/exam/css/base.css
diff --git a/testapp/static/exam/css/gradeuser.css b/testapp/exam/static/exam/css/gradeuser.css
index 07b1079..07b1079 100644
--- a/testapp/static/exam/css/gradeuser.css
+++ b/testapp/exam/static/exam/css/gradeuser.css
diff --git a/testapp/static/exam/css/login.css b/testapp/exam/static/exam/css/login.css
index a10cbaa..a10cbaa 100644
--- a/testapp/static/exam/css/login.css
+++ b/testapp/exam/static/exam/css/login.css
diff --git a/testapp/static/exam/css/monitor.css b/testapp/exam/static/exam/css/monitor.css
index b16c8b3..b16c8b3 100644
--- a/testapp/static/exam/css/monitor.css
+++ b/testapp/exam/static/exam/css/monitor.css
diff --git a/testapp/static/exam/css/question.css b/testapp/exam/static/exam/css/question.css
index 4bf5913..4bf5913 100644
--- a/testapp/static/exam/css/question.css
+++ b/testapp/exam/static/exam/css/question.css
diff --git a/testapp/static/exam/css/question_paper_creation.css b/testapp/exam/static/exam/css/question_paper_creation.css
index c915320..c915320 100644
--- a/testapp/static/exam/css/question_paper_creation.css
+++ b/testapp/exam/static/exam/css/question_paper_creation.css
diff --git a/testapp/static/exam/css/question_quiz.css b/testapp/exam/static/exam/css/question_quiz.css
index b702bd4..b702bd4 100644
--- a/testapp/static/exam/css/question_quiz.css
+++ b/testapp/exam/static/exam/css/question_quiz.css
diff --git a/testapp/static/exam/css/showusers.css b/testapp/exam/static/exam/css/showusers.css
index 66a3746..66a3746 100644
--- a/testapp/static/exam/css/showusers.css
+++ b/testapp/exam/static/exam/css/showusers.css
diff --git a/testapp/static/exam/js/add_question.js b/testapp/exam/static/exam/js/add_question.js
index 267cdb2..267cdb2 100644
--- a/testapp/static/exam/js/add_question.js
+++ b/testapp/exam/static/exam/js/add_question.js
diff --git a/testapp/static/exam/js/add_questionpaper.js b/testapp/exam/static/exam/js/add_questionpaper.js
index 6185dd5..6185dd5 100644
--- a/testapp/static/exam/js/add_questionpaper.js
+++ b/testapp/exam/static/exam/js/add_questionpaper.js
diff --git a/testapp/static/exam/js/add_quiz.js b/testapp/exam/static/exam/js/add_quiz.js
index d5688a8..d5688a8 100644
--- a/testapp/static/exam/js/add_quiz.js
+++ b/testapp/exam/static/exam/js/add_quiz.js
diff --git a/testapp/static/exam/js/bootstrap-modal.js b/testapp/exam/static/exam/js/bootstrap-modal.js
index b328217..b328217 100644
--- a/testapp/static/exam/js/bootstrap-modal.js
+++ b/testapp/exam/static/exam/js/bootstrap-modal.js
diff --git a/testapp/static/exam/js/bootstrap-tabs.js b/testapp/exam/static/exam/js/bootstrap-tabs.js
index a3c7ee1..a3c7ee1 100644
--- a/testapp/static/exam/js/bootstrap-tabs.js
+++ b/testapp/exam/static/exam/js/bootstrap-tabs.js
diff --git a/testapp/static/exam/js/edit_question.js b/testapp/exam/static/exam/js/edit_question.js
index 7a0f56d..7a0f56d 100644
--- a/testapp/static/exam/js/edit_question.js
+++ b/testapp/exam/static/exam/js/edit_question.js
diff --git a/testapp/static/exam/js/edit_quiz.js b/testapp/exam/static/exam/js/edit_quiz.js
index 610a438..610a438 100644
--- a/testapp/static/exam/js/edit_quiz.js
+++ b/testapp/exam/static/exam/js/edit_quiz.js
diff --git a/testapp/static/exam/js/min.js b/testapp/exam/static/exam/js/min.js
index b1ae21d..b1ae21d 100644
--- a/testapp/static/exam/js/min.js
+++ b/testapp/exam/static/exam/js/min.js
diff --git a/testapp/static/exam/js/question.js b/testapp/exam/static/exam/js/question.js
index 75baf76..75baf76 100644
--- a/testapp/static/exam/js/question.js
+++ b/testapp/exam/static/exam/js/question.js
diff --git a/testapp/static/exam/js/question_paper_creation.js b/testapp/exam/static/exam/js/question_paper_creation.js
index a144540..a144540 100644
--- a/testapp/static/exam/js/question_paper_creation.js
+++ b/testapp/exam/static/exam/js/question_paper_creation.js
diff --git a/testapp/static/exam/js/show_question.js b/testapp/exam/static/exam/js/show_question.js
index e3ed1cc..e3ed1cc 100644
--- a/testapp/static/exam/js/show_question.js
+++ b/testapp/exam/static/exam/js/show_question.js
diff --git a/testapp/static/exam/js/show_quiz.js b/testapp/exam/static/exam/js/show_quiz.js
index c58feaa..c58feaa 100644
--- a/testapp/static/exam/js/show_quiz.js
+++ b/testapp/exam/static/exam/js/show_quiz.js
diff --git a/testapp/templates/404.html b/testapp/exam/templates/404.html
index 7d33dd3..7d33dd3 100644
--- a/testapp/templates/404.html
+++ b/testapp/exam/templates/404.html
diff --git a/testapp/templates/500.html b/testapp/exam/templates/500.html
index d02721f..d02721f 100644
--- a/testapp/templates/500.html
+++ b/testapp/exam/templates/500.html
diff --git a/testapp/templates/base.html b/testapp/exam/templates/base.html
index 3dfbe10..3dfbe10 100644
--- a/testapp/templates/base.html
+++ b/testapp/exam/templates/base.html
diff --git a/testapp/templates/exam/add_question.html b/testapp/exam/templates/exam/add_question.html
index b0b22b1..b0b22b1 100644
--- a/testapp/templates/exam/add_question.html
+++ b/testapp/exam/templates/exam/add_question.html
diff --git a/testapp/templates/exam/add_questionpaper.html b/testapp/exam/templates/exam/add_questionpaper.html
index 4cce8a9..4cce8a9 100644
--- a/testapp/templates/exam/add_questionpaper.html
+++ b/testapp/exam/templates/exam/add_questionpaper.html
diff --git a/testapp/templates/exam/add_quiz.html b/testapp/exam/templates/exam/add_quiz.html
index c2533de..c2533de 100644
--- a/testapp/templates/exam/add_quiz.html
+++ b/testapp/exam/templates/exam/add_quiz.html
diff --git a/testapp/templates/exam/ajax_marks.html b/testapp/exam/templates/exam/ajax_marks.html
index 716bb88..716bb88 100644
--- a/testapp/templates/exam/ajax_marks.html
+++ b/testapp/exam/templates/exam/ajax_marks.html
diff --git a/testapp/templates/exam/ajax_questions.html b/testapp/exam/templates/exam/ajax_questions.html
index e343f9b..e343f9b 100644
--- a/testapp/templates/exam/ajax_questions.html
+++ b/testapp/exam/templates/exam/ajax_questions.html
diff --git a/testapp/templates/exam/automatic_questionpaper.html b/testapp/exam/templates/exam/automatic_questionpaper.html
index fcd3db5..fcd3db5 100644
--- a/testapp/templates/exam/automatic_questionpaper.html
+++ b/testapp/exam/templates/exam/automatic_questionpaper.html
diff --git a/testapp/templates/exam/complete.html b/testapp/exam/templates/exam/complete.html
index 1d5df3c..1d5df3c 100644
--- a/testapp/templates/exam/complete.html
+++ b/testapp/exam/templates/exam/complete.html
diff --git a/testapp/templates/exam/design_questionpaper.html b/testapp/exam/templates/exam/design_questionpaper.html
index 8994148..8994148 100644
--- a/testapp/templates/exam/design_questionpaper.html
+++ b/testapp/exam/templates/exam/design_questionpaper.html
diff --git a/testapp/templates/exam/edit_question.html b/testapp/exam/templates/exam/edit_question.html
index b28cc3e..b28cc3e 100644
--- a/testapp/templates/exam/edit_question.html
+++ b/testapp/exam/templates/exam/edit_question.html
diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/exam/templates/exam/edit_quiz.html
index 6445907..6445907 100644
--- a/testapp/templates/exam/edit_quiz.html
+++ b/testapp/exam/templates/exam/edit_quiz.html
diff --git a/testapp/templates/exam/editquestionpaper.html b/testapp/exam/templates/exam/editquestionpaper.html
index 819ff06..819ff06 100644
--- a/testapp/templates/exam/editquestionpaper.html
+++ b/testapp/exam/templates/exam/editquestionpaper.html
diff --git a/testapp/templates/exam/grade_user.html b/testapp/exam/templates/exam/grade_user.html
index ae9274e..ae9274e 100644
--- a/testapp/templates/exam/grade_user.html
+++ b/testapp/exam/templates/exam/grade_user.html
diff --git a/testapp/templates/exam/intro.html b/testapp/exam/templates/exam/intro.html
index ec1888a..ec1888a 100644
--- a/testapp/templates/exam/intro.html
+++ b/testapp/exam/templates/exam/intro.html
diff --git a/testapp/templates/exam/login.html b/testapp/exam/templates/exam/login.html
index 078e7a7..078e7a7 100644
--- a/testapp/templates/exam/login.html
+++ b/testapp/exam/templates/exam/login.html
diff --git a/testapp/templates/exam/manual_questionpaper.html b/testapp/exam/templates/exam/manual_questionpaper.html
index 1a1f95c..1a1f95c 100644
--- a/testapp/templates/exam/manual_questionpaper.html
+++ b/testapp/exam/templates/exam/manual_questionpaper.html
diff --git a/testapp/templates/exam/monitor.html b/testapp/exam/templates/exam/monitor.html
index ecdb852..ecdb852 100644
--- a/testapp/templates/exam/monitor.html
+++ b/testapp/exam/templates/exam/monitor.html
diff --git a/testapp/templates/exam/question.html b/testapp/exam/templates/exam/question.html
index a3e8629..a3e8629 100644
--- a/testapp/templates/exam/question.html
+++ b/testapp/exam/templates/exam/question.html
diff --git a/testapp/templates/exam/quit.html b/testapp/exam/templates/exam/quit.html
index fee11ed..fee11ed 100644
--- a/testapp/templates/exam/quit.html
+++ b/testapp/exam/templates/exam/quit.html
diff --git a/testapp/templates/exam/quizlist.html b/testapp/exam/templates/exam/quizlist.html
index 9b1fd73..9b1fd73 100644
--- a/testapp/templates/exam/quizlist.html
+++ b/testapp/exam/templates/exam/quizlist.html
diff --git a/testapp/templates/exam/quizzes_user.html b/testapp/exam/templates/exam/quizzes_user.html
index 914b6b4..914b6b4 100644
--- a/testapp/templates/exam/quizzes_user.html
+++ b/testapp/exam/templates/exam/quizzes_user.html
diff --git a/testapp/templates/exam/register.html b/testapp/exam/templates/exam/register.html
index 5ff79cc..5ff79cc 100644
--- a/testapp/templates/exam/register.html
+++ b/testapp/exam/templates/exam/register.html
diff --git a/testapp/templates/exam/results_user.html b/testapp/exam/templates/exam/results_user.html
index 2a2a309..2a2a309 100644
--- a/testapp/templates/exam/results_user.html
+++ b/testapp/exam/templates/exam/results_user.html
diff --git a/testapp/templates/exam/show_quiz.html b/testapp/exam/templates/exam/show_quiz.html
index cf3f552..cf3f552 100644
--- a/testapp/templates/exam/show_quiz.html
+++ b/testapp/exam/templates/exam/show_quiz.html
diff --git a/testapp/templates/exam/showquestionpapers.html b/testapp/exam/templates/exam/showquestionpapers.html
index e511472..e511472 100644
--- a/testapp/templates/exam/showquestionpapers.html
+++ b/testapp/exam/templates/exam/showquestionpapers.html
diff --git a/testapp/templates/exam/showquestions.html b/testapp/exam/templates/exam/showquestions.html
index 62b40e4..62b40e4 100644
--- a/testapp/templates/exam/showquestions.html
+++ b/testapp/exam/templates/exam/showquestions.html
diff --git a/testapp/templates/exam/showusers.html b/testapp/exam/templates/exam/showusers.html
index 01ecc37..01ecc37 100644
--- a/testapp/templates/exam/showusers.html
+++ b/testapp/exam/templates/exam/showusers.html
diff --git a/testapp/templates/exam/user_data.html b/testapp/exam/templates/exam/user_data.html
index 61a3a97..61a3a97 100644
--- a/testapp/templates/exam/user_data.html
+++ b/testapp/exam/templates/exam/user_data.html
diff --git a/testapp/templates/manage.html b/testapp/exam/templates/manage.html
index 1db8a78..1db8a78 100644
--- a/testapp/templates/manage.html
+++ b/testapp/exam/templates/manage.html
diff --git a/testapp/templates/user.html b/testapp/exam/templates/user.html
index 22a9fac..22a9fac 100644
--- a/testapp/templates/user.html
+++ b/testapp/exam/templates/user.html
diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index b659cf6..37a031d 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 
 urlpatterns = patterns('exam.views',
     url(r'^$', 'index'),
diff --git a/testapp/exam/views.py b/testapp/exam/views.py
index 38beb0d..7c9af6c 100644
--- a/testapp/exam/views.py
+++ b/testapp/exam/views.py
@@ -23,7 +23,7 @@ from exam.xmlrpc_clients import code_server
 from settings import URL_ROOT
 
 # The directory where user data can be saved.
-OUTPUT_DIR = abspath(join(dirname(__file__), pardir, 'output'))
+OUTPUT_DIR = abspath(join(dirname(__file__), 'output'))
 
 
 def my_redirect(url):
diff --git a/testapp/settings.py b/testapp/settings.py
index 668eca0..88d4a5a 100644
--- a/testapp/settings.py
+++ b/testapp/settings.py
@@ -5,18 +5,6 @@ from os.path import dirname, join, basename, abspath
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
-# The ports the code server should run on.  This will run one separate
-# server for each port listed in the following list.
-SERVER_PORTS = [8001]  # range(8001, 8026)
-
-# The server pool port.  This is the server which returns available server
-# ports so as to minimize load.  This is some random number where no other
-# service is running.  It should be > 1024 and less < 65535 though.
-SERVER_POOL_PORT = 53579
-
-# Timeout for the code to run in seconds.  This is an integer!
-SERVER_TIMEOUT = 2
-
 # The root of the URL, for example you might be in the situation where you
 # are not hosted as host.org/exam/  but as host.org/foo/exam/ for whatever
 # reason set this to the root you have to serve at.  In the above example
@@ -111,7 +99,6 @@ STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    join(CURDIR, 'static'),
 )
 
 # List of finder classes that know how to find static files in
@@ -148,7 +135,6 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    join(CURDIR, "templates"),
 )
 
 INSTALLED_APPS = (
diff --git a/testapp/urls.py b/testapp/urls.py
index c82ecb6..0d126f4 100644
--- a/testapp/urls.py
+++ b/testapp/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin