Merge tag 'release_2012-02-11'

Quick release

Conflicts:
	requirements.txt
	requirements_prod.txt

2 files changed, 15 insertions, 4 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 9372a231..fb379df4 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -156,6 +156,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">
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 612f2902..fb06ebdd 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' } }
     });
 });