Small photo fixes

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 38f78a1a173a99f65e125812002209badc4703e4..23c848ccf6e54de525e676afc63479b51092d6bb 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 from settings import MEDIA_ROOT, MEDIA_URL
 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'
 from django.contrib import admin
 
 handler404 = 'generic.views.render_404'


@@ -9,6 +9,10 @@ feeds_dict = {
     'blog': LatestBlogEntries,
     }
 
     'blog': LatestBlogEntries,
     }
 

+rssfeeds_dict = {
+    'blog': LatestBlogEntriesRss,
+    }
+

 admin.autodiscover()
 
 urlpatterns = patterns('',
 admin.autodiscover()
 
 urlpatterns = patterns('',


@@ -20,6 +24,8 @@ 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'^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'))
 )
     (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
     (r'^(?:content/|)', include('bpcms.urls'))
 )