X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/2d5a803e2b8bd6ed72de946d4cfbb7b880493bf6..c6b8153c8beeac7c12b8a0cb32143add2b0e1589:/sommitrealweird/urls.py?ds=sidebyside diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py index 8415b54..2aaf73d 100644 --- 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 blog.feeds import LatestBlogEntries +from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss from django.contrib import admin handler404 = 'generic.views.render_404' @@ -9,7 +9,11 @@ feeds_dict = { 'blog': LatestBlogEntries, } -#admin.autodiscover() +rssfeeds_dict = { + 'blog': LatestBlogEntriesRss, + } + +admin.autodiscover() urlpatterns = patterns('', # Example: @@ -18,8 +22,13 @@ urlpatterns = patterns('', # Uncomment this for admin: (r'^$', 'bpcms.views.document_view', {'slug': 'index'}), (r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}), - (r'^admin/(.*)$', admin.site.root), + (r'^admin/', include(admin.site.urls)), (r'^blog/', include('blog.urls')), - (r'^feeds/(?P.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}), + (r'^photo/', include('photo.urls')), + (r'^photos/', include('photo.urls')), + (r'^css-doc/(?P.*)$', 'bpcms.views.css_view'), + (r'^feeds/rss/blog/', LatestBlogEntriesRss()), + (r'^feeds/blog/', LatestBlogEntries()), + (r'^comments/', include('django.contrib.comments.urls')), (r'^(?:content/|)', include('bpcms.urls')) )