Merge tag 'release_2012-04-07'

I hate writing tag messages.

Conflicts:
	packages/templatetags/package_extras.py
	templates/packages/flag.html
	templates/packages/flaghelp.html
	templates/public/download.html
	templates/public/index.html
	templates/public/svn.html

1 files changed, 14 insertions, 9 deletions

diff --git a/templates/public/keys.html b/templates/public/keys.html
index f0aa310e..257a16ae 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
 {% load pgp %}
 
 {% block title %}Parabola - Master Signing Keys{% endblock %}
@@ -66,17 +67,11 @@
     <table class="pretty2" id="key-status">
         <thead>
             <tr>
-                <th></th>
+                <th>Developer</th>
                 <th>PGP Key</th>
                 {% for key in keys %}
-                <th>{{ key.owner.get_full_name }}</th>
-                {% endfor %}
-            </tr>
-            <tr>
-                <th></th>
-                <th></th>
-                {% for key in keys %}
-                <th>{% pgp_key_link key.pgp_key %}</th>
+                <th>{{ key.owner.get_full_name }}<br/>
+                {% pgp_key_link key.pgp_key %}</th>
                 {% endfor %}
             </tr>
         </thead>
@@ -94,4 +89,14 @@
         </tbody>
     </table>
 </div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $("#key-status").tablesorter({
+        headers: { 1: { sorter: false } }
+    });
+});
+</script>
 {% endblock %}