Change to Django 1.3 syntax for admin site

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 23c848ccf6e54de525e676afc63479b51092d6bb..6450746a057fdff162885f3382f7d8d24ce95b54 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -22,10 +22,13 @@ urlpatterns = patterns('',
     # Uncomment this for admin:
     (r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
     (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
     # Uncomment this for admin:
     (r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
     (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),

-    (r'^admin/(.*)$', admin.site.root),
+    (r'^admin/', include(admin.site.urls)),

     (r'^blog/', include('blog.urls')),
     (r'^photo/', include('photo.urls')),
     (r'^blog/', include('blog.urls')),
     (r'^photo/', include('photo.urls')),

+    (r'^photos/', include('photo.urls')),
+    (r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),

     (r'^feeds/rss/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': rssfeeds_dict}),
     (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
     (r'^feeds/rss/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': rssfeeds_dict}),
     (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),

+    (r'^comments/', include('django.contrib.comments.urls')),

     (r'^(?:content/|)', include('bpcms.urls'))
 )
     (r'^(?:content/|)', include('bpcms.urls'))
 )