From: Radek Czajka Date: Wed, 12 Jun 2013 14:45:02 +0000 (+0200) Subject: casify admin login/logout X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/32692feab80531dda44e6c187923d5a1090c2c81?ds=sidebyside casify admin login/logout --- diff --git a/prawokultury/urls.py b/prawokultury/urls.py index 9525284..e167926 100644 --- a/prawokultury/urls.py +++ b/prawokultury/urls.py @@ -14,8 +14,6 @@ from migdal.urls import urlpatterns as migdal_urlpatterns admin.autodiscover() urlpatterns = patterns('', - url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^admin/', include(admin.site.urls)), url(r'^media/(?P.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, }), @@ -36,8 +34,15 @@ if 'django_cas' in settings.INSTALLED_APPS: urlpatterns += patterns('', (r'^accounts/login/$', 'django_cas.views.login'), (r'^accounts/logout/$', 'django_cas.views.logout'), + (r'^admin/login/$', 'django_cas.views.login'), + (r'^admin/logout/$', 'django_cas.views.logout'), ) +urlpatterns += patterns('', + url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^admin/', include(admin.site.urls)), +) + urlpatterns += i18n_patterns('', url(string_concat(r'^', _('events'), r'/'), include('events.urls')), url(r'^comments/', include('django_comments_xtd.urls')),