X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/c2e85644c4128b2545fd4bbe0382f4e2e502bd83..e1b491186d911fcdc98b18b4c0031ed65d43fdae:/sommitrealweird/urls.py?ds=sidebyside

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 75c6a63..bcfc7f0 100644
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,17 +1,37 @@
-from django.conf.urls.defaults import *
-from settings import MEDIA_ROOT, MEDIA_URL
+from django.urls import include, re_path
+from django.conf.urls.static import static
+import bpcms.views
+import django.views.static
+from settings import MEDIA_ROOT, MEDIA_URL, STATIC_ROOT, STATIC_URL
+from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from django.contrib import admin
 
 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:
-    (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'^content/$', 'content.views.document_view', {'slug': 'index'}),
-    (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
-)
+    re_path(r'^$', bpcms.views.document_view, {'path': 'index'}),
+    re_path(r'^media/(?P<path>.*)$', django.views.static.serve, {'document_root': MEDIA_ROOT, 'show_indexes': True}),
+    re_path(r'^static/(?P<path>.*)$', django.views.static.serve, {'document_root': STATIC_ROOT, 'show_indexes': True}),
+    re_path(r'^admin/', admin.site.urls),
+    re_path(r'^blog/', include('blog.urls')),
+    re_path(r'^photo/', include('photo.urls')),
+    #url(r'^photos/', include('photo.urls')),
+    re_path(r'^css-doc/(?P<slug>.*)$', bpcms.views.css_view),
+    re_path(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
+    re_path(r'^feeds/blog/', LatestBlogEntries()),
+    re_path(r'^', include('bpcms.urls'))
+]