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

15 files changed, 161 insertions, 118 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index c32586a6..0442db7e 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -67,6 +67,17 @@
         {% endif %}{% endwith %}
     </div>
 
+    <div itemscope itemtype="http://schema.org/SoftwareApplication">
+    <meta itemprop="name" content="{{ pkg.pkgname|escape }}"/>
+    <meta itemprop="version" content="{{ pkg.full_version|escape }}"/>
+    <meta itemprop="softwareVersion" content="{{ pkg.full_version|escape }}"/>
+    <meta itemprop="fileSize" content="{{ pkg.compressed_size }}"/>
+    <meta itemprop="dateCreated" content="{{ pkg.build_date|date:"Y-m-d" }}"/>
+    <meta itemprop="datePublished" content="{{ pkg.last_update|date:"Y-m-d" }}"/>
+    <meta itemprop="operatingSystem" content="Linux"/>
+    <div style="display:none" itemprop="provider" itemscope itemtype="http://schema.org/Person">
+        <meta itemprop="name" content="{{ pkg.packager.get_full_name|escape }}"/>
+    </div>
     <table id="pkginfo">
         <tr>
             <th>Architecture:</th>
@@ -81,26 +92,26 @@
         {% with pkg.split_packages as splits %}{% if splits %}
         <tr>
             <th>Split Packages:</th>
-            <td class="wrap">{% for s in splits %}{% pkg_details_link s %}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
+            <td class="wrap relatedto">{% for s in splits %}<span class="related">{% pkg_details_link s %}{% if not forloop.last %}, {% endif %}</span>{% endfor %}</td>
         </tr>
         {% endif %}{% endwith %}
         {% else %}
         <tr>
             <th>Base Package:</th>
-            {% if pkg.base_package %}
-            <td>{% pkg_details_link pkg.base_package %}</td>
+            {% with pkg.base_package as base %}{% if base %}
+            <td>{% pkg_details_link base %}</td>
             {% else %}
             <td><a href="../{{ pkg.pkgbase }}/"
                     title="Split package details for {{ pkg.pkgbase }}">{{ pkg.pkgbase }}</a></td>
-            {% endif %}
+            {% endif %}{% endwith %}
         </tr>
         {% endifequal %}
         <tr>
             <th>Description:</th>
-            <td class="wrap">{{ pkg.pkgdesc|default:"" }}</td>
+            <td class="wrap" itemprop="description">{{ pkg.pkgdesc|default:"" }}</td>
         </tr><tr>
             <th>Upstream URL:</th>
-            <td>{% if pkg.url %}<a href="{{ pkg.url }}"
+            <td>{% if pkg.url %}<a itemprop="url" href="{{ pkg.url }}"
                     title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url|url_unquote }}</a>{% endif %}</td>
         </tr><tr>
             <th>License(s):</th>
@@ -115,22 +126,29 @@
             </td>
         </tr>
         {% endif %}{% endwith %}
-        {% with pkg.provides.all as provides %}{% if provides %}
+        {% with pkg.provides.all as all_related %}{% if all_related %}
         <tr>
             <th>Provides:</th>
-            <td class="wrap">{{ provides|join:", " }}</td>
+            <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td>
         </tr>
         {% endif %}{% endwith %}
-        {% with pkg.conflicts.all as conflicts %}{% if conflicts %}
+        {% with pkg.replaces.all as all_related %}{% if all_related %}
+        <tr>
+            <th>Replaces:</th>
+            <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td>
+        </tr>
+        {% endif %}{% endwith %}
+        {% with pkg.conflicts.all as all_related %}{% if all_related %}
         <tr>
             <th>Conflicts:</th>
-            <td class="wrap">{{ conflicts|join:", " }}</td>
+            <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td>
         </tr>
         {% endif %}{% endwith %}
-        {% with pkg.replaces.all as replaces %}{% if replaces %}
+        {% with pkg.reverse_conflicts as rev_conflicts %}{% if rev_conflicts %}
         <tr>
