X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/9e81338188b8277ee838ac19a083c552320097ef..2f8f1efa5214444b2e867bde2a6f5297d1f3caea:/sommitrealweird/urls.py diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py index 0a4b5f3..6e7cf99 100644 --- a/sommitrealweird/urls.py +++ b/sommitrealweird/urls.py @@ -2,7 +2,7 @@ from django.conf.urls import include, url from django.conf.urls.static import static import bpcms.views import django.views.static -from settings import MEDIA_ROOT, MEDIA_URL, STATIC_URL +from settings import MEDIA_ROOT, MEDIA_URL, STATIC_ROOT, STATIC_URL from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss from django.contrib import admin @@ -25,7 +25,8 @@ urlpatterns = [ # 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'^admin/', include(admin.site.urls)), + url(r'^static/(?P.*)$', django.views.static.serve, {'document_root': STATIC_ROOT, 'show_indexes': True}), + url(r'^admin/', admin.site.urls), url(r'^blog/', include('blog.urls')), url(r'^photo/', include('photo.urls')), #url(r'^photos/', include('photo.urls')), @@ -33,4 +34,4 @@ urlpatterns = [ url(r'^feeds/rss/blog/', LatestBlogEntriesRss()), url(r'^feeds/blog/', LatestBlogEntries()), url(r'^', include('bpcms.urls')) -] + static(STATIC_URL, document_root=MEDIA_ROOT) +]