From cc348af7bed2430dbd1c748138642ea7ecbe09a9 Mon Sep 17 00:00:00 2001
From: jayparikh111
Date: Fri, 17 Feb 2012 12:12:33 +0530
Subject: minor url changes

---
 testapp/exam/urls.py          | 8 ++++----
 testapp/exam/views.py         | 4 ++--
 testapp/templates/manage.html | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'testapp')

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index 4545897..8fa9a36 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -4,14 +4,14 @@ urlpatterns = patterns('exam.views',
     url(r'^$', 'index'),
     url(r'^login/$', 'user_login'),
     url(r'^manage/$', 'prof_manage'),
-    url(r'^addquestion/$', 'add_question'),
-    url(r'^addquiz/$', 'add_quiz'),
-    url(r'^grade_user/$', 'show_all_users'),
+    url(r'^manage/addquestion/$', 'add_question'),
+    url(r'^manage/addquiz/$', 'add_quiz'),
+    url(r'^manage/gradeuser/$', 'show_all_users'),
     url(r'^register/$', 'user_register'),
     url(r'^start/$', 'start'),
     url(r'^quit/$', 'quit'),
     url(r'^complete/$', 'complete'),
-    url(r'^monitor/$', 'monitor'),
+    url(r'^manage/monitor/$', 'monitor'),
     url(r'^monitor/(?P<quiz_id>\d+)/$', 'monitor'),    
     url(r'^user_data/(?P<username>[a-zA-Z0-9_.]+)/$', 'user_data'),
     url(r'^grade_user/(?P<username>[a-zA-Z0-9_.]+)/$', 'grade_user'),
diff --git a/testapp/exam/views.py b/testapp/exam/views.py
index 7c7a8ad..b202ff3 100644
--- a/testapp/exam/views.py
+++ b/testapp/exam/views.py
@@ -97,7 +97,7 @@ def add_question(request):
        if form.is_valid():
            data = form.cleaned_data
 	   form.save()
-           return my_redirect("/exam/addquestion/")
+           return my_redirect("/exam/manage/addquestion/")
        
        else:
            return my_render_to_response('exam/add_question.html',
@@ -115,7 +115,7 @@ def add_quiz(request):
         if form.is_valid():
             data = form.cleaned_data
             form.save()
-	    return my_redirect("/exam/addquiz")
+	    return my_redirect("/exam/manage/addquiz")
                 
         else:
             return my_render_to_response('exam/add_quiz.html',
diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html
index 3b67999..58b19ef 100644
--- a/testapp/templates/manage.html
+++ b/testapp/templates/manage.html
@@ -9,10 +9,10 @@
             <div class="well">
           <h5>Manage</h5>
           <ul>
-            <li><a href="{{ URL_ROOT }}/exam/addquestion">Add Questions</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/addquiz">Add Quiz</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/grade_user">Grade User</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/monitor">Monitor	</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/addquestion">Add Questions</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/addquiz">Add Quiz</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor	</a></li>
           </ul>
           </div>
       </div>
-- 
cgit