diff --git a/symposion/conference/urls.py b/symposion/conference/urls.py index 43a42a5b8bb81952955eb864ae9bda27275ce1d7..b90806815f39139ff54c42235111c68acd8c2895 100644 --- a/symposion/conference/urls.py +++ b/symposion/conference/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url +from .views import user_list -urlpatterns = patterns( - "symposion.conference.views", - url(r"^users/$", "user_list", name="user_list"), -) +urlpatterns = [ + url(r"^users/$", user_list, name="user_list"), +] diff --git a/symposion/proposals/urls.py b/symposion/proposals/urls.py index 2a0a6ffe058503fd336fca2cb0c99619761c2b6d..03b2993cc1a8f5421db04b27226d7931cd439527 100644 --- a/symposion/proposals/urls.py +++ b/symposion/proposals/urls.py @@ -1,21 +1,32 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url +from .views import ( + proposal_submit, + proposal_submit_kind, + proposal_detail, + proposal_edit, + proposal_speaker_manage, + proposal_cancel, + proposal_leave, + proposal_pending_join, + proposal_pending_decline, + document_create, + document_delete, + document_download, +) -urlpatterns = patterns( - "symposion.proposals.views", - url(r"^submit/$", "proposal_submit", name="proposal_submit"), - url(r"^submit/([\w\-]+)/$", "proposal_submit_kind", - name="proposal_submit_kind"), - url(r"^(\d+)/$", "proposal_detail", name="proposal_detail"), - url(r"^(\d+)/edit/$", "proposal_edit", name="proposal_edit"), - url(r"^(\d+)/speakers/$", "proposal_speaker_manage", - name="proposal_speaker_manage"), - url(r"^(\d+)/cancel/$", "proposal_cancel", name="proposal_cancel"), - url(r"^(\d+)/leave/$", "proposal_leave", name="proposal_leave"), - url(r"^(\d+)/join/$", "proposal_pending_join", name="proposal_pending_join"), - url(r"^(\d+)/decline/$", "proposal_pending_decline", name="proposal_pending_decline"), +urlpatterns = [ + url(r"^submit/$", proposal_submit, name="proposal_submit"), + url(r"^submit/([\w\-]+)/$", proposal_submit_kind, name="proposal_submit_kind"), + url(r"^(\d+)/$", proposal_detail, name="proposal_detail"), + url(r"^(\d+)/edit/$", proposal_edit, name="proposal_edit"), + url(r"^(\d+)/speakers/$", proposal_speaker_manage, name="proposal_speaker_manage"), + url(r"^(\d+)/cancel/$", proposal_cancel, name="proposal_cancel"), + url(r"^(\d+)/leave/$", proposal_leave, name="proposal_leave"), + url(r"^(\d+)/join/$", proposal_pending_join, name="proposal_pending_join"), + url(r"^(\d+)/decline/$", proposal_pending_decline, name="proposal_pending_decline"), - url(r"^(\d+)/document/create/$", "document_create", name="proposal_document_create"), - url(r"^document/(\d+)/delete/$", "document_delete", name="proposal_document_delete"), - url(r"^document/(\d+)/([^/]+)$", "document_download", name="proposal_document_download"), -) + url(r"^(\d+)/document/create/$", document_create, name="proposal_document_create"), + url(r"^document/(\d+)/delete/$", document_delete, name="proposal_document_delete"), + url(r"^document/(\d+)/([^/]+)$", document_download, name="proposal_document_download"), +] diff --git a/symposion/reviews/urls.py b/symposion/reviews/urls.py index 55196c65fc87a21646a83652bcffe380feb270ac..ba100c71f6cf8430fe1adeb0698805d19503ceff 100644 --- a/symposion/reviews/urls.py +++ b/symposion/reviews/urls.py @@ -1,25 +1,37 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url +from .views import ( + review_section, + review_status, + review_list, + review_admin, + review_bulk_accept, + result_notification, + result_notification_prepare, + result_notification_send, + review_detail, + review_delete, + review_assignments, + review_assignment_opt_out, +) -urlpatterns = patterns( - "symposion.reviews.views", - url(r"^section/(?P[\w\-]+)/all/$", "review_section", {"reviewed": "all"}, name="review_section"), - url(r"^section/(?P[\w\-]+)/reviewed/$", "review_section", {"reviewed": "reviewed"}, name="user_reviewed"), - url(r"^section/(?P[\w\-]+)/not_reviewed/$", "review_section", {"reviewed": "not_reviewed"}, name="user_not_reviewed"), - url(r"^section/(?P[\w\-]+)/assignments/$", "review_section", {"assigned": True}, name="review_section_assignments"), - url(r"^section/(?P[\w\-]+)/status/$", "review_status", name="review_status"), - url(r"^section/(?P[\w\-]+)/status/(?P\w+)/$", "review_status", name="review_status"), - url(r"^section/(?P[\w\-]+)/list/(?P\d+)/$", "review_list", name="review_list_user"), - url(r"^section/(?P[\w\-]+)/admin/$", "review_admin", name="review_admin"), - url(r"^section/(?P[\w\-]+)/admin/accept/$", "review_bulk_accept", name="review_bulk_accept"), - url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/$", "result_notification", name="result_notification"), - url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/prepare/$", "result_notification_prepare", name="result_notification_prepare"), - url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/send/$", "result_notification_send", name="result_notification_send"), +urlpatterns = [ + url(r"^section/(?P[\w\-]+)/all/$", review_section, {"reviewed": "all"}, name="review_section"), + url(r"^section/(?P[\w\-]+)/reviewed/$", review_section, {"reviewed": "reviewed"}, name="user_reviewed"), + url(r"^section/(?P[\w\-]+)/not_reviewed/$", review_section, {"reviewed": "not_reviewed"}, name="user_not_reviewed"), + url(r"^section/(?P[\w\-]+)/assignments/$", review_section, {"assigned": True}, name="review_section_assignments"), + url(r"^section/(?P[\w\-]+)/status/$", review_status, name="review_status"), + url(r"^section/(?P[\w\-]+)/status/(?P\w+)/$", review_status, name="review_status"), + url(r"^section/(?P[\w\-]+)/list/(?P\d+)/$", review_list, name="review_list_user"), + url(r"^section/(?P[\w\-]+)/admin/$", review_admin, name="review_admin"), + url(r"^section/(?P[\w\-]+)/admin/accept/$", review_bulk_accept, name="review_bulk_accept"), + url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/$", result_notification, name="result_notification"), + url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/prepare/$", result_notification_prepare, name="result_notification_prepare"), + url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/send/$", result_notification_send, name="result_notification_send"), - url(r"^review/(?P\d+)/$", "review_detail", name="review_detail"), + url(r"^review/(?P\d+)/$", review_detail, name="review_detail"), - url(r"^(?P\d+)/delete/$", "review_delete", name="review_delete"), - url(r"^assignments/$", "review_assignments", name="review_assignments"), - url(r"^assignment/(?P\d+)/opt-out/$", "review_assignment_opt_out", - name="review_assignment_opt_out"), -) + url(r"^(?P\d+)/delete/$", review_delete, name="review_delete"), + url(r"^assignments/$", review_assignments, name="review_assignments"), + url(r"^assignment/(?P\d+)/opt-out/$", review_assignment_opt_out, name="review_assignment_opt_out") +] diff --git a/symposion/schedule/urls.py b/symposion/schedule/urls.py index 8ac3bdc22573b47e76cf261c86d1ff5bdbd564ae..28b05f1f5802879a177ab493f785125315df68cd 100644 --- a/symposion/schedule/urls.py +++ b/symposion/schedule/urls.py @@ -1,24 +1,33 @@ from __future__ import unicode_literals -from django.conf.urls import url, patterns +from django.conf.urls import url - -urlpatterns = patterns( - "symposion.schedule.views", - url(r"^$", "schedule_conference", name="schedule_conference"), - url(r"^edit/$", "schedule_edit", name="schedule_edit"), - url(r"^list/$", "schedule_list", name="schedule_list"), - url(r"^presentations.csv$", "schedule_list_csv", name="schedule_list_csv"), - url(r"^presentation/(\d+)/$", "schedule_presentation_detail", - name="schedule_presentation_detail"), - url(r"^([\w\-]+)/$", "schedule_detail", name="schedule_detail"), - url(r"^([\w\-]+)/edit/$", "schedule_edit", name="schedule_edit"), - url(r"^([\w\-]+)/list/$", "schedule_list", name="schedule_list"), - url(r"^([\w\-]+)/presentations.csv$", "schedule_list_csv", - name="schedule_list_csv"), - url(r"^([\w\-]+)/edit/slot/(\d+)/", "schedule_slot_edit", - name="schedule_slot_edit"), - url(r"^conference.json", "schedule_json", name="schedule_json"), - url(r"^sessions/staff.txt$", "session_staff_email", name="schedule_session_staff_email"), - url(r"^sessions/$", "session_list", name="schedule_session_list"), - url(r"^session/(\d+)/$", "session_detail", name="schedule_session_detail"), +from .views import ( + schedule_conference, + schedule_edit, + schedule_list, + schedule_list_csv, + schedule_presentation_detail, + schedule_detail, + schedule_slot_edit, + schedule_json, + session_staff_email, + session_list, + session_detail, ) + +urlpatterns = [ + url(r"^$", schedule_conference, name="schedule_conference"), + url(r"^edit/$", schedule_edit, name="schedule_edit"), + url(r"^list/$", schedule_list, name="schedule_list"), + url(r"^presentations.csv$", schedule_list_csv, name="schedule_list_csv"), + url(r"^presentation/(\d+)/$", schedule_presentation_detail, name="schedule_presentation_detail"), + url(r"^([\w\-]+)/$", schedule_detail, name="schedule_detail"), + url(r"^([\w\-]+)/edit/$", schedule_edit, name="schedule_edit"), + url(r"^([\w\-]+)/list/$", schedule_list, name="schedule_list"), + url(r"^([\w\-]+)/presentations.csv$", schedule_list_csv, name="schedule_list_csv"), + url(r"^([\w\-]+)/edit/slot/(\d+)/", schedule_slot_edit, name="schedule_slot_edit"), + url(r"^conference.json", schedule_json, name="schedule_json"), + url(r"^sessions/staff.txt$", session_staff_email, name="schedule_session_staff_email"), + url(r"^sessions/$", session_list, name="schedule_session_list"), + url(r"^session/(\d+)/$", session_detail, name="schedule_session_detail"), +] diff --git a/symposion/speakers/urls.py b/symposion/speakers/urls.py index 941f94975dc0ce7c89a679b58bb3a1fdf95b303b..dd1a7bd65b05ee8cb0e8734824f48be61d6ca94d 100644 --- a/symposion/speakers/urls.py +++ b/symposion/speakers/urls.py @@ -1,14 +1,18 @@ from __future__ import unicode_literals -from django.conf.urls import patterns, url +from django.conf.urls import url - -urlpatterns = patterns( - "symposion.speakers.views", - url(r"^create/$", "speaker_create", name="speaker_create"), - url(r"^create/(\w+)/$", "speaker_create_token", - name="speaker_create_token"), - url(r"^edit/(?:(?P\d+)/)?$", "speaker_edit", name="speaker_edit"), - url(r"^profile/(?P\d+)/$", "speaker_profile", name="speaker_profile"), - url(r"^staff/create/(\d+)/$", "speaker_create_staff", - name="speaker_create_staff"), +from .views import ( + speaker_create, + speaker_create_token, + speaker_edit, + speaker_profile, + speaker_create_staff ) + +urlpatterns = [ + url(r"^create/$", speaker_create, name="speaker_create"), + url(r"^create/(\w+)/$", speaker_create_token, name="speaker_create_token"), + url(r"^edit/(?:(?P\d+)/)?$", speaker_edit, name="speaker_edit"), + url(r"^profile/(?P\d+)/$", speaker_profile, name="speaker_profile"), + url(r"^staff/create/(\d+)/$", speaker_create_staff, name="speaker_create_staff"), +] diff --git a/symposion/sponsorship/urls.py b/symposion/sponsorship/urls.py index 3ab17a723ad40964adbb6c68be44661aaf8cdab9..9fdc19270af347d891d9bb011aeb61e675471eb5 100644 --- a/symposion/sponsorship/urls.py +++ b/symposion/sponsorship/urls.py @@ -1,12 +1,17 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from django.views.generic import TemplateView +from .views import ( + sponsor_apply, + sponsor_add, + sponsor_zip_logo_files, + sponsor_detail +) -urlpatterns = patterns( - "symposion.sponsorship.views", +urlpatterns = [ url(r"^$", TemplateView.as_view(template_name="symposion/sponsorship/list.html"), name="sponsor_list"), - url(r"^apply/$", "sponsor_apply", name="sponsor_apply"), - url(r"^add/$", "sponsor_add", name="sponsor_add"), - url(r"^ziplogos/$", "sponsor_zip_logo_files", name="sponsor_zip_logos"), - url(r"^(?P\d+)/$", "sponsor_detail", name="sponsor_detail"), -) + url(r"^apply/$", sponsor_apply, name="sponsor_apply"), + url(r"^add/$", sponsor_add, name="sponsor_add"), + url(r"^ziplogos/$", sponsor_zip_logo_files, name="sponsor_zip_logos"), + url(r"^(?P\d+)/$", sponsor_detail, name="sponsor_detail"), +] diff --git a/symposion/teams/urls.py b/symposion/teams/urls.py index f6ddaf9d56617b9471095fc0d629db9c23956670..60e441e97714aa3bdd22a5ace472a7bbcf189f9b 100644 --- a/symposion/teams/urls.py +++ b/symposion/teams/urls.py @@ -1,17 +1,25 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url - -urlpatterns = patterns( - "symposion.teams.views", +from .views import ( + team_detail, + team_join, + team_leave, + team_apply, + team_promote, + team_demote, + team_accept, + team_reject +) +urlpatterns = [ # team specific - url(r"^(?P[\w\-]+)/$", "team_detail", name="team_detail"), - url(r"^(?P[\w\-]+)/join/$", "team_join", name="team_join"), - url(r"^(?P[\w\-]+)/leave/$", "team_leave", name="team_leave"), - url(r"^(?P[\w\-]+)/apply/$", "team_apply", name="team_apply"), + url(r"^(?P[\w\-]+)/$", team_detail, name="team_detail"), + url(r"^(?P[\w\-]+)/join/$", team_join, name="team_join"), + url(r"^(?P[\w\-]+)/leave/$", team_leave, name="team_leave"), + url(r"^(?P[\w\-]+)/apply/$", team_apply, name="team_apply"), # membership specific - url(r"^promote/(?P\d+)/$", "team_promote", name="team_promote"), - url(r"^demote/(?P\d+)/$", "team_demote", name="team_demote"), - url(r"^accept/(?P\d+)/$", "team_accept", name="team_accept"), - url(r"^reject/(?P\d+)/$", "team_reject", name="team_reject"), -) + url(r"^promote/(?P\d+)/$", team_promote, name="team_promote"), + url(r"^demote/(?P\d+)/$", team_demote, name="team_demote"), + url(r"^accept/(?P\d+)/$", team_accept, name="team_accept"), + url(r"^reject/(?P\d+)/$", team_reject, name="team_reject"), +]