Changeset cafab4c

Timestamp:

Jan 8, 2010, 4:49:02 AM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

b0f541c

Parents:

70ce03a

git-author:

Alex Dehnert <adehnert@…> (01/08/10 04:49:02)

git-committer:

Alex Dehnert <adehnert@…> (01/08/10 04:49:02)

Message:

Serve static media

Location:

treasury

Files:

• settings.py (modified) (3 diffs)
• urls.py (modified) (2 diffs)

treasury/settings.py

@@ -2 +2 @@
 import os
 
-APP_ROOT = os.path.dirname(__file__)
+SITE_ROOT = os.path.normpath(os.path.dirname(__file__))
 DEFAULT_DOMAIN = 'mit.edu'
 
@@ -40 +40 @@
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = SITE_ROOT + '/media/'
+print "MEDIA_ROOT='%s'" % (MEDIA_ROOT, )
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
+MEDIA_URL = '/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = '/media/admin/'
 
 # Make this unique, and don't share it with anybody.
@@ -76 +77 @@
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    APP_ROOT + '/templates/',
+    SITE_ROOT + '/templates/',
 )
 

treasury/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
 from django.contrib.auth.views import login
+
+import settings
 
 # Necessary views
@@ -23 +25 @@
     (r'^accounts/login/', login, ),
 )
+
+if settings.DEBUG:
+    from django.views.static import serve
+    _media_url = settings.MEDIA_URL
+    if _media_url.startswith('/'):
+        _media_url = _media_url[1:]
+        urlpatterns += patterns('',
+                                (r'^%s(?P<path>.*)$' % _media_url,
+                                serve,
+                                {'document_root': settings.MEDIA_ROOT}))
+    del(_media_url, serve)