X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/46647a368631f22e961dfe2fdf9bcc0b64b2d281..4ad54bc9a9429a2c5c288192c663f75ae1e7aad9:/sommitrealweird/urls.py diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py index 6c9c006..0a4b5f3 100644 --- a/sommitrealweird/urls.py +++ b/sommitrealweird/urls.py @@ -1,6 +1,8 @@ from django.conf.urls import include, url 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_URL from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss from django.contrib import admin @@ -21,15 +23,14 @@ urlpatterns = [ # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')), # Uncomment this for admin: - url(r'^$', 'bpcms.views.document_view', {'slug': 'index'}), - url(r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}), + url(r'^$', bpcms.views.document_view, {'slug': 'index'}), + url(r'^media/(?P.*)$', 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')), #url(r'^photos/', include('photo.urls')), - url(r'^css-doc/(?P.*)$', 'bpcms.views.css_view'), + url(r'^css-doc/(?P.*)$', 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) +] + static(STATIC_URL, document_root=MEDIA_ROOT)