diff options
author | Avadoot Nachankar <avadoot298@gmail.com> | 2015-03-03 20:07:23 +0530 |
---|---|---|
committer | Avadoot Nachankar <avadoot298@gmail.com> | 2015-03-03 20:07:23 +0530 |
commit | d422bb2dc9730d375ab995219c42f088f23976fb (patch) | |
tree | c6ad03209c98b08a9e1c2e5fbbe75dc034e4b9c2 /gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | |
parent | 082bc72b1c9d6cae1b31b15d134487b6852e9686 (diff) | |
parent | c6751385f1d0d69cd73e89eabab802a05a6c5870 (diff) | |
download | gnowsys-d422bb2dc9730d375ab995219c42f088f23976fb.tar.gz |
Conflicts resolved after taking commit #1059.
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py')
-rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index 44c0ef2..281f5b2 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -36,7 +36,7 @@ urlpatterns = patterns('', # --end of mobwrite (r'^admin/', include(admin.site.urls)), - (r'^$', HomeRedirectView.as_view()), + (r'^$', HomeRedirectView.as_view()), (r'^(?P<group_id>[^/]+)/file', include('gnowsys_ndf.ndf.urls.file')), (r'^(?P<group_id>[^/]+)/image', include('gnowsys_ndf.ndf.urls.image')), @@ -48,14 +48,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 -- @@ -80,10 +80,10 @@ 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>[^/]+)/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')), @@ -95,32 +95,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 |