Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	templates/devel/clock.html
	templates/packages/group_details.html
	templates/packages/groups.html

3 files changed, 8 insertions, 5 deletions

diff --git a/templates/packages/group_details.html b/templates/packages/group_details.html
index b02a51ce..ee4f61d3 100644
--- a/templates/packages/group_details.html
+++ b/templates/packages/group_details.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Parabola - {{ groupname }} - Group Details{% endblock %}
+{% block title %}Parabola - {{ groupname }} - {{ arch.name }} - Group Details{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index f332e11d..941ec8de 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
-{% block title %}Parabola - Package Groups{% endblock %}
+{% block title %}Parabola - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div class="box">
-    <h2>Package Groups Overview</h2>
+    <h2>Package Groups Overview{% if arch %} - {{ arch }}{% endif %}</h2>
     <table class="results">
         <thead>
             <tr>
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index ec3d274b..a9cce4a8 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -33,7 +33,7 @@
                     {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
                 <td>
                     <ul>
-                        <li><a href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
+                        <li><a class="signoff-link" href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
                             title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a>
                         </li>
                         {% for signoff in pkg.signoffs %}
@@ -49,9 +49,12 @@
 </div>
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="/media/archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0]]});
+    $('a.signoff-link').click(signoff_package);
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0]],
+        headers: { 6: { sorter: false } } });
 });
 </script>
 {% endif %}