diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:01:52 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:01:52 -0300 |
commit | a8b2fc84ba96c83ec1addf89ac04608fbf572705 (patch) | |
tree | 6f54cbe43b8684908f2e80ba311272c06fd0fd08 /main/templatetags | |
parent | 294bf173236610fc8c308f81d8617e7e0d0e4bff (diff) | |
parent | b0bad20756549df5edf726771c8e6869caba6244 (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/base.html
Diffstat (limited to 'main/templatetags')
-rw-r--r-- | main/templatetags/cdn.py | 25 | ||||
-rw-r--r-- | main/templatetags/pgp.py | 19 |
2 files changed, 29 insertions, 15 deletions
diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py index 83ee61fb..c25040c0 100644 --- a/main/templatetags/cdn.py +++ b/main/templatetags/cdn.py @@ -3,21 +3,16 @@ from django.conf import settings register = template.Library() -@register.tag -def jquery(parser, token): - return JQueryNode() - -class JQueryNode(template.Node): - def render(self, context): - prefixes = { False: 'http', True: 'https' } - version = '1.4.3' - oncdn = getattr(settings, 'CDN_ENABLED', True) - if oncdn: - jquery = 'https://ajax.googleapis.com/ajax/libs/jquery/' \ - '%s/jquery.min.js' % version - else: - jquery = '/media/jquery-%s.min.js' % version - return '<script type="text/javascript" src="%s"></script>' % jquery +@register.simple_tag +def jquery(): + version = '1.4.4' + oncdn = getattr(settings, 'CDN_ENABLED', True) + if oncdn: + link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \ + '%s/jquery.min.js' % version + else: + link = '/media/jquery-%s.min.js' % version + return '<script type="text/javascript" src="%s"></script>' % link @register.tag def cdnprefix(parser, token): diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py new file mode 100644 index 00000000..d9126dbd --- /dev/null +++ b/main/templatetags/pgp.py @@ -0,0 +1,19 @@ +from django import template +from django.conf import settings + +register = template.Library() + +@register.simple_tag +def pgp_key_link(key_id): + if not key_id: + return "Unknown" + # Something like 'pgp.mit.edu:11371' + pgp_server = getattr(settings, 'PGP_SERVER', None) + if not pgp_server: + return "0x%s" % key_id + url = 'http://%s/pks/lookup?op=vindex&fingerprint=on&exact=on&search=0x%s' % \ + (pgp_server, key_id) + values = (url, key_id, key_id) + return '<a href="%s" title="PGP key search for 0x%s">0x%s</a>' % values + +# vim: set ts=4 sw=4 et: |