X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/b1fb752ca1abb051a63da4729e34a80affc25c76..62c6504a2495e2a1d48f7185ab3adb5984916b1c:/prawokultury/urls.py diff --git a/prawokultury/urls.py b/prawokultury/urls.py index 436cb0e..679ac4e 100644 --- a/prawokultury/urls.py +++ b/prawokultury/urls.py @@ -3,33 +3,30 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django.conf import settings -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns -from migdal.helpers import i18n_patterns -from migdal.urls import urlpatterns as migdal_urlpatterns from django.utils.translation import ugettext_lazy as _, string_concat +import django_cas.views +from fnpdjango.utils.urls import i18n_patterns +from migdal.urls import urlpatterns as migdal_urlpatterns -admin.autodiscover() - -urlpatterns = patterns('', +urlpatterns = [ 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, - }), - url(r'^search/', include('haystack.urls')), -) + i18n_patterns('', - url(string_concat(r'^', _('events'), r'/'), include('events.urls')), - url(r'^comments/', include('django_comments_xtd.urls')), -) + migdal_urlpatterns + url(r'^accounts/login/$', django_cas.views.login), + url(r'^accounts/logout/$', django_cas.views.logout), +] + i18n_patterns( + url(r'^contact/', include('contact.urls')), +) + migdal_urlpatterns if settings.DEBUG: - urlpatterns += patterns('', - url(r'^media/(?P.*)$', 'django.views.static.serve', { + import django.views.static + urlpatterns += [ + url(r'^media/(?P.*)$', django.views.static.serve, { 'document_root': settings.MEDIA_ROOT, }), - ) + ] urlpatterns += staticfiles_urlpatterns()