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

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 75c6a63..6c9c006 100644
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,17 +1,35 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import include, url
+from django.conf.urls.static import static
 from settings import MEDIA_ROOT, MEDIA_URL
+from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from django.contrib import admin
 
 handler404 = 'generic.views.render_404'
 
-urlpatterns = patterns('',
+feeds_dict = {
+    'blog': LatestBlogEntries,
+    }
+
+rssfeeds_dict = {
+    'blog': LatestBlogEntriesRss,
+    }
+
+admin.autodiscover()
+
+urlpatterns = [
     # 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'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
-)
+    url(r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^blog/', include('blog.urls')),
+    url(r'^photo/', include('photo.urls')),
+    #url(r'^photos/', include('photo.urls')),
+    url(r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),
+    url(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
+    url(r'^feeds/blog/', LatestBlogEntries()),
+    url(r'^comments/', include('django.contrib.comments.urls')),
+    url(r'^', include('bpcms.urls'))
+] + static(MEDIA_URL, MEDIA_ROOT)