From b6ec8519813d821628c744a84f438534a3142ce4 Mon Sep 17 00:00:00 2001
From: g4b <gab@g4b.org>
Date: Wed, 25 Jun 2014 17:14:04 +0200
Subject: [PATCH] adding weltenfall internal serve code to the urls

---
 dj/settings.py | 2 +-
 dj/urls.py     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dj/settings.py b/dj/settings.py
index 104f199..29b0dbd 100644
--- a/dj/settings.py
+++ b/dj/settings.py
@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-
+SERVE_INTERNAL = True
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
diff --git a/dj/urls.py b/dj/urls.py
index 6bf97fa..8133e37 100644
--- a/dj/urls.py
+++ b/dj/urls.py
@@ -11,9 +11,10 @@ urlpatterns = patterns('',
     url(r'^crafting/', 'dj.scon.views.crafting', name='scon_crafting'),
 )
 
-if settings.DEBUG :
+if settings.DEBUG or getattr(settings, 'SERVE_INTERNAL', False):
     urlpatterns += patterns('',
-        (r'^media/(?P<path>.*)$', 'django.views.static.serve', 
-         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-        
+        url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
     )
\ No newline at end of file