Permalink
Browse files

[bug 740431] Add STATIC_URL to settings and collecstatic to deploy sc…

…ript.

* Leaving ADMIN_MEDIA_PREFIX until we have /static/ set up on prod.
* Add `static` to .gitignore.
  • Loading branch information...
1 parent 42a43d1 commit 1bcb4b6a0a4bb0ec487144f46c6deb34d9640ba6 @rlr committed Mar 29, 2012
Showing with 7 additions and 3 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 scripts/update/deploy.py
  3. +5 −3 settings.py
View
@@ -14,3 +14,4 @@ tmp
locale
docs/_build
highstock.src.js
+static
View
@@ -34,6 +34,7 @@ def update_locales(ctx):
@task
def update_assets(ctx):
with ctx.lcd(settings.SRC_DIR):
+ ctx.local("python2.6 manage.py collectstatic --noinput")
ctx.local("python2.6 manage.py cron get_highcharts")
ctx.local("LANG=en_US.UTF-8 python2.6 manage.py compress_assets")
View
@@ -132,11 +132,12 @@
# Examples: "http://media.lawrence.com", "http://example.com/media/"
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/".
+# TODO: Remove this when we upgrade to django 1.4
ADMIN_MEDIA_PREFIX = '/admin-media/'
+STATIC_ROOT = path('static')
+STATIC_URL = '/static/'
+
# Paths that don't require a locale prefix.
SUPPORTED_NONLOCALES = ('media', 'admin', 'robots.txt', 'services', '1',
'postcrash', 'wafflejs', 'favicon.ico')
@@ -240,6 +241,7 @@
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
+ 'django.contrib.staticfiles',
'django.contrib.admin',
'users',
'tower',

0 comments on commit 1bcb4b6

Please sign in to comment.