update django-migdal

[prawokultury.git] / prawokultury / urls.py

diff --git a/prawokultury/urls.py b/prawokultury/urls.py
index 761afeb..848d885 100644 (file)
--- a/prawokultury/urls.py
+++ b/prawokultury/urls.py
@@ -14,23 +14,40 @@ from migdal.urls import urlpatterns as migdal_urlpatterns
 admin.autodiscover()
 
 urlpatterns = patterns('',
 admin.autodiscover()
 
 urlpatterns = patterns('',

-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/', include(admin.site.urls)),

     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'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
+    )
+
+if 'django.contrib.sitemaps' in settings.INSTALLED_APPS:
+    from migdal.sitemap import sitemaps as migdal_sitemaps
+    from questions.sitemap import sitemaps as question_sitemaps
+    sitemaps = dict(migdal_sitemaps.items() + question_sitemaps.items())
+    urlpatterns += patterns('',
+        url(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', {
+            'sitemaps': sitemaps
+        }),

     )
 
 if 'django_cas' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',
         (r'^accounts/login/$', 'django_cas.views.login'),
         (r'^accounts/logout/$', 'django_cas.views.logout'),
     )
 
 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')),
 urlpatterns += i18n_patterns('',
     url(string_concat(r'^', _('events'), r'/'), include('events.urls')),
     url(r'^comments/', include('django_comments_xtd.urls')),

-    url(r'^prawnik/', include('questions.urls')),
+    url(r'^pierwsza-pomoc/', include('questions.urls')),
+    url(string_concat(r'^', _('shop'), r'/'), include('shop.urls')),

 ) + migdal_urlpatterns 
 
 if settings.DEBUG:
 ) + migdal_urlpatterns 
 
 if settings.DEBUG: