Merge branch 'master' into quizzes

[oweals/karmaworld.git] / karmaworld / urls.py

diff --git a/karmaworld/urls.py b/karmaworld/urls.py
index 6777de84baabba9a4a169642210b7da88d348119..56f6ed2c95b5fe0069db2e8faf57ec8a0e2ac27e 100644 (file)
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@ -19,6 +19,7 @@ from karmaworld.apps.notes.views import NoteView, thank_note, NoteSearchView, fl
 from karmaworld.apps.notes.views import RawNoteDetailView
 from karmaworld.apps.moderation import moderator
 from karmaworld.apps.document_upload.views import save_fp_upload
+from karmaworld.apps.quizzes.views import QuizView, KeywordEditView
 from karmaworld.apps.users.views import ProfileView
 
 # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
@@ -106,13 +107,17 @@ urlpatterns = patterns('',
     # b: school/course/id/slug
     # c: s../c../slug
     # note file as id, for notes without titles yet
-    url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<pk>[\d^/]+)$', \
+    url(r'^note/(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<pk>[\d^/]+)$', \
         NoteView.as_view(), name='note_detail_pk'),
     # note file by note.slug
-    url(r'^' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'$',
+    url(r'^note/' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'$',
         NoteView.as_view(), name='note_detail'),
-    #url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<slug>[^/]+)$', \
-    #    NoteView.as_view(), name='note_detail'),
+
+    # Quizzes
+    url(r'^note/' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'/quiz/$',
+        QuizView.as_view(), name='quiz'),
+    url(r'^note/' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'/keywords/$',
+        KeywordEditView.as_view(), name='keyword_edit'),
 
     url(r'^$', CourseListView.as_view(model=Course), name='home'),
 )