Clean up photos so that it does 404s

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 3cdfc7f601f00018007fccaaefdc4cf6bc7aaf4d..6c9c00621bbc13a04da8bc5581d79bb6c1e2b5ac 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,16 +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 settings import MEDIA_ROOT, MEDIA_URL

+from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from django.contrib import admin

 
 handler404 = 'generic.views.render_404'
 
 
 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:
     # 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'^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)