X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/5d2c22628bbba4eb7ea12a1f5e11bdcc6c866e03..e1b491186d911fcdc98b18b4c0031ed65d43fdae:/sommitrealweird/urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 6c9c006..bcfc7f0 100644
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,6 +1,8 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.conf.urls.static import static
-from settings import MEDIA_ROOT, MEDIA_URL
+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
 
@@ -21,15 +23,15 @@ urlpatterns = [
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
 
     # Uncomment this for admin:
-    url(r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^blog/', include('blog.urls')),
-    url(r'^photo/', include('photo.urls')),
+    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')),
-    url(r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),
-    url(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
-    url(r'^feeds/blog/', LatestBlogEntries()),
-    url(r'^comments/', include('django.contrib.comments.urls')),
-    url(r'^', include('bpcms.urls'))
-] + static(MEDIA_URL, MEDIA_ROOT)
+    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'))
+]