diff options
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 43 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py | 10 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py | 26 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py | 14 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py | 22 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py | 16 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py | 8 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py | 20 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py | 13 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py | 14 |
10 files changed, 101 insertions, 85 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index c3a09b6..0500efa 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -23,36 +23,35 @@ urlpatterns = patterns('', (r'^mobwrite/', 'gnowsys_ndf.mobwrite.views.mobwrite'), (r'^admin/', include(admin.site.urls)), (r'^$', HomeRedirectView.as_view()), - (r'^home/','gnowsys_ndf.ndf.views.group.group_dashboard'), - (r'^(?P<group_id>[^/]+)/file/', include('gnowsys_ndf.ndf.urls.file')), - (r'^(?P<group_id>[^/]+)/image/', include('gnowsys_ndf.ndf.urls.image')), - (r'^(?P<group_id>[^/]+)/video/', include('gnowsys_ndf.ndf.urls.video')), - (r'^(?P<group_id>[^/]+)/page/', include('gnowsys_ndf.ndf.urls.page')), - (r'^(?P<group_id>[^/]+)/group/', include('gnowsys_ndf.ndf.urls.group')), - (r'^(?P<group_id>[^/]+)/forum/', include('gnowsys_ndf.ndf.urls.forum')), - (r'^(?P<group_id>[^/]+)/quiz/', include('gnowsys_ndf.ndf.urls.quiz')), - (r'^(?P<group_id>[^/]+)/course/', include('gnowsys_ndf.ndf.urls.course')), - (r'^(?P<group_id>[^/]+)/module/', include('gnowsys_ndf.ndf.urls.module')), - (r'^(?P<group_id>[^/]+)/ajax/', include('gnowsys_ndf.ndf.urls.ajax-urls')), + (r'^(?P<group_id>[^/]+)/file', include('gnowsys_ndf.ndf.urls.file')), + (r'^(?P<group_id>[^/]+)/image', include('gnowsys_ndf.ndf.urls.image')), + (r'^(?P<group_id>[^/]+)/video', include('gnowsys_ndf.ndf.urls.video')), + (r'^(?P<group_id>[^/]+)/page', include('gnowsys_ndf.ndf.urls.page')), + (r'^(?P<group_id>[^/]+)/group', include('gnowsys_ndf.ndf.urls.group')), + (r'^(?P<group_id>[^/]+)/forum', include('gnowsys_ndf.ndf.urls.forum')), + (r'^(?P<group_id>[^/]+)/quiz', include('gnowsys_ndf.ndf.urls.quiz')), + (r'^(?P<group_id>[^/]+)/course', include('gnowsys_ndf.ndf.urls.course')), + (r'^(?P<group_id>[^/]+)/module', include('gnowsys_ndf.ndf.urls.module')), + (r'^(?P<group_id>[^/]+)/ajax/', include('gnowsys_ndf.ndf.urls.ajax-urls')), (r'^(?P<group_id>[^/]+)/browse resource/', include('gnowsys_ndf.ndf.urls.browse_resource')), - - (r'^(?P<group_id>[^/]+)/',include('gnowsys_ndf.ndf.urls.group')), - + (r'^(?P<group_id>[^/]+)/', include('gnowsys_ndf.ndf.urls.user')), + # (r'^(?P<group_id>[^/]+)/',include('gnowsys_ndf.ndf.urls.group')), + url(r'^(?P<group_id>[^/]+)$','gnowsys_ndf.ndf.views.group.group_dashboard', name='groupchange'), url(r'^(?P<group_id>[^/]+)/tags/(?P<tagname>[^/]+)$','gnowsys_ndf.ndf.views.methods.tag_info', name='tag_info'), - (r'^(?P<group_id>[^/]+)/', include('gnowsys_ndf.ndf.urls.user')), + (r'^(?P<group_id>[^/]+)/observation/(?P<app_id>[\w-]+)$', include('gnowsys_ndf.ndf.urls.observations_urls')), (r'^(?P<group_id>[^/]+)/observations/(?P<app_id>[\w-]+)', include('gnowsys_ndf.ndf.urls.observations_urls')), - - url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)$', custom_app_view, name='GAPPS'), - url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)$', custom_app_view, name='GAPPS_set'), - url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/(?P<app_set_instance_id>[\w-]+)$', custom_app_view, name='GAPPS_set_instance'), - url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/(?P<app_set_instance_id>[\w-]+)/edit/$', custom_app_new_view, name='GAPPS_set_instance_edit'), - url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/new/$', custom_app_new_view, name='GAPPS_set_new_instance'), - + (r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)', include('gnowsys_ndf.ndf.urls.custom_app')), + # url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)$', custom_app_view, name='GAPPS'), + # url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)$', custom_app_view, name='GAPPS_set'), + # url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/(?P<app_set_instance_id>[\w-]+)$', custom_app_view, name='GAPPS_set_instance'), + # url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/(?P<app_set_instance_id>[\w-]+)/edit/$', custom_app_new_view, name='GAPPS_set_instance_edit'), + # url(r'^(?P<group_id>[^/]+)/(?P<app_name>[^/]+)/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/new/$', custom_app_new_view, name='GAPPS_set_new_instance'), + (r'^home','gnowsys_ndf.ndf.views.group.group_dashboard'), # (r'^home/', 'gnowsys_ndf.ndf.views.home.homepage'), (r'^benchmarker/', include('gnowsys_ndf.benchmarker.urls')), url(r'^accounts/password/change/done/', auth_views.password_change_done, name='password_change_done'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py index 98a5976..c0749e4 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py @@ -1,8 +1,10 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.course', - url(r'^(?P<course_id>[\w-]+)$', 'course', name='course'), - url(r'^create/$', 'create_edit', name='create_edit'), - url(r'^edit/(?P<node_id>[\w-]+)$', 'create_edit', name='create_edit'), - url(r'^course_detail/(?P<_id>[\w-]+)$', 'course_detail', name='course_detail') + url(r'^$', 'course', name='course'), + # url(r'^/(?P<course_id>[\w-]+)$', 'course', name='course'), + url(r'^/create/$', 'create_edit', name='create_edit'), + url(r'^/edit/(?P<node_id>[\w-]+)$', 'create_edit', name='create_edit'), + url(r'^/course_detail/(?P<_id>[\w-]+)$', 'course_detail', name='course_detail'), + url(r'^/(?P<_id>[\w-]+)$', 'course_detail', name='course_detail'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py index d7c8596..fd4e9e7 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py @@ -3,16 +3,20 @@ from django.conf.urls import patterns, url from django.views.generic import TemplateView urlpatterns = patterns('gnowsys_ndf.ndf.views.file', - url(r'^(?P<file_id>[\w-]+)$', 'file', name='file'), - url(r'^uploadDoc/$', 'uploadDoc', name='uploadDoc'), #Direct ot html template - url(r'^submitDoc/', 'submitDoc', name='submitDoc'), - url(r'^submit/', 'submitDoc', name='submitDoc'), - url(r'^documentList/', 'GetDoc', name='documentList'), - url(r'^readDoc/(?P<_id>[\w-]+)/(?:(?P<file_name>[^/]+))?$', 'readDoc', name='read_file'), - url(r'^search/$', 'file_search', name='file_search'), - url(r'^details/(?P<_id>[\w-]+)$', 'file_detail', name='file_detail'), - url(r'^thumbnail/(?P<_id>[\w-]+)$', 'getFileThumbnail', name='getFileThumbnail'), - url(r'^delete_file/(?P<_id>[\w-]+)$', 'delete_file', name='delete_file'), - url(r'^edit_file/(?P<_id>[\w-]+)$', 'file_edit', name='file_edit') + url(r'^$', 'file', name='file'), +# url(r'^/(?P<file_id>[\w-]+)$', 'file', name='file'), + url(r'^/uploadDoc/$', 'uploadDoc', name='uploadDoc'), #Direct ot html template + url(r'^/submitDoc/', 'submitDoc', name='submitDoc'), + url(r'^/submit/', 'submitDoc', name='submitDoc'), + url(r'^/documentList/', 'GetDoc', name='documentList'), + url(r'^/readDoc/(?P<_id>[\w-]+)/(?:(?P<file_name>[^/]+))?$', 'readDoc', name='read_file'), + url(r'^/search/$', 'file_search', name='file_search'), + url(r'^/details/(?P<_id>[\w-]+)$', 'file_detail', name='file_detail'), + url(r'^/(?P<_id>[\w-]+)$', 'file_detail', name='file_detail'), + url(r'^/thumbnail/(?P<_id>[\w-]+)$', 'getFileThumbnail', name='getFileThumbnail'), + url(r'^/delete_file/(?P<_id>[\w-]+)$', 'delete_file', name='delete_file'), + url(r'^/delete/(?P<_id>[\w-]+)$', 'delete_file', name='delete_file'), + url(r'^/edit_file/(?P<_id>[\w-]+)$', 'file_edit', name='file_edit'), + url(r'^/edit/(?P<_id>[\w-]+)$', 'file_edit', name='file_edit'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py index a7b0e89..d0ea681 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py @@ -1,11 +1,13 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.forum', - url(r'^(?P<node_id>[\w-]+)$', 'forum', name='forum'), - url(r'^create/$', 'create_forum', name='create_forum'), - url(r'^show/(?P<forum_id>[\w-]+)$', 'display_forum', name='show'), - url(r'^thread/(?P<thread_id>[\w-]+)$', 'display_thread', name='thread'), - - url(r'^add_node/$','add_node',name="add_node"), + url(r'^$', 'forum', name='forum'), + # url(r'^/(?P<node_id>[\w-]+)$', 'forum', name='forum'), + url(r'^/create/$', 'create_forum', name='create_forum'), + url(r'^/show/(?P<forum_id>[\w-]+)$', 'display_forum', name='show'), + url(r'^/(?P<forum_id>[\w-]+)$', 'display_forum', name='show'), + url(r'^/thread/(?P<thread_id>[\w-]+)$', 'display_thread', name='thread'), + url(r'^/(?P<forum_id>[\w-]+)/(?P<thread_id>[\w-]+)$', 'display_thread', name='thread'), + url(r'^/add_node/$','add_node',name="add_node"), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py index 239bb94..e640652 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py @@ -1,24 +1,24 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.group', - url(r'^$','group_dashboard', name='groupchange'), - url(r'^(?P<app_id>[\w-]+)$', 'group', name='group'), - url(r'^create_group/', 'create_group', name='create_group'), - url(r'^group_publish/(?P<node>[\w-]+)$','publish_group',name='publish_group'), - url(r'^edit_group/', 'edit_group', name='edit_group'), - url(r'^switch_group/(?P<node_id>[\w-]+)$', 'switch_group', name='switch_group'), - url(r'^app_selection/(?P<node_id>[\w-]+)$', 'app_selection', name='app_selection'), + url(r'^$','group', name='group'), + url(r'^/(?P<app_id>[\w-]+)$', 'group', name='group'), + url(r'^/create_group/', 'create_group', name='create_group'), + url(r'^/group_publish/(?P<node>[\w-]+)$','publish_group',name='publish_group'), + url(r'^/edit_group/', 'edit_group', name='edit_group'), + url(r'^/switch_group/(?P<node_id>[\w-]+)$', 'switch_group', name='switch_group'), + url(r'^/app_selection/(?P<node_id>[\w-]+)$', 'app_selection', name='app_selection'), ) urlpatterns += patterns('gnowsys_ndf.ndf.views.ajax_views', - url(r'^check_group/', 'checkgroup', name='check_group'), + url(r'^/check_group/', 'checkgroup', name='check_group'), ) urlpatterns += patterns('gnowsys_ndf.ndf.views.notify', - url(r'^notify/join/$', 'notifyuser', name='notifyuser'), - url(r'^notify/remove/$', 'notify_remove_user', name='notifyremuser'), - url(r'^notify/send_invitation/$', 'send_invitation', name='sendinvitation'), + url(r'^/notify/join/$', 'notifyuser', name='notifyuser'), + url(r'^/notify/remove/$', 'notify_remove_user', name='notifyremuser'), + url(r'^/notify/send_invitation/$', 'send_invitation', name='sendinvitation'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py index 2830d6e..16be9c9 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py @@ -1,13 +1,15 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.imageDashboard', - url(r'^(?P<image_id>[\w-]+)$', 'imageDashboard', name='image'), + url(r'^$', 'imageDashboard', name='image'), +# url(r'^/(?P<image_id>[\w-]+)$', 'imageDashboard', name='image'), #url(r'^images/', 'imageDashboard', name='imageDashboard'), - url(r'^thumbnail/(?P<_id>[\w-]+)$', 'getImageThumbnail', name='getImageThumbnail'), - url(r'^fullImage/(?P<_id>[\w-]+)/(?P<file_name>[^/]+)$', 'getFullImage', name='getFullImage'), - url(r'^get_mid_size_img/(?P<_id>[\w-]+)$', 'get_mid_size_img', name='get_mid_size_img'), - url(r'^image_search/$', 'image_search', name='image_search'), - url(r'^details/(?P<_id>[\w-]+)$', 'image_detail', name='image_detail'), - url(r'^edit/(?P<_id>[\w-]+)$', 'image_edit', name='image_edit'), + url(r'^/thumbnail/(?P<_id>[\w-]+)$', 'getImageThumbnail', name='getImageThumbnail'), + url(r'^/fullImage/(?P<_id>[\w-]+)/(?P<file_name>[^/]+)$', 'getFullImage', name='getFullImage'), + url(r'^/get_mid_size_img/(?P<_id>[\w-]+)$', 'get_mid_size_img', name='get_mid_size_img'), + url(r'^/image_search/$', 'image_search', name='image_search'), + url(r'^/(?P<_id>[\w-]+)$', 'image_detail', name='image_detail'), + url(r'^/details/(?P<_id>[\w-]+)$', 'image_detail', name='image_detail'), + url(r'^/edit/(?P<_id>[\w-]+)$', 'image_edit', name='image_edit'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py index 43d5d47..0cfdcb4 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py @@ -1,7 +1,9 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.module', - url(r'^(?P<module_id>[\w-]+)$', 'module', name='module'), - url(r'^delete_module/(?P<_id>[\w-]+)$', 'delete_module', name='delete_module'), - url(r'^module_detail/(?P<_id>[\w-]+)$', 'module_detail', name='module_detail'), + url(r'^$', 'module', name='module'), +# url(r'^(?P<module_id>[\w-]+)$', 'module', name='module'), + url(r'^/delete_module/(?P<_id>[\w-]+)$', 'delete_module', name='delete_module'), + url(r'^/module_detail/(?P<_id>[\w-]+)$', 'module_detail', name='module_detail'), + url(r'^/(?P<_id>[\w-]+)$', 'module_detail', name='module_detail'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py index 349c5cd..f8e52fb 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py @@ -1,16 +1,18 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.page', - url(r'^(?P<app_id>[\w-]+)$', 'page', name='page'), - url(r'^create/', 'create_edit_page', name='page_create_edit'), - url(r'^details/(?P<app_id>[\w-]+)$', 'page', name='page_details'), - url(r'^edit/(?P<node_id>[\w-]+)$', 'create_edit_page', name='page_create_edit'), - url(r'^search$', 'page', name='page_search'), - url(r'^(?P<node_id>[\w-]+)/translate/$', 'translate_node', name='node_translation'), - url(r'^(?P<node_id>[\w-]+)/version/(?P<version_no>\d+\.\d+)$', 'version_node', name='node_version'), + url(r'^$', 'page', name='page'), + url(r'^/details/(?P<app_id>[\w-]+)$', 'page', name='page_details'), + url(r'^/(?P<app_id>[\w-]+)$', 'page', name='page_details'), + url(r'^/create/', 'create_edit_page', name='page_create_edit'), + + url(r'^/edit/(?P<node_id>[\w-]+)$', 'create_edit_page', name='page_create_edit'), + url(r'^/search$', 'page', name='page_search'), + url(r'^/(?P<node_id>[\w-]+)/translate/$', 'translate_node', name='node_translation'), + url(r'^/(?P<node_id>[\w-]+)/version/(?P<version_no>\d+\.\d+)$', 'version_node', name='node_version'), - url(r'^delete/(?P<node_id>[\w-]+)$', 'delete_page', name='page_delete'), - url(r'^page_publish/(?P<node>[\w-]+)$','publish_page',name='publish_page'), + url(r'^/delete/(?P<node_id>[\w-]+)$', 'delete_page', name='page_delete'), + url(r'^/page_publish/(?P<node>[\w-]+)$','publish_page',name='publish_page'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py index c8f4ca6..6b356f0 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py @@ -1,12 +1,13 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.quiz', - url(r'^(?P<app_id>[\w-]+)$', 'quiz', name='quiz'), - url(r'^question/create', 'create_edit_quiz_item', name='quiz_item_create'), - url(r'^create/', 'create_edit_quiz', name='quiz_create'), - url(r'^details/(?P<app_id>[\w-]+)$', 'quiz', name='quiz_details'), - url(r'^question/edit/(?P<node_id>[\w-]+)$', 'create_edit_quiz_item', name='quiz_item_edit'), - url(r'^edit/(?P<node_id>[\w-]+)$', 'create_edit_quiz', name='quiz_edit'), + url(r'^$', 'quiz', name='quiz'), + url(r'^/(?P<app_id>[\w-]+)$', 'quiz', name='quiz'), + url(r'^/question/create', 'create_edit_quiz_item', name='quiz_item_create'), + url(r'^/create/', 'create_edit_quiz', name='quiz_create'), + url(r'^/details/(?P<app_id>[\w-]+)$', 'quiz', name='quiz_details'), + url(r'^/question/edit/(?P<node_id>[\w-]+)$', 'create_edit_quiz_item', name='quiz_item_edit'), + url(r'^/edit/(?P<node_id>[\w-]+)$', 'create_edit_quiz', name='quiz_edit'), # url(r'^(?P<node_id>[\w-]+)/version/(?P<version_no>\d+\.\d+)$', 'version_node', name='node_version'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py index da0baa4..cb5111d 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py @@ -1,11 +1,13 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.videoDashboard', - url(r'^(?P<video_id>[\w-]+)$', 'videoDashboard', name='video'), + url(r'^$', 'videoDashboard', name='video'), +# url(r'^(?P<video_id>[\w-]+)$', 'videoDashboard', name='video'), #url(r'^videos/', 'videoDashboard', name='videoDashboard'), - url(r'^thumbnail/(?P<_id>[\w-]+)$', 'getvideoThumbnail', name='getvideoThumbnail'), - url(r'^fullvideo/(?P<_id>[\w-]+)$', 'getFullvideo', name='getFullvideo'), - url(r'^video_search/$', 'video_search', name='video_search'), - url(r'^details/(?P<_id>[\w-]+)$', 'video_detail', name='video_detail'), - url(r'^edit/(?P<_id>[\w-]+)$', 'video_edit', name='video_edit') + url(r'^/thumbnail/(?P<_id>[\w-]+)$', 'getvideoThumbnail', name='getvideoThumbnail'), + url(r'^/fullvideo/(?P<_id>[\w-]+)$', 'getFullvideo', name='getFullvideo'), + url(r'^/video_search/$', 'video_search', name='video_search'), + url(r'^/(?P<_id>[\w-]+)$', 'video_detail', name='video_detail'), + url(r'^/details/(?P<_id>[\w-]+)$', 'video_detail', name='video_detail'), + url(r'^/edit/(?P<_id>[\w-]+)$', 'video_edit', name='video_edit') ) |