Merge branch 'deploy_server'

1 files changed, 5 insertions, 5 deletions

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index b3cfceb..33b2edf 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -7,15 +7,15 @@ urlpatterns = patterns('exam.views',
     url(r'^results/$','results_user'),
     url(r'^start/$', 'start'),
     url(r'^start/(?P<questionpaper_id>\d+)/$','start'),
-    url(r'^quit/(?P<answerpaper_id>\d+)/$', 'quit'),
-    url(r'^intro/$','start'),
+    url(r'^quit/(?P<questionpaper_id>\d+)/$', 'quit'),
+    url(r'^intro/(?P<questionpaper_id>\d+)/$','intro'),
     url(r'^complete/$', 'complete'),   
-    url(r'^complete/(?P<answerpaper_id>\d+)/$', 'complete'),
+    url(r'^complete/(?P<questionpaper_id>\d+)/$', 'complete'),
     url(r'^register/$', 'user_register'),
     url(r'^(?P<q_id>\d+)/$', 'question'),
     url(r'^(?P<q_id>\d+)/check/$', 'check'),
     url(r'^(?P<q_id>\d+)/check/(?P<questionpaper_id>\d+)/$', 'check'),
-
+    url(r'^intro/$', 'start'),
 
     url(r'^manage/$', 'prof_manage'),
     url(r'^manage/addquestion/$', 'add_question'),
@@ -32,7 +32,7 @@ urlpatterns = patterns('exam.views',
     url(r'^manage/showquestionpapers/$','show_all_questionpapers'),  
     url(r'^manage/showquestionpapers/(?P<questionpaper_id>\d+)/$',\
                                                     'show_all_questionpapers'),
-    url(r'^manage/monitor/(?P<quiz_id>\d+)/$', 'monitor'),    
+    url(r'^manage/monitor/(?P<questionpaper_id>\d+)/$', 'monitor'),    
     url(r'^manage/user_data/(?P<username>[a-zA-Z0-9_.]+)/$','user_data'),
     url(r'^manage/designquestionpaper/$','design_questionpaper'),
     url(r'^manage/designquestionpaper/(?P<questionpaper_id>\d+)/$',\