summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-12-06 06:06:10 +0100
committerDan McGee <dan@archlinux.org>2011-12-06 06:06:10 +0100
commit943ef2e8e436a32ce5dc956c4d855866cd644cc1 (patch)
tree870f68873a61bcceff00e27b692abaef7542c991 /main
parent1c23308299f33e5b429899463eb207f07ad51403 (diff)
downloadarchweb-943ef2e8e436a32ce5dc956c4d855866cd644cc1.tar.gz
archweb-943ef2e8e436a32ce5dc956c4d855866cd644cc1.tar.xz
Convert to and enable staticfiles contrib application
This moves our site static files into the sitestatic directory if they are shared resources, and also moves a handful of things (such as the artwork logos) into application-specific static/ directories. This allows the staticfiles contrib app to work after a few settings tweaks, a run of collectstatic, and massaging the hardcoded '/media/' prefix out of our templates. Django 1.4 is going to make this a lot easier to move things to a CDN and provides better template tags; for now this is setting the stage before we can move to that. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'main')
-rw-r--r--main/templatetags/cdn.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py
index 5cb12fc..b91553e 100644
--- a/main/templatetags/cdn.py
+++ b/main/templatetags/cdn.py
@@ -11,7 +11,8 @@ def jquery():
link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \
'%s/jquery.min.js' % version
else:
- link = '/media/jquery-%s.min.js' % version
+ static_url = getattr(settings, 'STATIC_URL', '/static/')
+ link = '%sjquery-%s.min.js' % (static_url, version)
return '<script type="text/javascript" src="%s"></script>' % link
@register.tag