diff --git a/ietf/community/urls.py b/ietf/community/urls.py index 999512f76..d07c37475 100644 --- a/ietf/community/urls.py +++ b/ietf/community/urls.py @@ -1,12 +1,14 @@ from django.conf.urls import url +from ietf.community import views + urlpatterns = [ - url(r'^personal/(?P[^/]+)/$', 'ietf.community.views.view_list'), - url(r'^personal/(?P[^/]+)/manage/$', 'ietf.community.views.manage_list'), - url(r'^personal/(?P[^/]+)/trackdocument/(?P[^/]+)/$', 'ietf.community.views.track_document'), - url(r'^personal/(?P[^/]+)/untrackdocument/(?P[^/]+)/$', 'ietf.community.views.untrack_document'), - url(r'^personal/(?P[^/]+)/csv/$', 'ietf.community.views.export_to_csv'), - url(r'^personal/(?P[^/]+)/feed/$', 'ietf.community.views.feed'), - url(r'^personal/(?P[^/]+)/subscription/$', 'ietf.community.views.subscription'), + url(r'^personal/(?P[^/]+)/$', views.view_list), + url(r'^personal/(?P[^/]+)/manage/$', views.manage_list), + url(r'^personal/(?P[^/]+)/trackdocument/(?P[^/]+)/$', views.track_document), + url(r'^personal/(?P[^/]+)/untrackdocument/(?P[^/]+)/$', views.untrack_document), + url(r'^personal/(?P[^/]+)/csv/$', views.export_to_csv), + url(r'^personal/(?P[^/]+)/feed/$', views.feed), + url(r'^personal/(?P[^/]+)/subscription/$', views.subscription), ] diff --git a/ietf/dbtemplate/urls.py b/ietf/dbtemplate/urls.py index 7a9a8bd51..3d878422a 100644 --- a/ietf/dbtemplate/urls.py +++ b/ietf/dbtemplate/urls.py @@ -1,7 +1,9 @@ from django.conf.urls import url +from ietf.dbtemplate import views + urlpatterns = [ - url(r'^(?P[-a-z0-9]+)/$', 'ietf.dbtemplate.views.template_list', name='template_list'), - url(r'^(?P[-a-z0-9]+)/(?P[\d]+)/$', 'ietf.dbtemplate.views.template_edit', name='template_edit'), + url(r'^(?P[-a-z0-9]+)/$', views.template_list, name='template_list'), + url(r'^(?P[-a-z0-9]+)/(?P[\d]+)/$', views.template_edit, name='template_edit'), ] diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py index d9fba0082..cacb9c44d 100644 --- a/ietf/doc/urls.py +++ b/ietf/doc/urls.py @@ -34,7 +34,7 @@ from django.conf.urls import url, include from django.views.generic import RedirectView from django.conf import settings -from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_stats +from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_stats, views_help session_patterns = [ url(r'^add$', views_doc.add_sessionpresentation), @@ -116,9 +116,9 @@ urlpatterns = [ url(r'^%(name)s/edit/approveballot/$' % settings.URL_REGEXPS, views_ballot.approve_ballot, name='doc_approve_ballot'), url(r'^%(name)s/edit/makelastcall/$' % settings.URL_REGEXPS, views_ballot.make_last_call, name='doc_make_last_call'), - url(r'^help/state/(?P[\w-]+)/$', 'ietf.doc.views_help.state_help', name="state_help"), - url(r'^help/relationships/$', 'ietf.doc.views_help.relationship_help', name="relationship_help"), - url(r'^help/relationships/(?P\w+)/$', 'ietf.doc.views_help.relationship_help', name="relationship_subset_help"), + url(r'^help/state/(?P[\w-]+)/$', views_help.state_help, name="state_help"), + url(r'^help/relationships/$', views_help.relationship_help, name="relationship_help"), + url(r'^help/relationships/(?P\w+)/$', views_help.relationship_help, name="relationship_subset_help"), url(r'^%(name)s/meetings/?$' % settings.URL_REGEXPS, views_doc.all_presentations), diff --git a/ietf/doc/urls_charter.py b/ietf/doc/urls_charter.py index f298b7ced..ce3448d85 100644 --- a/ietf/doc/urls_charter.py +++ b/ietf/doc/urls_charter.py @@ -3,17 +3,19 @@ from django.conf.urls import url from django.conf import settings +from ietf.doc import views_charter, views_doc + urlpatterns = [ - url(r'^state/$', "ietf.doc.views_charter.change_state", name='charter_change_state'), - url(r'^title/$', "ietf.doc.views_charter.change_title", name='charter_change_title'), - url(r'^(?P