Merge /home/brettp/sommitrealweird

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 6eb6f423e05b10ac9538d4a209b84d8ef433daec..6106b9f61afdb47f47c7b6f5ca6ef76ba1311f8e 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -24,7 +24,11 @@ urlpatterns = patterns('',
     (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'^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'^comments/', include('django.contrib.comments.urls')),
     (r'^(?:content/|)', include('bpcms.urls'))
 )