Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 10 insertions, 8 deletions

diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index 36e0eac7..b7d10264 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -8,11 +8,14 @@
 
     <h2>Package Todo Lists</h2>
 
-    {% if perms.main.add_todolist %}
-    <ul class="admin-actions">
+    {% if perms.todolists.add_todolist %}<ul class="admin-actions">
         <li><a href="/todo/add/" title="Add new todo list">Add Todo List</a></li>
-    </ul>
-    {% endif %}
+    </ul>{% endif %}
+
+    <p>Todo lists are used by the developers when a rebuild of a set of
+    packages is needed. This is common when a library has a version bump,
+    during a toolchain rebuild, or a general cleanup of packages in the
+    repositories. The progress can be tracked here.</p>
 
     <table id="dev-todo-lists" class="results todo-table">
         <thead>
@@ -31,7 +34,7 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ list.get_absolute_url }}"
                         title="View todo list: {{ list.name }}">{{ list.name }}</a></td>
-                <td>{{ list.date_added|date }}</td>
+                <td>{{ list.created|date }}</td>
                 <td>{{ list.creator.get_full_name }}</td>
                 <td class="wrap">{{ list.description|urlize }}</td>
                 <td>{{ list.pkg_count }}</td>
@@ -43,14 +46,13 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     // I'm not sure why it didn't autodetect digit, but it has to be explicit
     // http://stackoverflow.com/questions/302749/jquery-tablesorter-problem
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,1]],
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[6, 1], [1, 1]],
         headers: { 4: { sorter: 'digit' }, 5: { sorter: 'digit' } } });
 });
 </script>