X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/c2e85644c4128b2545fd4bbe0382f4e2e502bd83..2387e5ac0c78d77295e9bc4dc2e66b21889e1a99:/sommitrealweird/urls.py?ds=sidebyside

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 75c6a63..23c848c 100644
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,17 +1,31 @@
 from django.conf.urls.defaults import *
 from settings import MEDIA_ROOT, MEDIA_URL
+from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from django.contrib import admin
 
 handler404 = 'generic.views.render_404'
 
+feeds_dict = {
+    'blog': LatestBlogEntries,
+    }
+
+rssfeeds_dict = {
+    'blog': LatestBlogEntriesRss,
+    }
+
+admin.autodiscover()
+
 urlpatterns = patterns('',
     # Example:
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
 
     # Uncomment this for admin:
-    (r'^$', 'content.views.document_view', {'slug': 'index'}),
-    (r'^admin/', include('django.contrib.admin.urls')),
-    (r'^content/(?P<slug>[^/]+)/$', 'content.views.document_view'),
-    (r'^content/(?P<folders>.*)/(?P<slug>[^/]+)/$', 'content.views.document_view'),
-    (r'^content/$', 'content.views.document_view', {'slug': 'index'}),
+    (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'^blog/', include('blog.urls')),
+    (r'^photo/', include('photo.urls')),
+    (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'^(?:content/|)', include('bpcms.urls'))
 )