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

Conflicts:
	packages/urls.py
	templates/packages/details.html

1 files changed, 19 insertions, 14 deletions

diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 157843ac..53e9e46d 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -3,16 +3,19 @@
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
-{% if packages %}
 <div id="dev-signoffs" class="box">
 
     <h2>Package Signoffs</h2>
 
+    <p>{{ signoff_groups|length }} signoff group{{ signoff_groups|pluralize }} found.
+    A "signoff group" consists of packages grouped by pkgbase, architecture, and repository.</p>
+
     <table id="signoffs" class="results">
         <thead>
             <tr>
                 <th>Arch</th>
-                <th>Package</th>
+                <th>Package Base</th>
+                <th># of Packages</th>
                 <th>Version</th>
                 <th>Last Updated</th>
                 <th>Target Repo</th>
@@ -21,29 +24,32 @@
             </tr>
         </thead>
         <tbody>
-            {% for pkg,target in packages %}
+            {% for group in signoff_groups %}
+            {% with group.package as pkg %}
             <tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ pkg.arch.name }}</td>
                 <td><a href="{{ pkg.get_absolute_url }}"
                         title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
+                <td>{{ group.packages|length }}</td>
                 <td>{{ pkg.full_version }}</td>
-                <td>{{ pkg.last_update }}</td>
-                <td>{{ target }}</td>
-                <td class="signoff-{{pkg.approved_for_signoff|yesno}}">
-                    {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
+                <td>{{ pkg.last_update|date }}</td>
+                <td>{{ group.target_repo }}</td>
+                <td class="signoff-{{group.approved|yesno}}">
+                    {{ group.approved|yesno:"Yes,No" }}</td>
                 <td>
                     <ul>
-                        <li><a class="signoff-link" href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
-                            title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a>
+                        <li><a class="signoff-link" href="{{ pkg.get_absolute_url }}signoff/"
+                            title="Signoff {{ pkg.pkgname }} for {{ pkg.arch }}">Signoff</a>
                         </li>
-                        {% for signoff in pkg.signoffs %}
-                        <li class="signed-username" title="Signed off by {{signoff.packager}}">
-                        {{signoff.packager}}</li>
+                        {% for signoff in group.signoffs %}
+                        <li class="signed-username" title="Signed off by {{ signoff.user }}">
+                        {{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}</li>
                         {% endfor %}
                     </ul>
                 </td>
             </tr>
-        {% endfor %}
+            {% endwith %}
+            {% endfor %}
         </tbody>
     </table>
 </div>
@@ -57,5 +63,4 @@ $(document).ready(function() {
         headers: { 6: { sorter: false } } });
 });
 </script>
-{% endif %}
 {% endblock %}