Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

3 files changed, 37 insertions, 3 deletions

diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py
index ab5d881a..fc63fdd8 100644
--- a/main/templatetags/cdn.py
+++ b/main/templatetags/cdn.py
@@ -7,7 +7,7 @@ register = template.Library()
 
 @register.simple_tag
 def jquery():
-    version = '1.4.4'
+    version = '1.8.3'
     oncdn = getattr(settings, 'CDN_ENABLED', True)
     if oncdn:
         link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \
@@ -17,4 +17,12 @@ def jquery():
         link = staticfiles_storage.url(filename)
     return '<script type="text/javascript" src="%s"></script>' % link
 
+
+@register.simple_tag
+def jquery_tablesorter():
+    version = '2.7'
+    filename = 'jquery.tablesorter-%s.min.js' % version
+    link = staticfiles_storage.url(filename)
+    return '<script type="text/javascript" src="%s"></script>' % link
+
 # vim: set ts=4 sw=4 et:
diff --git a/main/templatetags/flags.py b/main/templatetags/flags.py
new file mode 100644
index 00000000..22f524ca
--- /dev/null
+++ b/main/templatetags/flags.py
@@ -0,0 +1,13 @@
+from django import template
+
+register = template.Library()
+
+
+@register.simple_tag
+def country_flag(country):
+    if not country:
+        return ''
+    return '<span class="fam-flag fam-flag-%s" title="%s"></span> ' % (
+            country.code.lower(), country.name)
+
+# vim: set ts=4 sw=4 et:
diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py
index 50b1aa17..afad9df2 100644
--- a/main/templatetags/pgp.py
+++ b/main/templatetags/pgp.py
@@ -3,8 +3,11 @@ from django.conf import settings
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
+from devel.models import DeveloperKey
+
 register = template.Library()
 
+
 def format_key(key_id):
     if len(key_id) in (8, 20):
         return u'0x%s' % key_id
@@ -39,7 +42,18 @@ def pgp_key_link(key_id, link_text=None):
     values = (url, format_key(key_id), link_text)
     return '<a href="%s" title="PGP key search for %s">%s</a>' % values
 
-@register.filter
+@register.simple_tag
+def user_pgp_key_link(key_id):
+    normalized = key_id[-16:]
+    try:
+        matching_key = DeveloperKey.objects.select_related(
+                'owner').get(key=normalized, owner_id__isnull=False)
+    except DeveloperKey.DoesNotExist:
+        return pgp_key_link(key_id)
+    return pgp_key_link(key_id, matching_key.owner.get_full_name())
+
+
+@register.filter(needs_autoescape=True)
 def pgp_fingerprint(key_id, autoescape=True):
     if not key_id:
         return u''
@@ -48,7 +62,6 @@ def pgp_fingerprint(key_id, autoescape=True):
     else:
         esc = lambda x: x
     return mark_safe(format_key(esc(key_id)))
-pgp_fingerprint.needs_autoescape = True
 
 
 @register.assignment_tag