diff options
author | Kedar Aitawdekar <kedar2a@gmail.com> | 2015-03-05 14:48:36 +0530 |
---|---|---|
committer | Kedar Aitawdekar <kedar2a@gmail.com> | 2015-03-05 14:48:36 +0530 |
commit | a7137327149386bdd78ac0358960a53cd484678f (patch) | |
tree | 882fe348ca400510eff2ec9ffee4d332b47f5ede /gnowsys-ndf/gnowsys_ndf/ndf/urls | |
parent | c98621f8135928fbd050b16e02782300a284d9a0 (diff) | |
parent | 24950a58b2c1bfe943076478d96c6766d84f436e (diff) | |
download | gnowsys-a7137327149386bdd78ac0358960a53cd484678f.tar.gz |
Conflict resolved after taking pull
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls')
26 files changed, 47 insertions, 44 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/Bib_App.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/Bib_App.py index fc3b00f..df613fa 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/Bib_App.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/Bib_App.py @@ -1,6 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.Bib_App', - url(r'^$', 'Bib_App', name='Bib_App'), + url(r'^[/]$', 'Bib_App', name='Bib_App'), + url(r'^[/]$', 'Bib_App', name='bib_app'), url(r'^/create_entries$','create_entries',name='create_entries'), url(r'^/view_entry/(?P<node_id>[\w-]+)$','view_entry',name='view_entry'), url(r'^/view_entries/','view_entries',name='view_entries'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index 67293ef..d242ecc 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -3,7 +3,7 @@ from django.conf.urls import patterns, include, url from django.contrib import admin from django.conf.urls import * from django.contrib.auth import views as auth_views -from django.views.generic import RedirectView +# from django.views.generic import RedirectView from django.views.generic import TemplateView from registration.backends.default.views import RegistrationView @@ -49,14 +49,14 @@ urlpatterns = patterns('', (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>[^/]+)/search', include('gnowsys_ndf.ndf.urls.search_urls')), - (r'^(?P<group_id>[^/]+)/search/', include('gnowsys_ndf.ndf.urls.search_urls')), + # (r'^(?P<group_id>[^/]+)/search/', include('gnowsys_ndf.ndf.urls.search_urls')), (r'^(?P<group_name>[^/]+)/task', include('gnowsys_ndf.ndf.urls.task')), (r'^(?P<group_id>[^/]+)/batch', include('gnowsys_ndf.ndf.urls.batch')), (r'^(?P<group_id>[^/]+)/ajax/', include('gnowsys_ndf.ndf.urls.ajax-urls')), (r'^(?P<group_id>[^/]+)/bib_app', include('gnowsys_ndf.ndf.urls.Bib_App')), (r'^(?P<group_id>[^/]+)/wikidata', include('gnowsys_ndf.ndf.urls.wikidata')), (r'^(?P<group_id>[^/]+)/', include('gnowsys_ndf.ndf.urls.user')), - (r'^(?P<group_id>[^/]+)/ratings', include('gnowsys_ndf.ndf.urls.ratings')), + (r'^(?P<group_id>[^/]+)/ratings', include('gnowsys_ndf.ndf.urls.ratings')), (r'^(?P<group_id>[^/]+)/topics', include('gnowsys_ndf.ndf.urls.topics')), # -- django-json-rpc method calls -- @@ -81,10 +81,11 @@ urlpatterns = patterns('', # (r'^online/', include('online_status.urls')), #for online_users. # url(r'^(?P<group_id>[^/]+)/inviteusers/(?P<meetingid>[^/]+)','gnowsys_ndf.ndf.views.meeting.invite_meeting', name='invite_meeting'), # url(r'^(?P<group_id>[^/]+)/meeting/(?P<meetingid>[^/]+)','gnowsys_ndf.ndf.views.meeting.output', name='newmeeting'), - # url(r'^(?P<group_id>[^/]+)/meeting','gnowsys_ndf.ndf.views.meeting.dashb', name='Meeting'), + # url(r'^(?P<group_id>[^/]+)/meeting','gnowsys_ndf.ndf.views.meeting.dashb', name='Meeting'), + url(r'^(?P<group_id>[^/]+)/meeting','gnowsys_ndf.ndf.views.meeting.dashb', name='meeting'), # url(r'^(?P<group_id>[^/]+)/online','gnowsys_ndf.ndf.views.meeting.get_online_users', name='get_online_users'), # --end meeting app - + (r'^(?P<group_id>[^/]+)/data-review', include('gnowsys_ndf.ndf.urls.data_review')), (r'^(?P<group_id>[^/]+)/observation', include('gnowsys_ndf.ndf.urls.observation')), # (r'^(?P<group_id>[^/]+)/Observations', include('gnowsys_ndf.ndf.urls.observation')), @@ -96,32 +97,31 @@ urlpatterns = patterns('', # --end of discussion url(r'^(?P<group_id>[^/]+)/visualize', include('gnowsys_ndf.ndf.urls.visualise_urls')), - - url(r'^(?P<group_id>[^/]+)/$', 'gnowsys_ndf.ndf.views.group.group_dashboard', name='groupchange'), - #(r'^(?P<group_id>[^/]+)/', include('gnowsys_ndf.ndf.urls.group')), - url(r'^(?P<group_id>[^/]+)/annotationlibInSelText$', 'gnowsys_ndf.ndf.views.ajax_views.annotationlibInSelText', name='annotationlibInSelText'), - url(r'^(?P<group_id>[^/]+)/delComment$', 'gnowsys_ndf.ndf.views.ajax_views.delComment', name='delComment'), - url(r'^(?P<group_id>[^/]+)/tags$','gnowsys_ndf.ndf.views.methods.tag_info', name='tag_info'), - url(r'^(?P<group_id>[^/]+)/tags/(?P<tagname>[^/]+)$','gnowsys_ndf.ndf.views.methods.tag_info', name='tag_info'), - + + url(r'^(?P<group_id>[^/]+)/$', 'gnowsys_ndf.ndf.views.group.group_dashboard', name='groupchange'), + + # -- tags -- + url(r'^(?P<group_id>[^/]+)/tags$', 'gnowsys_ndf.ndf.views.methods.tag_info', name='tag_info'), + url(r'^(?P<group_id>[^/]+)/tags/(?P<tagname>[^/]+)$', 'gnowsys_ndf.ndf.views.methods.tag_info', name='tag_info'), + # ---end of tags # -- annotations -- # url(r'^(?P<group_id>[^/]+)/annotationlibInSelText$', 'gnowsys_ndf.ndf.views.ajax_views.annotationlibInSelText', name='annotationlibInSelText'), # url(r'^(?P<group_id>[^/]+)/delComment$', 'gnowsys_ndf.ndf.views.ajax_views.delComment', name='delComment'), # ---end of annotations + # -- custom apps -- -# >>>>>>> 1d7836b060eaec9ab6572946e06b15f6e427dcf4 - (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'), + # (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'), # --- end of custom apps - + # (r'^home','gnowsys_ndf.ndf.views.group.group_dashboard'), # (r'^home/', 'gnowsys_ndf.ndf.views.home.homepage'), - + (r'^benchmarker/', include('gnowsys_ndf.benchmarker.urls')), # django-registration diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py index 1f92647..2094b1e 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, url from django.views.generic.base import RedirectView urlpatterns = patterns('gnowsys_ndf.ndf.views.adminDashboard', - url(r'^$', RedirectView.as_view(url='GSystem'), name='adminClass'), + url(r'^[/]$', RedirectView.as_view(url='GSystem'), name='adminClass'), url(r'^edit', 'adminDashboardEdit', name='adminDashboardEdit'), url(r'^delete', 'adminDashboardDelete', name='adminDashboardDelete'), url(r'^(?P<class_name>[^/]+)', 'adminDashboardClass', name='adminDashboardClass'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py index 236dc73..ca21ada 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, url from django.views.generic.base import RedirectView urlpatterns = patterns('gnowsys_ndf.ndf.views.adminDesignerDashboard', - url(r'^$', RedirectView.as_view(url='GSystemType'), name='adminDesigner'), + url(r'^[/]$', RedirectView.as_view(url='GSystemType'), name='adminDesigner'), url(r'^(?P<class_name>[^/]+)$', 'adminDesignerDashboardClass', name='adminDesignerDashboardClass'), url(r'(?P<class_name>[^/]+)/create/', 'adminDesignerDashboardClassCreate', name='adminDesignerDashboardClassCreate'), url(r'(?P<class_name>[^/]+)/edit/(?P<node_id>[\w-]+)$', 'adminDesignerDashboardClassCreate', name='adminDesignerDashboardClassEdit'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/batch.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/batch.py index 4a810b0..abb8a27 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/batch.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/batch.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.batch', - url(r'^$', 'batch', name='batch'), + url(r'^[/]$', 'batch', name='batch'), url(r'^/edit/(?P<_id>[\w-]+)$', 'new_create_and_edit', name='edit'), url(r'^/new_batch$', 'new_create_and_edit', name='new_batch'), url(r'^/save_batch_stud$', 'save_students_for_batches', name='save_batch_stud'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py index f45a08e..dfc1f88 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.course', - url(r'^$', 'course', name='course'), + 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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/custom_app.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/custom_app.py index f84c9e2..83e7a6a 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/custom_app.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/custom_app.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.custom_app_view', - url(r'^$', 'custom_app_view', name='GAPPS'), + url(r'^[/]$', 'custom_app_view', name='GAPPS'), url(r'^/(?P<app_id>[\w-]+)$', 'custom_app_view'), url(r'^/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)$', 'custom_app_view', name='GAPPS_set'), url(r'^/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/(?P<app_set_instance_id>[\w-]+)$', 'custom_app_view', name='GAPPS_set_instance'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/data_review.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/data_review.py index 6608f86..9695684 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/data_review.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/data_review.py @@ -4,7 +4,7 @@ from django.views.generic import TemplateView urlpatterns = patterns('gnowsys_ndf.ndf.views.data_review', # simple data-review with/withou page no. - url(r'^/$', 'data_review', name='data_review'), + url(r'^[/]$', 'data_review', name='data_review'), url(r'^/page-no=(?P<page_no>\d+)/$', 'data_review', name='data_review_page'), # to save edited data-review row diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/e-library.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/e-library.py index 55cbc13..c7df810 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/e-library.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/e-library.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.e-library', - url(r'^$', 'resource_list'), + url(r'^[/]$', 'resource_list', name="e-library"), url(r'^/(?P<app_id>[\w-]+)$', 'resource_list', name='resource_list'), url(r'^/details/(?P<_id>[\w-]+)$', 'file_detail', name='resource_detail'), url(r'^/(?P<filetype>[\w-]+)/page-no=(?P<page_no>\d+)/$', 'elib_paged_file_objs', name='elib_paged_file_objs') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/event.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/event.py index aeef2ba..08861d7 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/event.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/event.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.event', - url(r'^$', 'event', name='event'), + url(r'^[/]$', 'event', name='event'), url(r'^/(?P<app_set_id>[\w-]+)$', 'event_detail', name='event_list'), url(r'^/create/(?P<app_set_id>[\w-]+)/new/$', 'event_create_edit', name='event_app_instance_create'), url(r'^/edit/(?P<app_set_id>[\w-]+)/(?P<app_set_instance_id>[\w-]+)$', 'event_create_edit', name='event_app_instance_edit'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py index c1cb352..d45d0ab 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/file.py @@ -3,8 +3,7 @@ from django.conf.urls import patterns, url from django.views.generic import TemplateView urlpatterns = patterns('gnowsys_ndf.ndf.views.file', - url(r'^$', 'file', name='file'), - url(r'^/$', 'file', name='file'), + 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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py index dbf39a7..35fa4db 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/forum.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.forum', - url(r'^$', 'forum', name='forum'), + 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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py index 0c47ad9..d4ec1b5 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.group', - url(r'^$', 'group', name='group'), + 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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py index 16be9c9..fedd0b0 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/image.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.imageDashboard', - url(r'^$', '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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/languagepref.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/languagepref.py index 211552c..cea125c 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/languagepref.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/languagepref.py @@ -2,5 +2,5 @@ from django.conf.urls import patterns, url from django.views.generic.base import RedirectView urlpatterns = patterns('gnowsys_ndf.ndf.views.languagepref', - url(r'^$','lang_pref', name='language_pref'), + url(r'^[/]$','lang_pref', name='language_pref'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/mis.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/mis.py index a7fd026..18c7976 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/mis.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/mis.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.mis', - url(r'^$', 'mis_detail', name='mis_list'), + url(r'^[/]$', 'mis_detail', name='mis'), url(r'^/(?P<app_id>[\w-]+)$', 'mis_detail', name='mis_list'), # MIS app landing url(r'^/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)$', 'mis_detail', name='mis_app_detail'), # mis_app_detail url(r'^/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)/enroll/(?P<app_set_instance_id>[\w-]+)$', 'mis_enroll', name='mis_enroll'), # Person enrollment in Courses link diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py index 0cfdcb4..08e05c8 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/module.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.module', - url(r'^$', 'module', name='module'), + 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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/observation.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/observation.py index 08e791d..018653a 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/observation.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/observation.py @@ -1,7 +1,8 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.observation', - url(r'^$', 'all_observations', name='all_observations'), + url(r'^[/]$', 'all_observations', name='all_observations'), + url(r'^[/]$', 'all_observations', name='observation'), # url(r'^/(?P<app_id>[\w-]+)$', 'all_observations', name='all_observations'), url(r'^/(?P<app_id>[\w-]+)/(?P<slug>[-\w]+)/(?P<app_set_id>[^/]+)$', 'observations_app', name='observations_app'), url(r'^/(?P<app_id>[\w-]+)/save_observation/(?P<app_set_id>[^/]+)/(?P<slug>[-\w]+)', 'save_observation', name='save_observation'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py index 6b0847a..0b7a5e4 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.page', - url(r'^$', 'page', name='page'), + 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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py index 6b356f0..9c01092 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/quiz.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.quiz', - url(r'^$', 'quiz', name='quiz'), + 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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/task.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/task.py index 5a4754d..2d2e3c9 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/task.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/task.py @@ -1,6 +1,6 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.task', - url(r'^$', 'task', name='task'), + url(r'^[/]$', 'task', name='task'), url(r'^/create$', 'create_edit_task', name='task_create_edit'), url(r'^/(?P<task_id>[\w-]+)$', 'task_details', name='task_details'), url(r'^/edit/(?P<task_id>[\w-]+)/$', 'create_edit_task', name='task_edit'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/term.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/term.py index a004f36..c5af7aa 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/term.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/term.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.term', - url(r'^$', 'term', name='term'), + url(r'^[/]$', 'term', name='term'), url(r'^/(?P<node_id>[\w-]+)$', 'term', name='term_details'), url(r'^/create/', 'create_edit_term', name='term_create_edit'), url(r'^/edit/(?P<node_id>[\w-]+)$', 'create_edit_term', name='term_create_edit'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/topics.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/topics.py index cdbe66f..dd9a720 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/topics.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/topics.py @@ -1,7 +1,8 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.topics', - url(r'^$', 'themes', name='theme_page'), + # url(r'^[/]$', 'themes', name='theme_page'), + url(r'^[/]$', 'themes', name='topics'), url(r'^/(?P<app_id>[\w-]+)$', 'themes', name='theme_page'), url(r'^/(?P<app_id>[\w-]+)/(?P<app_set_id>[\w-]+)$', 'themes', name='theme_list'), url(r'^/(?P<app_set_id>[\w-]+)/', 'theme_topic_create_edit', name='theme_topic_create') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py index cb5111d..324371e 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/video.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.videoDashboard', - url(r'^$', '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'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/visualise_urls.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/visualise_urls.py index 90b4459..5ac9379 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/visualise_urls.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/visualise_urls.py @@ -3,7 +3,7 @@ from django.conf.urls import patterns, url from django.views.generic import TemplateView urlpatterns = patterns('gnowsys_ndf.ndf.views.visualize', - url(r'^$', 'graphs', name='visualize_home'), + url(r'^[/]$', 'graphs', name='visualize_home'), # url(r'^/(?P<file_id>[\w-]+)$', 'file', name='file'), # url(r'^graph_display/$', 'graph_display', name='graph_display'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/wikidata.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/wikidata.py index 47b62f3..88ebaf1 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/wikidata.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/wikidata.py @@ -1,7 +1,8 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.wikidata', - url(r'^$', 'index', name='wikidata_main'), + url(r'^[/]$', 'index', name='wikidata_main'), + url(r'^[/]$', 'index', name='wikidata'), url(r'^/details/(?P<topic_id>[\w-]+)$', 'details', name = 'wikidata_topic_display'), url(r'^/details/(?P<topic_id>[\w-]+)/tag/(?P<tag>[^/]+)$', 'tag_view_list', name = 'tag_topic_display'), |