summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-10-26 11:22:21 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-10-26 11:22:21 -0400
commitda2751757bc8b6638b6dd6af35d961f05957a105 (patch)
tree4027323ffeef1682067aaf4ade4486a66dde9ced /settings.py
parent817313b03d6990e419e6c922e12572ea71666c9c (diff)
mirror changes from commit '943ef2e8e4'
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py23
1 files changed, 16 insertions, 7 deletions
diff --git a/settings.py b/settings.py
index ed12bbec..362c100b 100644
--- a/settings.py
+++ b/settings.py
@@ -34,11 +34,6 @@ SITE_ID = 1
DATE_FORMAT = 'Y-m-d'
DATETIME_FORMAT = 'Y-m-d H:i'
-# 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/'
-
# Login URL configuration
LOGIN_URL = '/login/'
LOGIN_REDIRECT_URL = '/'
@@ -52,6 +47,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
+ 'django.core.context_processors.static',
'django.contrib.messages.context_processors.messages',
'main.context_processors.secure',
)
@@ -84,6 +80,17 @@ MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'urls'
+# URL to serve static files
+STATIC_URL = '/static/'
+
+# Location to collect static files
+STATIC_ROOT = os.path.join(DEPLOY_PATH, 'collected_static')
+
+# Look for more static files in these locations
+STATICFILES_DIRS = (
+ os.path.join(DEPLOY_PATH, 'sitestatic'),
+)
+
# Configure where messages should reside
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
@@ -100,14 +107,16 @@ INSTALLED_APPS = (
'django.contrib.sitemaps',
'django.contrib.admin',
'django.contrib.markup',
- 'main', # contains shared models and libs
+ 'django.contrib.staticfiles',
+ 'south',
+
+ 'main',
'mirrors',
'news',
'packages',
'todolists',
'devel',
'public',
- 'south', # database migration support
'releng',
)