Merge branch 'archweb-generic' into master-nomake

Conflicts:
	templates/public/download.html

2 files changed, 10 insertions, 26 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index b6287110..72f149a3 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -149,31 +149,11 @@
 
     <h3>Developer Reports</h3>
     <ul>
-        <li><a href="reports/old/">Old</a>:
-        Packages last built more than one year ago
-        (<a href="reports/old/{{ user.username }}/">yours only</a>)</li>
-        <li><a href="reports/long-out-of-date/">Long Out-of-date</a>:
-        Packages marked out-of-date more than 90 days ago
-        (<a href="reports/long-out-of-date/{{ user.username }}/">yours only</a>)</li>
-        <li><a href="reports/uncompressed-man/">Uncompressed Manpages</a>:
-        Self-explanatory
-        (<a href="reports/uncompressed-man/{{ user.username }}/">yours only</a>)</li>
-        <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/mismatched-signature/">Mismatched Signatures</a>:
-        Packages where 1) signing key is unknown, 2) signer != packager,
-        or 3) signature timestamp more than 24 hours after build timestamp
-        (<a href="reports/mismatched-signature/{{ user.username }}/">yours only</a>)</li>
-        <li><a href="reports/big/">Big</a>:
-        All packages with compressed size &gt; 50 MiB
-        (<a href="reports/big/{{ 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>
+        {% for report in reports %}
+        <li><a href="reports/{{ report.slug }}/">{{ report.name }}</a>:
+        {{ report.description }}
+        {% if report.personal %}(<a href="reports/{{ report.slug }}/{{ user.username }}/">yours only</a>){% endif %}</li>
+        {% endfor %}
     </ul>
 </div>{# #dev-dashboard #}
 
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index a67553bb..63dd91aa 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -84,10 +84,14 @@ $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra']});
 });
 $(document).ready(function() {
-    var filter_func = function() { filter_pkgs_list('#report_filter', '#dev-report-results tbody'); };
+    var filter_func = function() {
+        filter_pkgs_list('#report_filter', '#dev-report-results tbody');
+        filter_report_save('{{ report.slug }}');
+    };
     $('#report_filter input').change(filter_func);
     $('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); });
     // run on page load to ensure current form selections take effect
+    filter_report_load('{{ report.slug }}');
     filter_func();
 });
 </script>