Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	packages/urls.py
	templates/packages/details.html

2 files changed, 38 insertions, 20 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index 99973f1b..6b50d3a0 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.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.repo.name }}</td>
-                    <td>{{ pkg.pkgver }}</td>
+                    <td>{{ pkg.full_version }}</td>
                     <td>{{ pkg.arch.name }}</td>
                     <td>{{ pkg.flag_date|date }}</td>
                     <td>{{ pkg.last_update|date }}</td>
@@ -115,6 +115,9 @@
         <li><a href="reports/uncompressed-info/">Uncompressed Info Pages</a>:
         Self-explanatory
         (<a href="reports/uncompressed-info/{{ user.username }}/">yours only</a>)</li>
+        <li><a href="reports/badcompression/">Bad Compression</a>:
+        Packages with a compression ratio of less than 10%
+        (<a href="reports/badcompression/{{ user.username }}/">yours only</a>)</li>
         <li><a href="reports/unneeded-orphans/">Unneeded Orphans</a>:
         Packages that have no maintainer and are not required by any other
         package in any repository</li>
@@ -182,10 +185,10 @@
 </div>{# dash-by-arch #}
 {% endcache %}
 
-{% cache 60 dev-dash-by-maintainer %}
-<div id="dash-by-maintainer" class="box">
+{% cache 60 dev-dash-by-developer %}
+<div id="dash-by-developer" class="box">
 
-    <h2>Stats by Maintainer</h2>
+    <h2>Stats by Developer</h2>
 
     {% if perms.main.change_package %}
     <p><a href="/packages/stale_relations/">Look for stale relations</a></p>
@@ -195,17 +198,24 @@
         <thead>
             <tr>
                 <th class="key">Maintainer</th>
-                <th># Packages</th>
+                <th># Maintained</th>
                 <th># Flagged</th>
+                <th># Last Packager</th>
             </tr>
             <tr class="even">
-                <td><em>Orphan</em></td>
+                <td><em>Orphan/Unknown</em></td>
                 <td><a href="/packages/?maintainer=orphan"
                         title="View all orphan packages">
-                        <strong>{{ orphan.package_count }}</strong> packages</a></td>
+                        <strong>{{ orphan.package_count }}</strong> packages</a>
+                </td>
                 <td><a href="/packages/?maintainer=orphan&amp;flagged=Flagged"
                         title="View all flagged orphan packages">
-                        <strong>{{ orphan.flagged_count }}</strong> packages</a></td>
+                        <strong>{{ orphan.flagged_count }}</strong> packages</a>
+                </td>
+                <td><a href="/packages/?packager=unknown"
+                        title="View all packages last updated by unknown">
+                        <strong>{{ orphan.updated_count }}</strong> packages</a>
+                </td>
             </tr>
         </thead>
         <tbody>
@@ -214,15 +224,21 @@
                     <td>{{ maint.get_full_name }}</td>
                     <td><a href="/packages/?maintainer={{ maint.username }}"
                             title="View all packages maintained by {{ maint.get_full_name }}">
-                            <strong>{{ maint.package_count }}</strong> packages</a></td>
+                            <strong>{{ maint.package_count }}</strong> packages</a>
+                    </td>
                     <td><a href="/packages/?maintainer={{ maint.username }}&amp;flagged=Flagged"
                             title="View all flagged packages maintained by {{ maint.get_full_name }}">
-                            <strong>{{ maint.flagged_count }}</strong> packages</a></td>
+                            <strong>{{ maint.flagged_count }}</strong> packages</a>
+                    </td>
+                    <td><a href="/packages/?packager={{ maint.username }}"
+                            title="View all packages last updated by {{ maint.get_full_name }}">
+                            <strong>{{ maint.updated_count }}</strong> packages</a>
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>
     </table>
-</div>{# #dash-by-maintainer #}
+</div>{# #dash-by-developer #}
 {% endcache %}
 
 {% load cdn %}{% jquery %}
@@ -236,9 +252,11 @@ $(document).ready(function() {
         {widgets: ['zebra'], sortList: [[0,0], [1,0]]});
     $("#dash-todo:not(:has(tbody tr.empty))").tablesorter(
             {widgets: ['zebra'], sortList: [[1,1]]});
-    $(".dash-stats").tablesorter(
-        {widgets: ['zebra'], sortList: [[0,0]],
-        headers: { 1: { sorter: 'pkgcount' }, 2: { sorter: 'pkgcount' } } });
+    $(".dash-stats").tablesorter({
+        widgets: ['zebra'],
+        sortList: [[0,0]],
+        headers: { 1: { sorter: 'pkgcount' }, 2: { sorter: 'pkgcount' }, 3: { sorter: 'pkgcount' } }
+    });
 });
 </script>
 {% endblock %}
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index b8deb0bc..8f149a5c 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -5,12 +5,12 @@
 
 {% block content %}
 <div class="box">
-	<h2>{{ title }}{% if maintainer %},
-		maintained by {{ maintainer.get_full_name }}{% endif%}</h2>
-	<p>{{ packages|length }} package{{ packages|pluralize }} found.
-	{% if maintainer %}This report only includes packages maintained by
-	{{ maintainer.get_full_name }} ({{ maintainer.username }}).{% endif %}
-	</p>
+    <h2>{{ title }}{% if maintainer %},
+        maintained by {{ maintainer.get_full_name }}{% endif%}</h2>
+    <p>{{ packages|length }} package{{ packages|pluralize }} found.
+    {% if maintainer %}This report only includes packages maintained by
+    {{ maintainer.get_full_name }} ({{ maintainer.username }}).{% endif %}
+    </p>
     <table class="results">
         <thead>
             <tr>