summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 19:10:27 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 19:10:27 -0500
commitbcf8f7438278880f092361814bbcd3207d11e937 (patch)
treec9b83fb0770dd17f352673c3ff13b8b13b09a180 /main
parent02fdb37d55ec1158162d4c35c3b43d1bcd4e58fa (diff)
parent024fd1b2843d2abd0094faedfbc49e1d1a21edd0 (diff)
Merge commit '024fd1b' (Remove cdnprefix template tag)
Conflicts: templates/base.html templates/public/art.html templates/public/donate.html templates/public/download.html templates/public/index.html
Diffstat (limited to 'main')
-rw-r--r--main/templatetags/cdn.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py
index b91553ed..f290a524 100644
--- a/main/templatetags/cdn.py
+++ b/main/templatetags/cdn.py
@@ -15,16 +15,4 @@ def jquery():
link = '%sjquery-%s.min.js' % (static_url, version)
return '<script type="text/javascript" src="%s"></script>' % link
-@register.tag
-def cdnprefix(parser, token):
- return CDNPrefixNode()
-
-class CDNPrefixNode(template.Node):
- def render(self, context):
- oncdn = getattr(settings, 'CDN_ENABLED', True)
- if not oncdn:
- return ''
- # if left undefined, same behavior as if CDN is turned off
- return getattr(settings, 'CDN_PATH', '')
-
# vim: set ts=4 sw=4 et: