diff options
author | admin <admin@krishna-K55VM.(none)> | 2015-04-11 20:00:56 +0530 |
---|---|---|
committer | admin <admin@krishna-K55VM.(none)> | 2015-04-11 20:00:56 +0530 |
commit | c621366abea504423d7bfdc90bd56981df3b09d3 (patch) | |
tree | 884487da9ca9d4a5470df0b35fe93dc30d1e8b9a /gnowsys-ndf/gnowsys_ndf/ndf/urls | |
parent | d690228bfc28a1178b4dfd8de540a6e4b69c80d7 (diff) | |
parent | dd897086ce1c2bd82a5d8026fd7b73caf0265fc8 (diff) | |
download | gnowsys-c621366abea504423d7bfdc90bd56981df3b09d3.tar.gz |
conflicts removed
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls')
-rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 8 | ||||
-rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/e-book.py | 5 | ||||
-rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py | 2 | ||||
-rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/partner.py | 6 |
4 files changed, 19 insertions, 2 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index 47eee38..3da4907 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -45,6 +45,7 @@ urlpatterns = patterns('', (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>[^/]+)/partner', include('gnowsys_ndf.ndf.urls.partner')), (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')), @@ -59,6 +60,7 @@ urlpatterns = patterns('', (r'^(?P<group_id>[^/]+)/ratings', include('gnowsys_ndf.ndf.urls.ratings')), (r'^(?P<group_id>[^/]+)/topics', include('gnowsys_ndf.ndf.urls.topics')), (r'^(?P<group_id>[^/]+)/e-library', include('gnowsys_ndf.ndf.urls.e-library')), + (r'^(?P<group_id>[^/]+)/e-book', include('gnowsys_ndf.ndf.urls.e-book')), (r'^(?P<group_id>[^/]+)/term', include('gnowsys_ndf.ndf.urls.term')), (r'^(?P<group_id>[^/]+)/event', include('gnowsys_ndf.ndf.urls.event')), (r'^(?P<group_id>[^/]+)/data-review', include('gnowsys_ndf.ndf.urls.data_review')), @@ -100,7 +102,9 @@ urlpatterns = patterns('', 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'), - + # ---listing sub partners--- + url(r'^(?P<group_id>[^/]+)/partners$', 'gnowsys_ndf.ndf.views.partner.partner_list', name='partnerlist'), + # --------end of listing sub partners-------- # -- 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'), @@ -125,6 +129,8 @@ urlpatterns = patterns('', (r'^benchmarker/', include('gnowsys_ndf.benchmarker.urls')), + url(r'^(?P<group_id>[^/]+)/repository/?$', 'gnowsys_ndf.ndf.views.methods.repository', name='repository'), + # django-registration url(r'^accounts/password/change/done/', auth_views.password_change_done, name='password_change_done'), url(r'^accounts/password/change/', auth_views.password_change, {'password_change_form': UserChangeform}), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/e-book.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/e-book.py new file mode 100644 index 0000000..3370118 --- /dev/null +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/e-book.py @@ -0,0 +1,5 @@ +from django.conf.urls import patterns, url + +urlpatterns = patterns('gnowsys_ndf.ndf.views.e-book', + url(r'^[/]$', 'ebook_listing', name='e-book'), + ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py index d4ec1b5..fe7803a 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/group.py @@ -9,7 +9,7 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.group', url(r'^/switch_group/(?P<node_id>[\w-]+)$', 'switch_group', name='switch_group'), url(r'^/app_selection/', 'app_selection', name='app_selection'), url(r'^/create_sub_group/', 'create_sub_group', name='create_sub_group'), - url(r'^/(?P<groups_category>[\w-]+)/nroer_groups/?$', 'nroer_groups', name='nroer_groups'), + #url(r'^/(?P<groups_category>[\w-]+)/nroer_groups/?$', 'nroer_groups', name='nroer_groups'), url(r'^/(?P<app_id>[\w-]+)/value/(?P<agency_type>[\w-]+)/?$', 'group', name='groups_by_agency_type'), ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/partner.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/partner.py new file mode 100644 index 0000000..03cdcd1 --- /dev/null +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/partner.py @@ -0,0 +1,6 @@ +from django.conf.urls import patterns, url + +urlpatterns = patterns('gnowsys_ndf.ndf.views.partner', + url(r'^/create_partner/', 'create_partner', name='create_partner'), + url(r'^/(?P<groups_category>[\w-]+)', 'nroer_groups', name='nroer_groups'), + ) |