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

[Chris Lamb]

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

    Tidy and split out dir config to settings.defaults.dirs.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/config/settings/defaults/__init__.py b/config/settings/defaults/__init__.py
index 870922c..36b3080 100644
--- a/config/settings/defaults/__init__.py
+++ b/config/settings/defaults/__init__.py
@@ -1,3 +1,4 @@
 from apps import *
+from dirs import *
 from misc import *
 from middleware import *
diff --git a/config/settings/defaults/dirs.py b/config/settings/defaults/dirs.py
new file mode 100644
index 0000000..063790f
--- /dev/null
+++ b/config/settings/defaults/dirs.py
@@ -0,0 +1,11 @@
+from os.path import dirname, join, abspath
+
+LIVE_STUDIO_BASE = dirname(dirname(dirname(dirname(abspath(__file__)))))
+
+TEMPLATE_DIRS = (
+    join(LIVE_STUDIO_BASE, 'templates'),
+)
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = join(LIVE_STUDIO_BASE, 'media')
diff --git a/config/settings/defaults/misc.py b/config/settings/defaults/misc.py
index 5751acf..1b61447 100644
--- a/config/settings/defaults/misc.py
+++ b/config/settings/defaults/misc.py
@@ -1,7 +1,5 @@
 # Django settings for live_studio_www project.
 
-from os.path import dirname, join, abspath
-
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
@@ -39,10 +37,6 @@ SITE_ID = 1
 # to load the internationalization machinery.
 USE_I18N = True
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-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/"
@@ -51,7 +45,7 @@ MEDIA_URL = ''
 # 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 = '/admin/media/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'st3nklmujoic*e63$^7*f6d^0i*zva4^80^65=wm7fbb4a4i$p'
@@ -63,7 +57,3 @@ TEMPLATE_LOADERS = (
 )
 
 ROOT_URLCONF = 'live_studio_www.urls'
-
-TEMPLATE_DIRS = (
-    join(dirname(dirname(dirname(dirname(abspath(__file__))))), 'templates'),
-)

-- 
live-studio