From 347497602ccd83159f54e8ce78dfacdfbc722ac6 Mon Sep 17 00:00:00 2001 From: Evarin Date: Tue, 20 Feb 2018 17:21:26 +0100 Subject: [PATCH] Revert urls prefixing --- cof/urls.py | 74 ++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/cof/urls.py b/cof/urls.py index 8be4a130..bb72f9ea 100644 --- a/cof/urls.py +++ b/cof/urls.py @@ -27,73 +27,73 @@ admin.autodiscover() urlpatterns = [ # Page d'accueil - url(r'^gestion/$', gestioncof_views.home, name='home'), + url(r'^$', gestioncof_views.home, name='home'), # Le BdA - url(r'^gestion/bda/', include('bda.urls')), + url(r'^bda/', include('bda.urls')), # Les exports - url(r'^gestion/export/', include(export_patterns)), + url(r'^export/', include(export_patterns)), # Les petits cours - url(r'^gestion/petitcours/', include(petitcours_patterns)), + url(r'^petitcours/', include(petitcours_patterns)), # Les sondages - url(r'^gestion/survey/', include(surveys_patterns)), + url(r'^survey/', include(surveys_patterns)), # Evenements - url(r'^gestion/event/', include(events_patterns)), + url(r'^event/', include(events_patterns)), # Calendrier - url(r'^gestion/calendar/', include(calendar_patterns)), + url(r'^calendar/', include(calendar_patterns)), # Clubs - url(r'^gestion/clubs/', include(clubs_patterns)), + url(r'^clubs/', include(clubs_patterns)), # Authentification - url(r'^gestion/cof/denied$', TemplateView.as_view(template_name='cof-denied.html'), + url(r'^cof/denied$', TemplateView.as_view(template_name='cof-denied.html'), name="cof-denied"), - url(r'^gestion/cas/login$', django_cas_views.login, name="cas_login_view"), - url(r'^gestion/cas/logout$', django_cas_views.logout), - url(r'^gestion/outsider/login$', gestioncof_views.login_ext, + url(r'^cas/login$', django_cas_views.login, name="cas_login_view"), + url(r'^cas/logout$', django_cas_views.logout), + url(r'^outsider/login$', gestioncof_views.login_ext, name="ext_login_view"), - url(r'^gestion/outsider/logout$', django_views.logout, {'next_page': 'home'}), - url(r'^gestion/login$', gestioncof_views.login, name="cof-login"), - url(r'^gestion/logout$', gestioncof_views.logout, name="cof-logout"), + url(r'^outsider/logout$', django_views.logout, {'next_page': 'home'}), + url(r'^login$', gestioncof_views.login, name="cof-login"), + url(r'^logout$', gestioncof_views.logout, name="cof-logout"), # Infos persos - url(r'^gestion/profile$', gestioncof_views.profile, + url(r'^profile$', gestioncof_views.profile, name='profile'), - url(r'^gestion/outsider/password-change$', django_views.password_change, + url(r'^outsider/password-change$', django_views.password_change, name='password_change'), - url(r'^gestion/outsider/password-change-done$', + url(r'^outsider/password-change-done$', django_views.password_change_done, name='password_change_done'), # Inscription d'un nouveau membre - url(r'^gestion/registration$', gestioncof_views.registration, + url(r'^registration$', gestioncof_views.registration, name='registration'), - url(r'^gestion/registration/clipper/(?P[\w-]+)/' + url(r'^registration/clipper/(?P[\w-]+)/' r'(?P.*)$', gestioncof_views.registration_form2, name="clipper-registration"), - url(r'^gestion/registration/user/(?P.+)$', + url(r'^registration/user/(?P.+)$', gestioncof_views.registration_form2, name="user-registration"), - url(r'^gestion/registration/empty$', gestioncof_views.registration_form2, + url(r'^registration/empty$', gestioncof_views.registration_form2, name="empty-registration"), # Autocompletion - url(r'^gestion/autocomplete/registration$', autocomplete), - url(r'^gestion/user/autocomplete$', gestioncof_views.user_autocomplete, + url(r'^autocomplete/registration$', autocomplete), + url(r'^user/autocomplete$', gestioncof_views.user_autocomplete, name='cof-user-autocomplete'), # Interface admin - url(r'^gestion/admin/logout/', gestioncof_views.logout), - url(r'^gestion/admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^gestion/admin/(?P[\d\w]+)/(?P[\d\w]+)/csv/', + url(r'^admin/logout/', gestioncof_views.logout), + url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^admin/(?P[\d\w]+)/(?P[\d\w]+)/csv/', csv_views.admin_list_export, {'fields': ['username', ]}), - url(r'^gestion/admin/', include(admin.site.urls)), + url(r'^admin/', include(admin.site.urls)), # Liens utiles du COF et du BdA - url(r'^gestion/utile_cof$', gestioncof_views.utile_cof, + url(r'^utile_cof$', gestioncof_views.utile_cof, name='utile_cof'), - url(r'^gestion/utile_bda$', gestioncof_views.utile_bda, + url(r'^utile_bda$', gestioncof_views.utile_bda, name='utile_bda'), - url(r'^gestion/utile_bda/bda_diff$', gestioncof_views.liste_bdadiff), - url(r'^gestion/utile_cof/diff_cof$', gestioncof_views.liste_diffcof), - url(r'^gestion/utile_bda/bda_revente$', gestioncof_views.liste_bdarevente), - url(r'^gestion/k-fet/', include('kfet.urls')), - url(r'^gestion/cms/', include(wagtailadmin_urls)), - url(r'^gestion/documents/', include(wagtaildocs_urls)), + url(r'^utile_bda/bda_diff$', gestioncof_views.liste_bdadiff), + url(r'^utile_cof/diff_cof$', gestioncof_views.liste_diffcof), + url(r'^utile_bda/bda_revente$', gestioncof_views.liste_bdarevente), + url(r'^k-fet/', include('kfet.urls')), + url(r'^cms/', include(wagtailadmin_urls)), + url(r'^documents/', include(wagtaildocs_urls)), # djconfig - url(r"^gestion/config", gestioncof_views.ConfigUpdate.as_view()), + url(r"^config", gestioncof_views.ConfigUpdate.as_view()), ] if 'debug_toolbar' in settings.INSTALLED_APPS: