Add charset.

[prawokultury.git] / prawokultury / urls.py

diff --git a/prawokultury/urls.py b/prawokultury/urls.py
index 6da0510..2dcdfb9 100644 (file)
--- 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 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 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()
 
 
 admin.autodiscover()
 


@@ -19,11 +19,20 @@ urlpatterns = patterns('',
     url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
             'document_root': settings.MEDIA_ROOT,
         }),
     url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
             'document_root': settings.MEDIA_ROOT,
         }),

-    url(r'^search/', include('haystack.urls')),
+
+    (r'^accounts/login/$', 'django_cas.views.login'),
+    (r'^accounts/logout/$', 'django_cas.views.logout'),

 ) + i18n_patterns('',
 ) + 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')),
     url(r'^comments/', include('django_comments_xtd.urls')),

-) + migdal_urlpatterns
+    url(r'^contact/', include('contact.urls')),
+) + migdal_urlpatterns 

 
 

+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )

 
 urlpatterns += staticfiles_urlpatterns()
 
 urlpatterns += staticfiles_urlpatterns()