From b2cfd30094b07546bbbdd2c83499cfd3d03f2161 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 2 Feb 2012 18:29:35 -0600
Subject: Show the latest flag request on package details if out of date

This only shows up for logged in users, but might be helpful for
developers browsing around the site, especially if they did not receive
the email themselves, or in the case of orphan packages.

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

(limited to 'templates')

diff --git a/templates/packages/details.html b/templates/packages/details.html
index f68aefa3..fd7bea4d 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -161,6 +161,11 @@
             <th>Last Updated:</th>
             <td>{{ pkg.last_update|date }}</td>
         </tr>
+        {% if user.is_authenticated %}{% with pkg.flag_request as flag_request %}{% if flag_request %}<tr>
+            <th>Last Flag Request:</th>
+            <td>From {{ flag_request.who }} on {{ flag_request.created|date }}:<br/>
+                <div class="userdata">{{ flag_request.message|linebreaksbr|default:"{no message}" }}</div></td>
+        </tr>{% endif %}{% endwith %}{% endif %}
     </table>
 
     <div id="metadata">
-- 
cgit v1.2.3-2-g168b


From c3ebf7deae0bb04f1637e9a52e7f9f38d454fec7 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 11 Feb 2012 18:53:23 -0600
Subject: Show current version in todolist details view

This also reorders the columns to be in the same order as package search
for consistency.

Addresses FS#28369.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index d45905e3..8c9361cc 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -31,9 +31,10 @@
     <table id="dev-todo-pkglist" class="results todo-table">
         <thead>
             <tr>
-                <th>Name</th>
                 <th>Arch</th>
-                <th>Repo</th>
+                <th>Repository</th>
+                <th>Name</th>
+                <th>Current Version</th>
                 <th>Maintainers</th>
                 <th>Status</th>
             </tr>
@@ -41,9 +42,14 @@
         <tbody>
             {% for pkg in list.packages %}
             <tr class="{% cycle 'odd' 'even' %}">
-                <td>{% pkg_details_link pkg.pkg %}</td>
                 <td>{{ pkg.pkg.arch.name }}</td>
                 <td>{{ pkg.pkg.repo.name|capfirst }}</td>
+                <td>{% pkg_details_link pkg.pkg %}</td>
+                {% if pkg.pkg.flag_date %}
+                <td><span class="flagged">{{ pkg.pkg.full_version }}</span></td>
+                {% else %}
+                <td>{{ pkg.pkg.full_version }}</td>
+                {% endif %}
                 <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
                 <td>
                     {% if perms.main.change_todolistpkg %}
@@ -71,7 +77,7 @@ $(document).ready(function() {
     $('a.status-link').click(todolist_flag);
     $(".results").tablesorter({
         widgets: ['zebra'],
-        sortList: [[0,0], [1,0]],
+        sortList: [[2,0], [0,0]],
         headers: { 4: { sorter: 'todostatus' } }
     });
 });
-- 
cgit v1.2.3-2-g168b