Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

1 files changed, 23 insertions, 15 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index de132fd0..036f81fe 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -2,6 +2,7 @@
 {% load static from staticfiles %}
 {% load cache %}
 {% load package_extras %}
+{% load todolists %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Hacker Dashboard{% endblock %}
 
@@ -39,7 +40,7 @@
                     <td>{{ pkg.last_update|date }}</td>
                 </tr>
             {% empty %}
-                <tr class="empty"><td colspan="6"><em>No flagged packages to display</em></td></tr>
+                <tr class="empty"><td colspan="7"><em>No flagged packages to display</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
@@ -59,11 +60,11 @@
         <tbody>
             {% for todopkg in todopkgs %}
                 <tr class="{% cycle 'odd' 'even' %}">
-                    <td><a href="{{ todopkg.list.get_absolute_url }}"
-                            title="View todo list: {{ todopkg.list.name }}">{{ todopkg.list.name }}</a></td>
-                    <td>{% pkg_details_link todopkg.pkg %}</td>
-                    <td>{{ todopkg.pkg.repo.name }}</td>
-                    <td>{{ todopkg.pkg.arch.name }}</td>
+                    <td><a href="{{ todopkg.todolist.get_absolute_url }}"
+                            title="View todo list: {{ todopkg.todolist.name }}">{{ todopkg.todolist.name }}</a></td>
+                    <td>{% todopkg_details_link todopkg %}</td>
+                    <td>{{ todopkg.repo.name }}</td>
+                    <td>{{ todopkg.arch.name }}</td>
                     <td>{{ todopkg.pkg.maintainers|join:', ' }}</td>
                 </tr>
             {% empty %}
@@ -90,7 +91,7 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ todo.get_absolute_url }}"
                         title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
-                <td>{{ todo.date_added|date }}</td>
+                <td>{{ todo.created|date }}</td>
                 <td>{{ todo.creator.get_full_name }}</td>
                 <td class="wrap">{{ todo.description|urlize }}</td>
                 <td>{{ todo.pkg_count }}</td>
@@ -194,10 +195,10 @@
                     <td>{{ arch.name }}</td>
                     <td><a href="/packages/?arch={{ arch.name }}"
                             title="View all packages for the {{ arch.name }} architecture">
-                            <strong>{{ arch.packages.count }}</strong> packages</a></td>
+                            <strong>{{ arch.total_ct }}</strong> packages</a></td>
                     <td><a href="/packages/?arch={{ arch.name }}&amp;flagged=Flagged"
                             title="View all flagged packages for the {{ arch.name }} architecture">
-                            <strong>{{ arch.packages.flagged.count }}</strong> packages</a></td>
+                            <strong>{{ arch.flagged_ct }}</strong> packages</a></td>
                 </tr>
             {% endfor %}
         </tbody>
@@ -216,6 +217,7 @@
                 <th class="key">Repository</th>
                 <th># Packages</th>
                 <th># Flagged</th>
+                <th># Maintainers</th>
             </tr>
         </thead>
         <tbody>
@@ -224,10 +226,12 @@
                     <td>{{ repo.name }}</td>
                     <td><a href="/packages/?repo={{ repo.name }}"
                             title="View all packages in the {{ repo.name }} repository">
-                            <strong>{{ repo.packages.count }}</strong> packages</a></td>
+                            <strong>{{ repo.total_ct }}</strong> packages</a></td>
                     <td><a href="/packages/?repo={{ repo.name }}&amp;flagged=Flagged"
                             title="View all flagged packages in the {{ repo.name }} repository">
-                            <strong>{{ repo.packages.flagged.count }}</strong> packages</a></td>
+                            <strong>{{ repo.flagged_ct }}</strong> packages</a></td>
+                    <td><strong>{{ repo.maintainer_ct }}</strong> maintainers</td>
+                </tr>
                 </tr>
             {% endfor %}
         </tbody>
@@ -290,9 +294,10 @@
     </table>
 </div>{# #dash-by-developer #}
 {% endcache %}
+{% endblock %}
 
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% block script_block %}
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
@@ -307,11 +312,14 @@ $(document).ready(function() {
             sortList: [[0,0]],
             headers: { 6: {sorter: false } }
     });
-    $(".dash-stats").tablesorter({
+    var settings = {
         widgets: ['zebra'],
         sortList: [[0,0]],
         headers: { 1: { sorter: 'pkgcount' }, 2: { sorter: 'pkgcount' }, 3: { sorter: 'pkgcount' } }
-    });
+    };
+    $(".dash-stats").not($("#stats-by-maintainer")).tablesorter(settings);
+    settings['sortLocaleCompare'] = true;
+    $("#stats-by-maintainer").tablesorter(settings);
 });
 </script>
 {% endblock %}