Stop using an array as a cache key

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index b709acced792c93e27330fea820be3f1576d06d8..2aaf73df89820e2b37a9a5ed59d1586c7dde3961 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls.defaults import *
 from settings import MEDIA_ROOT, MEDIA_URL
-from blog.feeds import LatestBlogEntries
+from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from django.contrib import admin
 
 handler404 = 'generic.views.render_404'
 
@@ -8,6 +9,12 @@ feeds_dict = {
     'blog': LatestBlogEntries,
     }
 
+rssfeeds_dict = {
+    'blog': LatestBlogEntriesRss,
+    }
+
+admin.autodiscover()
+
 urlpatterns = patterns('',
     # Example:
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
@@ -15,9 +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}),
-    (r'^admin/', include('django.contrib.admin.urls')),
+    (r'^admin/', include(admin.site.urls)),
     (r'^blog/', include('blog.urls')),
-    (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
-    (r'^(?:content/|)(?P<slug>[^/]+)/$', 'bpcms.views.document_view'),
-    (r'^(?:content/|)(?P<folders>.*)/(?P<slug>[^/]+)/$', 'bpcms.views.document_view'),
+    (r'^photo/', include('photo.urls')),
+    (r'^photos/', include('photo.urls')),
+    (r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),
+    (r'^feeds/rss/blog/', LatestBlogEntriesRss()),
+    (r'^feeds/blog/', LatestBlogEntries()),
+    (r'^comments/', include('django.contrib.comments.urls')),
+    (r'^(?:content/|)', include('bpcms.urls'))
 )