-            <th>Replaces:</th>
-            <td class="wrap">{{ replaces|join:", " }}</td>
+            <th>Reverse Conflicts:</th>
+            <td class="wrap relatedto">{% for conflict in rev_conflicts %}
+                <span class="related">{% pkg_details_link conflict %}{% if not forloop.last %}, {% endif %}</span>{% endfor %}</td>
         </tr>
         {% endif %}{% endwith %}
         <tr>
@@ -160,13 +178,13 @@
             <td>{% with pkg.signer as signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name %}{% else %}Unknown ({% pgp_key_link pkg.signature.key_id %}){% endif %}{% endwith %}</td>
         </tr><tr>
             <th>Signature Date:</th>
-            <td>{{ pkg.signature.datetime|date:"DATETIME_FORMAT" }} UTC</td>
+            <td>{{ pkg.signature.creation_time|date:"DATETIME_FORMAT" }} UTC</td>
         </tr>{% else %}<tr>
             <th>Signed By:</th>
             <td>Unsigned</td>
         </tr>{% endif %}<tr>
             <th>Last Updated:</th>
-            <td>{{ pkg.last_update|date }}</td>
+            <td>{{ pkg.last_update|date:"DATETIME_FORMAT" }} UTC</td>
         </tr>
         {% if user.is_authenticated %}{% with pkg.flag_request as flag_request %}{% if flag_request %}<tr>
             <th>Last Flag Request:</th>
@@ -174,29 +192,27 @@
                 <div class="userdata">{{ flag_request.message|linebreaksbr|default:"{no message}" }}</div></td>
         </tr>{% endif %}{% endwith %}{% endif %}
     </table>
+    </div>
 
     <div id="metadata">
-
         {% with pkg.get_depends as deps %}
         <div id="pkgdeps" class="listing">
             <h3 title="{{ pkg.pkgname }} has the following dependencies">
                 Dependencies ({{deps|length}})</h3>
-            {% if deps %}<ul>
+            {% if deps %}<ul id="pkgdepslist">
                 {% for depend in deps %}{% include "packages/details_depend.html" %}{% endfor %}
             </ul>{% endif %}
         </div>
         {% endwith %}
-
         {% with pkg.get_requiredby as rqdby %}
         <div id="pkgreqs" class="listing">
             <h3 title="Packages that require {{ pkg.pkgname }}">
                 Required By ({{rqdby|length}})</h3>
-            {% if rqdby %}<ul>
+            {% if rqdby %}<ul id="pkgreqslist">
                 {% for req in rqdby %}{% include "packages/details_requiredby.html" %}{% endfor %}
             </ul>{% endif %}
         </div>
         {% endwith %}
-
         <div id="pkgfiles" class="listing">
             <h3 title="Complete list of files contained within this package">
                 Package Contents</h3>
@@ -206,14 +222,19 @@
                     View the file list for {{ pkg.pkgname }}</a></p>
             </div>
         </div>
-
     </div>
-
 </div>
+{% endblock %}
 
+{% block script_block %}
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
-$(document).ready(ajaxifyFiles);
+$(document).ready(function() {
+        ajaxifyFiles();
+        collapseDependsList("#pkgdepslist");
+        collapseDependsList("#pkgreqslist");
+        collapseRelatedTo(".relatedto");
+});
 </script>
 {% endblock %}
diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html
index 8b6e85c9..b89ffbfa 100644
--- a/templates/packages/details_depend.html
+++ b/templates/packages/details_depend.html
@@ -1,16 +1,13 @@
-{% load package_extras %}
-<li>
-{% ifequal depend.pkg None %}
-{% if depend.providers %}
-{{ depend.dep.depname }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span>
-{% else %}
-{{ depend.dep.depname }} <span class="virtual-dep">(virtual)</span>
-{% endif %}
-{% else %}
-{% pkg_details_link depend.pkg %}{{ depend.dep.depvcmp|default:"" }}
-{% if depend.pkg.repo.testing %} <span class="testing-dep">(testing)</span>{% endif %}
-{% if depend.pkg.repo.staging %} <span class="staging-dep">(staging)</span>{% endif %}
-{% endifequal %}
-{% if depend.dep.optional %} <span class="opt-dep">(optional)</span>{% endif %}
-{% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span>{% endif %}
-</li>
+{% load package_extras %}<li>{% ifequal depend.pkg None %}
+{% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span>
+{% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">(virtual)</span>
+{% endif %}{% else %}
+{% pkg_details_link depend.pkg %}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }}
+{% if depend.pkg.repo.testing %} <span class="testing-dep"> (testing)</span>
+{% endif %}{% if depend.pkg.repo.staging %} <span class="staging-dep"> (staging)</span>
+{% endif %}{% endifequal %}
+{% if depend.dep.deptype == 'O' %} <span class="opt-dep"> (optional)</span>
+{% endif %}{% if depend.dep.deptype == 'M' %} <span class="make-dep"> (make)</span>
+{% endif %}{% if depend.dep.deptype == 'C' %} <span class="check-dep"> (check)</span>
+{% endif %}{% if depend.dep.description %} - <span class="dep-desc">{{ depend.dep.description }}</span>
+{% endif %}</li>
diff --git a/templates/packages/details_relatedto.html b/templates/packages/details_relatedto.html
new file mode 100644
index 00000000..e14375d3
--- /dev/null
+++ b/templates/packages/details_relatedto.html
@@ -0,0 +1,2 @@
+{% load package_extras %}{% for related in all_related %}{% with related.get_best_satisfier as best_satisfier %}<span class="related">{% ifequal best_satisfier None %}{{ related.name }}{% else %}{% pkg_details_link best_satisfier %}{% endifequal %}{{ related.comparison|default:"" }}{{ related.version|default:"" }}{% if not forloop.last %}, {% endif %}</span>
+{% endwith %}{% endfor %}
diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html
index c7697289..504a322f 100644
--- a/templates/packages/details_requiredby.html
+++ b/templates/packages/details_requiredby.html
@@ -1,7 +1,8 @@
-{% load package_extras %}
-<li>{% pkg_details_link req.pkg %}
-{% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %}
-{% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
-{% if req.pkg.repo.staging %}<span class="staging-dep">(staging)</span>{% endif %}
-{% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
-</li>
+{% load package_extras %}<li>{% pkg_details_link req.pkg %}
+{% if req.name != pkg.pkgname %}<span class="virtual-dep"> (requires {{ req.name }})</span>
+{% endif %}{% if req.pkg.repo.testing %}<span class="testing-dep"> (testing)</span>
+{% endif %}{% if req.pkg.repo.staging %}<span class="staging-dep"> (staging)</span>
+{% endif %}{% if req.deptype == 'O' %}<span class="opt-dep"> (optional)</span>
+{% endif %}{% if req.deptype == 'M' %}<span class="make-dep"> (make)</span>
+{% endif %}{% if req.deptype == 'C' %}<span class="check-dep"> (check)</span>
+{% endif %}</li>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index 999c1666..d5d782fb 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -5,10 +5,9 @@
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
-{% if differences %}
 <div class="box">
     <h2>Package Differences by Architecture</h2>
-    <div id="differences-filter" class="filter-criteria">
+    <div class="filter-criteria">
         <h3>Select architectures</h3>
         <form id="arch_selector" method="get" action=".">
         <fieldset>
@@ -58,7 +57,6 @@
         </fieldset>
         </form>
     </div>
-    {# TODO some sort of spacing here #}
 
     <table id="table_differences" class="results">
         <thead>
@@ -123,21 +121,22 @@
     </table>
 
 </div>
+{% 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() {
     $('#table_differences').tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
+    $('#table_multilib_differences').tablesorter({widgets: ['zebra'], sortList: [[5, 0]]});
+});
+$(document).ready(function() {
     $('#diff_filter select').change(filter_packages);
     $('#diff_filter input').change(filter_packages);
     $('#criteria_reset').click(filter_packages_reset);
     // fire function on page load to ensure the current form selections take effect
     filter_packages();
-
-    $('#table_multilib_differences').tablesorter({widgets: ['zebra'], sortList: [[5, 0]]});
 });
 </script>
-{% endif %}
 {% endblock %}
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 652dc133..e2987e5f 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -6,9 +6,9 @@
 <div id="pkgdetails" class="box">
 
     <h2>{{ pkg.pkgname }} {{ pkg.full_version }} File List</h2>
-    <div id="metadata"><div id="pkgfiles">
-        <p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p>
-        <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
+    <p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p>
+    <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
+    <div id="metadata"><div id="pkgfilelist">
         {% include "packages/files_list.html" %}
     </div></div>
 
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 59474be1..146e6ade 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -1,25 +1,25 @@
-<!DOCTYPE html>
+{% load static from staticfiles %}<!DOCTYPE html>
 <html lang="en">
     <head>
         <title>Flagging Packages</title>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <style  type="text/css" media="screen, projection">
-            <!--
-                body { background: #eef; color: #444; font-family: sans-serif; }
-                a { color: #07b; text-decoration: none; }
-                a:hover { text-decoration: underline; }
-            -->
+        <link rel="icon" type="image/x-icon" href="{% static "favicon.ico" %}" />
+        <link rel="shortcut icon" type="image/x-icon" href="{% static "favicon.ico" %}" />
+        <style type="text/css" media="screen, projection">
+            body { background: #f6f9fc; color: #222; font-family: sans-serif; }
+            a:link { text-decoration: none; color: #07b; }
+            a:visited { color: #666; }
+            a:hover { text-decoration: underline; color: #666; }
         </style>
     </head>
     <body>
-
         <h3>Flagging Packages</h3>
-
         <p>If you notice that a package is out-of-date (i.e., there is a newer
         <strong>stable</strong> release available), then please notify us by
         using the <strong>Flag</strong> button in the <em>Package Details</em>
         screen.  This will notify the maintainer(s) responsible for that
-        package so they can update it.</p>
+        package so they can update it. If the package is unmaintained, the
+        notification will be sent to a developer mailing list.</p>
 
         <p>The message box portion of the flag utility is optional, and meant
         for short messages only. If you need more than 200 characters for your
@@ -31,6 +31,5 @@
         <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
         package is broken! Use the <a target="_blank" href="{{ BUGTRACKER_URL }}"
             title="{{ BRANDING_DISTRONAME }} Bugtracker">bugtracker</a> instead.</p>
-
     </body>
 </html>
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index 7212c128..c8f4aa5c 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -29,8 +29,10 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% endblock %}
+
+{% block script_block %}
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index 6bb1225a..0004b996 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -1,13 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+{% load static from staticfiles %}<?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>{{BRANDING_DISTRONAME}} Packages</ShortName>
-	<Description>Search the {{BRANDING_DISTRONAME}} package repositories.</Description>
+	<ShortName>{{BRANDING_SHORTNAME}} Packages</ShortName>
+	<LongName>{{BRANDING_DISTRONAME}} Package Repository Search</LongName>
+	<Description>Search the {{BRANDING_DISTRONAME}} package repositories by keyword in package names and descriptions.</Description>
 	<Tags>{{BRANDING_OSEARCH_TAGS}}</Tags>
-	<Image height="16" width="16" type="image/x-icon">{{domain}}/static/favicon.ico</Image>
+	<Image height="16" width="16" type="image/x-icon">{{ domain }}{% static "favicon.ico" %}</Image>
+	<Image height="64" width="64" type="image/png">{{ domain }}{% static "logos/icon-transparent-64x64.png" %}</Image>
 	<Language>en-us</Language>
 	<InputEncoding>UTF-8</InputEncoding>
 	<OutputEncoding>UTF-8</OutputEncoding>
 	<Query role="example" searchTerms="initscripts"/>
-	<Url type="text/html" template="{{domain}}/packages/?q={searchTerms}"/>
-	<Url rel="self" type="application/opensearchdescription+xml" template="{{domain}}/opensearch/packages/"/>
+	<Url type="text/html" template="{{ domain }}/packages/?q={searchTerms}"/>
+	<Url rel="suggestions" type="application/x-suggestions+json"
+		template="{{ domain }}/opensearch/packages/suggest?q={searchTerms}"/>
+	<Url rel="self" type="application/opensearchdescription+xml"
+		template="{{ domain }}/opensearch/packages/"/>
 </OpenSearchDescription>
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
index a7907f25..110634b6 100644
--- a/templates/packages/packages_list.html
+++ b/templates/packages/packages_list.html
@@ -40,8 +40,10 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% endblock %}
+
+{% block script_block %}
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/templates/packages/removed.html b/templates/packages/removed.html
new file mode 100644
index 00000000..2d730130
--- /dev/null
+++ b/templates/packages/removed.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% load package_extras %}
+
+{% block title %}{{ BRANDING_DISTRONAME }} - Not Available - {{ name }} {{ version }} ({{ arch.name }}){% endblock %}
+{% block navbarclass %}anb-packages{% endblock %}
+
+{% block content %}
+<div id="pkg-gone" class="box">
+    <h2>{{ name }} {{ version }} is no longer available</h2>
+
+    <p>{{ name }} {{ version }} has been removed from the [{{ repo.name|lower }}] repository.</p>
+
+    {% if elsewhere %}
+    <p>However, this package or replacements are available elsewhere:</p>
+    <ul>
+        {% for pkg in elsewhere %}
+        <li>{% pkg_details_link pkg %} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li>
+        {% endfor %}
+    </ul>
+    {% else %}
+    <p>Unfortunately, this package cannot be found in any other repositories.
+    Try using the <a href="{% url 'packages-search' %}?name={{ update.pkgname|urlencode }}">package search page</a>,
+    or try <a href="https://aur.archlinux.org/packages.php?K={{ update.pkgname|urlencode }}">searching the AUR</a>
+    to see if the package can be found there.</p>
+    {% endif %}
+</div>
+{% endblock %}
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 5b63dec3..21943a8e 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,13 +1,12 @@
 {% extends "base.html" %}
 {% load package_extras %}
-{% load admin_static %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - Package Database{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block head %}
 {% if is_paginated and page_obj.number > 1 %}<meta name="robots" content="noindex, nofollow"/>{% endif %}
-<link rel="stylesheet" type="text/css" href="{% static "admin/css/widgets.css" %}" />
+<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} Package Updates" href="/feeds/packages/" />
 {% endblock %}
 
 {% block content %}
@@ -18,7 +17,7 @@
     <h3>Package Search</h3>
 
     <form id="pkg-search" method="get" action="/packages/">
-        <p><input type="hidden" name="sort" value="{{sort}}" /></p>
+        <p>{{ search_form.sort }}</p>
         {{ search_form.non_field_errors }}
         <fieldset>
             <legend>Enter search criteria</legend>
@@ -34,15 +33,9 @@
             <div>{{ search_form.maintainer.errors }}
                 <label for="id_maintainer" title="Limit results to a specific maintainer">
                     Maintainer</label>{{ search_form.maintainer}}</div>
-            <div>{{ search_form.last_update.errors }}
-                <label for="id_last_update" title="Limit results to a date after the date entered">
-                    Last Updated After</label>{{ search_form.last_update }}</div>
             <div>{{ search_form.flagged.errors }}
                 <label for="id_flagged" title="Limit results based on out-of-date status">
                     Flagged</label>{{ search_form.flagged }}</div>
-            <div>{{ search_form.limit.errors }}
-                <label for="id_limit" title="Select the number of results to display per page">
-                    Per Page</label>{{ search_form.limit }}</div>
             <div ><label>&nbsp;</label><input title="Search for packages using this criteria"
                 type="submit" value="Search" /></div>
         </fieldset>
@@ -76,8 +69,7 @@
                 </tr>
             </thead>
             <tbody>
-            {% for pkg in package_list %}
-                {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
+                {% for pkg in package_list %}<tr class="{% cycle 'odd' 'even' %}">
                     {% if perms.main.change_package %}
                     <td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
                     {% endif %}
@@ -93,8 +85,7 @@
                     <td class="wrap">{{ pkg.pkgdesc }}</td>
                     <td>{{ pkg.last_update|date }}</td>
                     <td>{{ pkg.flag_date|date }}</td>
-                </tr>
-            {% endspaceless %}{% endfor %}
+                </tr>{% endfor %}
             </tbody>
         </table>
         {% include "packages/search_paginator.html" %}
@@ -121,14 +112,6 @@
     detailed information about packages located in the official supported repositories.
     If you need the sourceball from where a package is built, you can look at our <a
         href="https://repo.parabolagnulinux.org/sources/packages"
-        title="Sourceballed packages">sources repo</a>.</p> </div>
-
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="/jsi18n/"></script>
-<script type="text/javascript">
-	window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";
-	var django = {"jQuery": jQuery};
-</script>
-<script type="text/javascript" src="{% static "admin/js/core.js" %}"></script>
-{{search_form.media}}
+        title="Sourceballed packages">sources repo</a>.</p>
+</div>
 {% endblock %}
diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html
index 362b7cb3..3c368b82 100644
--- a/templates/packages/search_paginator.html
+++ b/templates/packages/search_paginator.html
@@ -1,12 +1,12 @@
 <div class="pkglist-stats">
     {% if is_paginated %}
-    <p>{{paginator.count}} packages found.
-    Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+    <p>{{ paginator.count }} packages found.
+    Page {{ page_obj.number }} of {{ paginator.num_pages }}.</p>
 
     <div class="pkglist-nav">
     <span class="prev">
         {% if page_obj.has_previous %}
-        <a href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
+        <a href="?page={{ page_obj.previous_page_number }}&amp;{{ current_query }}"
             title="Go to previous page">&lt; Prev</a>
         {% else %}
         &lt; Prev
@@ -14,7 +14,7 @@
     </span>
     <span class="next">
         {% if page_obj.has_next %}
-        <a href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
+        <a href="?page={{ page_obj.next_page_number }}&amp;{{ current_query }}"
             title="Go to next page">Next &gt;</a>
         {% else %}
         Next &gt;
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 06298249..a159e998 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -50,9 +50,7 @@
             </tr>
         </thead>
         <tbody id="tbody_signoffs">
-            {% for group in signoff_groups %}
-            <tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }} {{ group.target_repo|lower }}">
-                {% spaceless %}
+            {% for group in signoff_groups %}<tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }} {{ group.target_repo|lower }}">
                 <td>{% pkg_details_link group.package %} {{ group.version }}</td>
                 <td>{{ group.arch.name }}</td>
                 <td>{{ group.target_repo }}</td>
@@ -69,30 +67,35 @@
                 {% endif %}
                 {% endif %}
                 <td>{% include "packages/signoff_cell.html" %}</td>
-                <td class="wrap">{% if not group.default_spec %}{% with group.specification as spec %}{% comment %}
+                <td class="wrap note">{% if not group.default_spec %}{% with group.specification as spec %}{% comment %}
                     {% endcomment %}{% if spec.required != 2 %}Required signoffs: {{ spec.required }}<br/>{% endif %}{% comment %}
                     {% endcomment %}{% if not spec.enabled %}Signoffs are not currently enabled<br/>{% endif %}{% comment %}
                     {% endcomment %}{% if spec.known_bad %}Package is known to be bad<br/>{% endif %}{% comment %}
                     {% endcomment %}{{ spec.comments|default:""|linebreaksbr }}
                 {% endwith %}{% endif %}</td>
-                {% endspaceless %}
-            </tr>
-            {% endfor %}
+            </tr>{% endfor %}
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% endblock %}
+
+{% block script_block %}
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $('a.signoff-link').click(signoff_package);
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0]],
+    $('.results').tablesorter({widgets: ['zebra'], sortList: [[0,0]],
         headers: { 5: { sorter: 'epochdate' }, 7: { sorter: false }, 8: {sorter: false } } });
+});
+$(document).ready(function() {
+    $('a.signoff-link').click(signoff_package);
     $('#signoffs_filter input').change(filter_signoffs);
     $('#criteria_reset').click(filter_signoffs_reset);
     // fire function on page load to ensure the current form selections take effect
     filter_signoffs();
 });
+$(document).ready(function() {
+    collapseNotes('.note');
+});
 </script>
 {% endblock %}
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index 326f7a2b..233b2835 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -107,8 +107,10 @@
     </form>
 
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% endblock %}
+
+{% block script_block %}
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {