From 33b9bf44aac4b70fa4cc6e9d1e82fb556b836801 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 29 Jun 2011 09:17:00 -0500
Subject: Use normal date format on signoffs page

Fixes FS#24949.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/signoffs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/packages/signoffs.html')

diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index b7184039..93be4979 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -27,7 +27,7 @@
                 <td><a href="{{ pkg.get_absolute_url }}"
                         title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                 <td>{{ pkg.full_version }}</td>
-                <td>{{ pkg.last_update }}</td>
+                <td>{{ pkg.last_update|date }}</td>
                 <td>{{ target }}</td>
                 <td class="signoff-{{pkg.approved_for_signoff|yesno}}">
                     {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
-- 
cgit v1.2.3-2-g168b


From 52363933c0b04848a26c8ed65e7f975ccfc5b846 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 6 Jul 2011 11:00:58 -0500
Subject: Initial signoff template changes

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/signoffs.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/packages/signoffs.html')

diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 93be4979..ab00b645 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -3,11 +3,12 @@
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
-{% if packages %}
 <div id="dev-signoffs" class="box">
 
     <h2>Package Signoffs</h2>
 
+    <p>{{ packages|length }} package{{ packages|pluralize }} found.</p>
+
     <table id="signoffs" class="results">
         <thead>
             <tr>
@@ -43,7 +44,7 @@
                     </ul>
                 </td>
             </tr>
-        {% endfor %}
+            {% endfor %}
         </tbody>
     </table>
 </div>
@@ -57,5 +58,4 @@ $(document).ready(function() {
         headers: { 6: { sorter: false } } });
 });
 </script>
-{% endif %}
 {% endblock %}
-- 
cgit v1.2.3-2-g168b


From 0f9a1da2cb9dd2a20a5e12bb346ec460b4335f9f Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 6 Jul 2011 11:08:22 -0500
Subject: Move package signoff URL to more logical location

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/signoffs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/packages/signoffs.html')

diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index ab00b645..b1153d7c 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -34,7 +34,7 @@
                     {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
                 <td>
                     <ul>
-                        <li><a class="signoff-link" href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
+                        <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 %}
-- 
cgit v1.2.3-2-g168b


From f95abca269aec1409ec1e57de4c6cb5ba1da6369 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 6 Jul 2011 12:05:19 -0500
Subject: Refactor code to use new signoff model

This moves signoff creation and display to the new packages.Signoff
model.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/signoffs.html | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'templates/packages/signoffs.html')

diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index b1153d7c..6014396c 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -7,13 +7,15 @@
 
     <h2>Package Signoffs</h2>
 
-    <p>{{ packages|length }} package{{ packages|pluralize }} found.</p>
+    <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>
@@ -22,28 +24,31 @@
             </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|date }}</td>
-                <td>{{ target }}</td>
-                <td class="signoff-{{pkg.approved_for_signoff|yesno}}">
-                    {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</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="{{ pkg.get_absolute_url }}signoff/"
-                            title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a>
+                            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>
+            {% endwith %}
             {% endfor %}
         </tbody>
     </table>
-- 
cgit v1.2.3-2-g168b