X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/bb8272178c6c35fcb92bc5a08342faf40d3fab1b..992930de1234506ede31838a265a776a76e382de:/sommitrealweird/urls.py?ds=inline diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py index b709acc..6106b9f 100644 --- a/sommitrealweird/urls.py +++ b/sommitrealweird/urls.py @@ -1,6 +1,7 @@ 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' @@ -8,6 +9,12 @@ feeds_dict = { 'blog': LatestBlogEntries, } +rssfeeds_dict = { + 'blog': LatestBlogEntriesRss, + } + +admin.autodiscover() + urlpatterns = patterns('', # Example: # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')), @@ -15,9 +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/', include('django.contrib.admin.urls')), + (r'^admin/(.*)$', admin.site.root), (r'^blog/', include('blog.urls')), + (r'^photo/', include('photo.urls')), + (r'^photos/', include('photo.urls')), + (r'^css-doc/(?P.*)$', 'bpcms.views.css_view'), + (r'^feeds/rss/(?P.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': rssfeeds_dict}), (r'^feeds/(?P.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}), - (r'^(?:content/|)(?P[^/]+)/$', 'bpcms.views.document_view'), - (r'^(?:content/|)(?P.*)/(?P[^/]+)/$', 'bpcms.views.document_view'), + (r'^comments/', include('django.contrib.comments.urls')), + (r'^(?:content/|)', include('bpcms.urls')) )