[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit ca6785ed0463c4307c1e5aa38d4ea94a18346e49
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Jul 28 16:37:53 2010 -0400

    Let Django serve static media if we are in DEBUG mode.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/live_studio_www/debug/urls.py b/live_studio_www/debug/urls.py
index 22e51d1..2ed4e93 100644
--- a/live_studio_www/debug/urls.py
+++ b/live_studio_www/debug/urls.py
@@ -1,4 +1,13 @@
+from django.conf import settings
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('live_studio_www.debug.views',
 )
+
+if settings.DEBUG:
+    urlpatterns += patterns('django.views.static',
+        (r'^media/(?P<path>.*)$', 'serve',
+            {'document_root': settings.MEDIA_ROOT}),
+        (r'^(?P<path>favicon.ico|robots\.txt)$', 'serve',
+            {'document_root': settings.MEDIA_ROOT}),
+    )

-- 
live-studio