X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/8e82784fa2fe21d9c3828adbf43178a39c7cdea6..99d1ff7fa35876cc362377fd144081646c3c9d7c:/prawokultury/urls.py diff --git a/prawokultury/urls.py b/prawokultury/urls.py index 0d9da8c..2dcdfb9 100644 --- a/prawokultury/urls.py +++ b/prawokultury/urls.py @@ -6,10 +6,10 @@ from django.conf import settings from django.conf.urls import patterns, 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 - +from fnpdjango.utils.urls import i18n_patterns +from events.urls import urlpatterns as events_urlpatterns +from migdal.urls import urlpatterns as migdal_urlpatterns admin.autodiscover() @@ -19,10 +19,14 @@ urlpatterns = patterns('', url(r'^media/(?P.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, }), + + (r'^accounts/login/$', 'django_cas.views.login'), + (r'^accounts/logout/$', 'django_cas.views.logout'), ) + i18n_patterns('', - url(string_concat(r'^', _('events'), r'/'), include('events.urls')), + #url(string_concat(r'^', _('events'), r'/'), include('events.urls')), url(r'^comments/', include('django_comments_xtd.urls')), -) + migdal_urlpatterns + url(r'^contact/', include('contact.urls')), +) + migdal_urlpatterns if settings.DEBUG: urlpatterns += patterns('', @@ -31,4 +35,4 @@ if settings.DEBUG: }), ) -urlpatterns += staticfiles_urlpatterns() \ No newline at end of file +urlpatterns += staticfiles_urlpatterns()