Merge branch 'master' of ssh://gparabola/parabolaweb

Conflicts:
	local_settings.py.example
	media/archweb.css
	packages/templatetags/package_extras.py
	public/views.py
	templates/packages/details.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/search.html
	templates/public/download.html
	templates/todolists/view.html

31 files changed, 429 insertions, 159 deletions

diff --git a/templates/base.html b/templates/base.html
index ca492281..746c6cf4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,10 +19,10 @@
             <ul id="archnavbarlist">
                 <li id="anb-home"><a href="/" title="Parabola news, packages, projects and more">Home</a></li>
                 <li id="anb-packages"><a href="/packages/" title="Package Database">Packages</a></li>
-                <li id="anb-wiki"><a href="http://wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li>
-                <li id="anb-bugs"><a href="https://bugs.parabolagnulinux.org" title="Issue Tracker">Bugs</a></li>
-                <li id="anb-projects"><a href="https://projects.parabolagnulinux.org" title="Our Code">Projects</a></li>
-                <li id="anb-download"><a href="http://wiki.parabolagnulinux.org/Download" title="Get Parabola">Download</a></li>
+                <li id="anb-wiki"><a href="//wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li>
+                <li id="anb-bugs"><a href="//bugs.parabolagnulinux.org" title="Issue Tracker">Bugs</a></li>
+                <li id="anb-projects"><a href="//projects.parabolagnulinux.org" title="Our Code">Projects</a></li>
+                <li id="anb-download"><a href="//wiki.parabolagnulinux.org/Download" title="Get Parabola">Download</a></li>
             </ul>
         </div>
     </div><!-- #archnavbar -->
@@ -32,14 +32,14 @@
             {% if user.is_authenticated %}
                 <ul>
                     <li><a href="/devel/" title="Developer Dashboard">Dashboard</a></li>
-                    <li><a href="https://projects.parabolagnulinux.org/" title="Git Projects">Projects</a></li>
+                    <li><a href="//projects.parabolagnulinux.org/" title="Git Projects">Projects</a></li>
                     <li><a href="{% url news-list as newsl %}{{ newsl }}" title="Manage news articles">News</a></li>
                     <li><a href="/packages/signoffs/" title="Package signoffs">Signoffs</a></li>
                     <li><a href="/todo/" title="Developer todo lists">Todos</a></li>
                     <li><a href="/packages/differences/" title="Package
                     architecture differences">Architecture Differences</a></li>
                     <li><a
-                    href="http://list.parabolagnulinux.org/pipermail/dev-parabolagnulinux.org/"
+                    href="//lists.parabolagnulinux.org/pipermail/dev/"
                         title="dev mailing list archives">Archives</a></li>
                     <li><a href="/devel/clock/" title="Developer world clocks">Dev Clocks</a></li>
                     {% if user.is_staff %}
diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index cbf4b834..2eafd529 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -45,7 +45,7 @@
 <script type="text/javascript">
 $(document).ready(function() {
     $("#clocks-table:has(tbody tr)").tablesorter(
-        {widgets: ['zebra'], sortList: [[1,0]]});
+        {widgets: ['zebra'], sortList: [[0,0]]});
 });
 </script>
 {% endblock %}
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 08f5ec1b..ad024a34 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -15,8 +15,8 @@
         <thead>
             <tr>
                 <th>Name</th>
-                <th>Repo</th>
                 <th>Version</th>
+                <th>Repo</th>
                 <th>Arch</th>
                 <th>Flagged</th>
                 <th>Last Updated</th>
@@ -26,14 +26,14 @@
             {% for pkg in flagged %}
                 <tr class="{% cycle 'odd' 'even' %}">
                     <td>{% pkg_details_link pkg %}</td>
-                    <td>{{ pkg.repo.name }}</td>
                     <td>{{ pkg.full_version }}</td>
+                    <td>{{ pkg.repo.name }}</td>
                     <td>{{ pkg.arch.name }}</td>
                     <td>{{ pkg.flag_date|date }}</td>
                     <td>{{ pkg.last_update|date }}</td>
                 </tr>
             {% empty %}
-                <tr class="empty"><td colspan="4"><em>No flagged packages to display</em></td></tr>
+                <tr class="empty"><td colspan="6"><em>No flagged packages to display</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
@@ -78,7 +78,6 @@
                 <th>Package Count</th>
                 <th>Incomplete Count</th>
             </tr>
-            </tr>
         </thead>
         <tbody>
             {% for todo in todos %}
@@ -92,7 +91,50 @@
                 <td>{{ todo.incomplete_count }}</td>
             </tr>
             {% empty %}
-            <tr class="empty"><td colspan="3"><em>No package todo lists to display</em></td></tr>
+            <tr class="empty"><td colspan="6"><em>No package todo lists to display</em></td></tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+    <h3>Signoff Status</h3>
+
+    <table id="dash-signoffs" class="results">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Version</th>
+                <th>Arch</th>
+                <th>Target Repo</th>
+                <th>Last Updated</th>
+                <th>Approved</th>
+                <th>Signoffs</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for group in signoffs %}
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td>{% pkg_details_link group.package %}</td>
+                <td>{{ group.version }}</td>
+                <td>{{ group.arch.name }}</td>
+                <td>{{ group.target_repo }}</td>
+                <td>{{ group.last_update|date }}</td>
+                {% if group.specification.known_bad %}
+                <td class="approval signoff-bad">Bad</td>
+                {% else %}
+                {% if not group.specification.enabled %}
+                <td class="approval signoff-disabled">Disabled</td>
+                {% else %}
+                <td class="approval signoff-{{ group.approved|yesno }}">{{ group.approved|yesno|capfirst }}</td>
+                {% endif %}
+                {% endif %}
+                <td><ul class="signoff-list">
+                    {% for signoff in group.signoffs %}
+                    <li class="signed-username" title="Signed off by {{ signoff.user }}">{{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}</li>
+                    {% endfor %}
+                </ul></td>
+            </tr>
+            {% empty %}
+            <tr class="empty"><td colspan="7"><em>No packages you maintain or have packaged need signoffs</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
@@ -135,6 +177,7 @@
                 <th class="key">Arch</th>
                 <th># Packages</th>
                 <th># Flagged</th>
+                <th># Signed</th>
             </tr>
         </thead>
         <tbody>
@@ -147,6 +190,8 @@
                     <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>
+
+                    <td><strong>{{ arch.packages.signed.count }}</strong> packages</td>
                 </tr>
             {% endfor %}
         </tbody>
@@ -165,6 +210,7 @@
                 <th class="key">Repository</th>
                 <th># Packages</th>
                 <th># Flagged</th>
+                <th># Signed</th>
             </tr>
         </thead>
         <tbody>
@@ -177,6 +223,7 @@
                     <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>
+                    <td><strong>{{ repo.packages.signed.count }}</strong> packages</td>
                 </tr>
             {% endfor %}
         </tbody>
@@ -251,6 +298,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-signoffs:not(:has(tbody tr.empty))").tablesorter({
+            widgets: ['zebra'],
+            sortList: [[0,0]],
+            headers: { 6: {sorter: false } }
+    });
     $(".dash-stats").tablesorter({
         widgets: ['zebra'],
         sortList: [[0,0]],
diff --git a/templates/devel/profile.html b/templates/devel/profile.html
index b731b3a7..b497a20a 100644
--- a/templates/devel/profile.html
+++ b/templates/devel/profile.html
@@ -6,7 +6,7 @@
 
     <h2>Developer Profile</h2>
 
-    <form id="edit-profile-form" enctype="multipart/form-data" method="post">{% csrf_token %}
+    <form id="edit-profile-form" enctype="multipart/form-data" method="post" action="">{% csrf_token %}
         <p><em>Note:</em> This is the public information shown on the developer
         and/or TU profiles page, so please be appropriate with the information
         you provide here.</p>
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 04fd5758..4570627f 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -16,10 +16,8 @@
         <div id="actionlist">
         <h4>Package Actions</h4>
             <ul class="small">
-                <li>
-                    <a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a> /
-                    <a href="{% bug_report pkg %}" title="Report new bug for {{ pkg.pkgname }}">Add New Bug</a>
-                </li>
+                <li><a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a></li>
+                <li><a href="{% bug_report pkg %}" title="Report bug for {{ pkg.pkgname }}">Report a Bug</a></li>
                 <li><a href="{% flag_unfree pkg %}" title="Report {{ pkg.pkgname }} as unfree">Report as unfree</a></li>
                 <li><a href="{% get_wiki_link pkg %}" title="Search wiki for {{ pkg.pkgname }}">Search Wiki</a></li>
                 {% if pkg.flag_date %}
@@ -41,6 +39,7 @@
                     onclick="return !window.open('/packages/flaghelp/','FlagHelp',
                     'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a></li>
                 {% endif %}
+                <li><a href="{% get_download_link pkg %}" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
             </ul>
 
             {% if perms.main.change_package %}
@@ -104,7 +103,7 @@
         </tr><tr>
             <th>Upstream URL:</th>
             <td>{% if pkg.url %}<a href="{{ pkg.url }}"
-                    title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url }}</a>{% endif %}</td>
+                    title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url|url_unquote }}</a>{% endif %}</td>
         </tr><tr>
             <th>License(s):</th>
             <td>{{ pkg.licenses.all|join:", " }}</td>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index 69c39756..0412f8c2 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -6,6 +6,35 @@
 {% if differences %}
 <div id="differences-filter" class="box filter-criteria">
     <h2>Package Differences by Architecture</h2>
+    <h3>Select architectures</h3>
+    <form id="arch_selector" method="get" action=".">
+    <fieldset>
+        <legend>Select arches</legend>
+        <div><label for="arch_a" title="Architecture A">Architecture A</label>
+             <select name="arch_a" id="arch_a">
+             {% for arch in arches %}
+                 <option
+                 {% if arch == arch_a %}
+                     selected="selected"
+                 {% endif  %}
+                 >{{ arch }}</option>
+             {% endfor %}
+             </select>
+        </div>
+        <div><label for="arch_b" title="Architecture B">Architecture B</label>
+             <select name="arch_b" id="arch_b">
+             {% for arch in arches %}
+                 <option
+                 {% if arch == arch_b %}
+                     selected="selected"
+                 {% endif  %}
+                 >{{ arch }}</option>
+             {% endfor %}
+             </select>
+        </div>
+        <div><label>&nbsp;</label><input type="submit" title="Show difference between selected architectures"></div>
+    </fieldset>
+    </form>
     <h3>Filter Differences View</h3>
     <form id="diff_filter" method="post" action=".">
     <fieldset>
@@ -65,7 +94,7 @@ $(document).ready(function() {
     $('.results').tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
     $('#diff_filter select').change(filter_packages);
     $('#diff_filter input').change(filter_packages);
-    $('#criteria_reset').click(filter_reset);
+    $('#criteria_reset').click(filter_packages_reset);
     // fire function on page load to ensure the current form selections take effect
     filter_packages();
 });
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 149154a6..78a40def 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} - Package File List{% endblock %}
+{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}) - File List{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index f439ca36..27ff73b0 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -1,18 +1,19 @@
 {% extends "base.html" %}
 {% load package_extras %}
 
-{% block title %}Parabola - Flag Package - {{ package.pkgname }}{% endblock %}
+{% block title %}Parabola - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
+{% block head %}<meta name="robots" content="noindex"/>{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div id="pkg-flag" class="box">
-    <h2>Flag Package: {{ package.pkgname }}</h2>
+    <h2>Flag Package: {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }})</h2>
 
     <p>If you notice a package is out-of-date (i.e., there is a newer
     <strong>stable</strong> release available), then please notify us using
     the form below. Do <em>not</em> report bugs via this form!</p>
 
-    <p>Note that all of the following packages will be marked out of date:</p>
+    <p>Note that the following {{ packages|length }} package{{ packages|pluralize }} will be marked out of date:</p>
     <ul>
         {% for pkg in packages %}
         <li>{% pkg_details_link pkg %} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li>
@@ -22,13 +23,13 @@
     <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
     message, then file a bug report, email the maintainer directly, or send
-    an email to the <a href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
+    an email to the <a href="//lists.parabolagnulinux.org/mailman/listinfo/dev"
         title="Visit the dev mailing list">Parabola Development mailing list</a>
     with your additional text.</p>
 
     <p><strong>Note:</strong> Do <em>not</em> use this facility if the
     package is broken! The package will be unflagged and the report will be ignored!
-    <a href="https://bugs.parabolagnulinux.org/" title="Parabola Bugtracker">Use the
+    <a href="//bugs.parabolagnulinux.org/" title="Parabola Bugtracker">Use the
     bugtracker to file a bug</a> instead.</p>
 
     <p>Please confirm your flag request for {{package.pkgname}}:</p>
diff --git a/templates/packages/flag_confirmed.html b/templates/packages/flag_confirmed.html
index cc743dd6..62080d62 100644
--- a/templates/packages/flag_confirmed.html
+++ b/templates/packages/flag_confirmed.html
@@ -1,14 +1,16 @@
 {% extends "base.html" %}
 {% load package_extras %}
 
-{% block title %}Parabola - Package Flagged - {{ package.pkgname }}{% endblock %}
+{% block title %}Parabola - Package Flagged - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
+{% block head %}<meta name="robots" content="noindex"/>{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div id="pkg-flag" class="box">
     <h2>Package Flagged - {{ package.pkgname }}</h2>
 
-    <p>Thank you, the maintainers have been notified the following packages are out-of-date:</p>
+    <p>Thank you, the maintainers have been notified the following
+    {{ packages|length }} package{{ packages|pluralize }} are out-of-date:</p>
     <ul>
         {% for pkg in packages %}
         <li>{% pkg_details_link pkg %} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li>
diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html
index d2328381..f7940cd1 100644
--- a/templates/packages/flagged.html
+++ b/templates/packages/flagged.html
@@ -1,12 +1,13 @@
 {% extends "base.html" %}
 {% load package_extras %}
 
-{% block title %}Parabola - Flag Package - {{ pkg.pkgname }}{% endblock %}
+{% block title %}Parabola - Flag Package - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}){% endblock %}
+{% block head %}<meta name="robots" content="noindex"/>{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div id="pkg-flagged-error" class="box">
-    <h2>Error: Package already flagged</h2>
+    <h2>Package {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}) already flagged</h2>
 
     <p><strong>{{pkg.pkgname}}</strong> has already been flagged out-of-date.</p>
 
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 4a9d1cdf..eac13f83 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -25,13 +25,12 @@
         <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
         message, then file a bug report, email the maintainer directly, or send
-        an email to the <a target="_blank"
-            href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
+        an email to the <a target="_blank" href="//lists.parabolagnulinux.org/mailman/listinfo/dev"
             title="Visit the parabola dev mailing list">parabola mailing list</a>
         with your additional text.</p>
 
         <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
-        package is broken! Use the <a target="_blank" href="https://bugs.parabolagnulinux.org"
+        package is broken! Use the <a target="_blank" href="//bugs.parabolagnulinux.org"
             title="Parabola Bugtracker">bugtracker</a> instead.</p>
 
     </body>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 8bf63a15..bb5c1c8b 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
 {% load package_extras %}
+{% load adminmedia %}
+
 {% block title %}Parabola - Package Database{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block head %}
-<link rel="stylesheet" type="text/css" href="/media/admin_media/css/widgets.css" />
+<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/widgets.css" />
 {% endblock %}
 
 {% block content %}
@@ -104,7 +106,8 @@
                     {% endif %}
                     <td>{{ pkg.arch.name }}</td>
                     <td>{{ pkg.repo.name|capfirst }}</td>
-                    <td>{% pkg_details_link pkg %}</td>
+                    <td><a href="{{ pkg.get_absolute_url }}"
+                            title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                     {% if pkg.flag_date %}
                     <td><span class="flagged">{{ pkg.full_version }}</span></td>
                     {% else %}
@@ -153,21 +156,20 @@
 </div><!-- #pkglist-results -->
 {% else %}
 <div class="box">
-	<p>We couldn't find any packages matching your query. Try searching again
-	using different criteria.</p>
+    <p>We couldn't find any packages matching your query. Try searching again
+    using different criteria.</p>
 </div>
 {% endif %}
 
 <div id="pkglist-about" class="box">
-    <p>You are browsing the Parabola package database. From here you can
-    find 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='http://repo.parabolagnulinux.org/sources/packages'
+    <p>You are browsing the Parabola package database. From here you can find
+    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='//repo.parabolagnulinux.org/sources/packages'
         title='Sourceballed packages'>sources repo</a>.</p> </div>
 
 <script type="text/javascript" src="/jsi18n/"></script>
-{% load adminmedia %}<script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
 <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";</script>
+<script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
 {{search_form.media}}
 {% endblock %}
diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html
new file mode 100644
index 00000000..01a5d58d
--- /dev/null
+++ b/templates/packages/signoff_cell.html
@@ -0,0 +1,25 @@
+{% spaceless %}
+{% if group.signoffs %}
+<ul class="signoff-list">
+    {% for signoff in group.signoffs %}
+    <li class="signed-username" title="Signed off by {{ signoff.user }}">{{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}</li>
+    {% endfor %}
+</ul>
+{% endif %}
+{% if group.user_signed_off %}
+<div>
+    <a class="signoff-link" href="{{ group.package.get_absolute_url }}signoff/revoke/"
+        title="Revoke signoff {{ group.pkgbase }} for {{ group.arch }}">Revoke Signoff</a></div>
+{% else %}
+{% if not group.specification.known_bad and group.specification.enabled %}
+<div>
+    <a class="signoff-link" href="{{ group.package.get_absolute_url }}signoff/"
+        title="Signoff {{ group.pkgbase }} for {{ group.arch }}">Signoff</a></div>
+{% endif %}
+{% endif %}
+{% if user == group.packager or user in group.maintainers %}
+<div>
+    <a class="signoff-options" href="{{ group.package.get_absolute_url }}signoff/options/">Signoff Options</a>
+</div>
+{% endif %}
+{% endspaceless %}
diff --git a/templates/packages/signoff_options.html b/templates/packages/signoff_options.html
new file mode 100644
index 00000000..ee9b8b47
--- /dev/null
+++ b/templates/packages/signoff_options.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block title %}Arch Linux - Package Signoff Options - {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
+{% block head %}<meta name="robots" content="noindex"/>{% endblock %}
+{% block navbarclass %}anb-packages{% endblock %}
+
+{% block content %}
+<div id="signoff-options" class="box">
+    <h2>Package Signoff Options: {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }})</h2>
+    <form id="signoff-options-form" method="post">{% csrf_token %}
+        <fieldset>
+            {{ form.as_p }}
+        </fieldset>
+        <p><label></label> <input title="Set Signoff Options" type="submit" value="Set Signoff Options" /></p>
+    </form>
+
+</div>
+{% endblock %}
diff --git a/templates/packages/signoff_report.txt b/templates/packages/signoff_report.txt
new file mode 100644
index 00000000..046c2f1e
--- /dev/null
+++ b/templates/packages/signoff_report.txt
@@ -0,0 +1,41 @@
+=== {% autoescape off %}Signoff report for [{{ repo|lower }}] ===
+{{ signoffs_url }}
+
+There are currently:
+* {{ new|length }} new package{{ new|length|pluralize }} in last {{ new_hours }} hours
+* {{ bad|length }} known bad package{{ bad|length|pluralize }}
+* {{ disabled|length }} package{{ disabled|length|pluralize }} not accepting signoffs
+* {{ complete|length }} fully signed off package{{ complete|length|pluralize }}
+* {{ incomplete|length }} package{{ incomplete|length|pluralize }} missing signoffs
+* {{ old|length }} package{{ old|length|pluralize }} older than {{ old_days }} days
+
+(Note: the word 'package' as used here refers to packages as grouped by
+pkgbase, architecture, and repository; e.g., one PKGBUILD produces one
+package per architecture, even if it is a split package.)
+
+
+{% if new %}== New packages in [{{ repo|lower}}] in last {{ new_hours }} hours ({{ new|length }} total) ==
+{% for group in new %}
+* {{ group.pkgbase }}-{{ group.version }} ({{ group.arch }}){% endfor %}
+
+{% endif %}{% regroup incomplete by target_repo as by_repo %}{% for target_repo in by_repo %}
+== Incomplete signoffs for [{{ target_repo.grouper|lower }}] ({{ target_repo.list|length }} total) ==
+{% for group in target_repo.list %}
+* {{ group.pkgbase }}-{{ group.version }} ({{ group.arch }})
+    {{ group.completed }}/{{ group.required }} signoffs{% endfor %}
+{% endfor %}
+
+{% if complete %}== Completed signoffs ({{ complete|length }} total) ==
+{% for group in complete %}
+* {{ group.pkgbase }}-{{ group.version }} ({{ group.arch }}){% endfor %}
+
+
+{% endif %}{% if old %}== All packages in [{{ repo|lower }}] for more than {{ old_days }} days ({{ old|length }} total) ==
+{% for group in old %}
+* {{ group.pkgbase }}-{{ group.version }} ({{ group.arch }}), since {{ group.last_update|date }}{% endfor %}
+
+
+{% endif %}== Top five in signoffs in last {{ new_hours }} hours ==
+{% for leader in leaders %}
+{{ forloop.counter }}. {{ leader.user }} - {{ leader.count }} signoffs{% endfor %}
+{% endautoescape %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 4745ff53..c24774a9 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -9,47 +9,71 @@
 
     <h2>Package Signoffs</h2>
 
-    <p>{{ signoff_groups|length }} signoff group{{ signoff_groups|pluralize }} found.
+    <p>{{ signoff_groups|length }} total signoff group{{ signoff_groups|pluralize }} found.
     A "signoff group" consists of packages grouped by pkgbase, architecture, and repository.</p>
 
+    <div class="box filter-criteria">
+        <h3>Filter Displayed Signoffs</h3>
+        <form id="signoffs_filter" method="post" action=".">
+        <fieldset>
+            <legend>Select filter criteria</legend>
+            {% for arch in arches %}
+            <div><label for="id_arch_{{ arch.name }}" title="Architecture {{ arch.name }}">Arch {{ arch.name }}</label>
+                <input type="checkbox" name="arch_{{ arch.name }}" id="id_arch_{{ arch.name }}" class="arch_filter" value="{{ arch.name }}" checked="checked"/></div>
+            {% endfor %}
+            {% for repo_name in repo_names %}
+            <div><label for="id_repo_{{ repo_name|lower }}" title="Target Repository {{ repo_name }}">[{{ repo_name|lower }}]</label>
+                <input type="checkbox" name="repo_{{ repo_name|lower }}" id="id_repo_{{ repo_name|lower }}" class="repo_filter" value="{{ repo_name|lower }}" checked="checked"/></div>
+            {% endfor %}
+            <div><label for="id_pending" title="Packages with not enough signoffs">Only Pending Approval</label>
+                <input type="checkbox" name="pending" id="id_pending" value="pending"/></div>
+            <div><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
+            <div class="clear"></div>
+            <div id="filter-info"><span id="filter-count">{{ signoff_groups|length }}</span> signoff groups displayed.</div>
+        </fieldset>
+        </form>
+    </div>
+
     <table id="signoffs" class="results">
         <thead>
             <tr>
+                <th>Package Base/Version</th>
                 <th>Arch</th>
-                <th>Package Base</th>
+                <th>Target Repo</th>
+                <th>Packager</th>
                 <th># of Packages</th>
-                <th>Version</th>
                 <th>Last Updated</th>
-                <th>Target Repo</th>
                 <th>Approved</th>
-                <th>Signoff</th>
+                <th>Signoffs</th>
+                <th>Notes</th>
             </tr>
         </thead>
-        <tbody>
+        <tbody id="tbody_signoffs">
             {% for group in signoff_groups %}
-            {% with group.package as pkg %}
-            <tr class="{% cycle 'odd' 'even' %}">
-                <td>{{ pkg.arch.name }}</td>
-                <td>{% pkg_details_link pkg %}</td>
-                <td>{{ group.packages|length }}</td>
-                <td>{{ pkg.full_version }}</td>
-                <td>{{ pkg.last_update|date }}</td>
+            <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>
-                <td class="signoff-{{ group.approved|yesno }}">
-                    {{ group.approved|yesno|capfirst }}</td>
-                <td>
-                    <ul>
-                        <li><a class="signoff-link" href="{{ pkg.get_absolute_url }}signoff/"
-                            title="Signoff {{ pkg.pkgname }} for {{ pkg.arch }}">Signoff</a>
-                        </li>
-                        {% for signoff in group.signoffs %}
-                        <li class="signed-username" title="Signed off by {{ signoff.user }}">
-                        {{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}</li>
-                        {% endfor %}
-                    </ul>
-                </td>
+                <td>{{ group.packager|default:"Unknown" }}</td>
+                <td>{{ group.packages|length }}</td>
+                <td class="epoch-{{ group.last_update|date:'U' }}">{{ group.last_update|date }}</td>
+                {% if group.specification.known_bad %}
+                <td class="approval signoff-bad">Bad</td>
+                {% else %}
+                {% if not group.specification.enabled %}
+                <td class="approval signoff-disabled">Disabled</td>
+                {% else %}
+                <td class="approval signoff-{{ group.approved|yesno }}">{{ group.approved|yesno|capfirst }}</td>
+                {% endif %}
+                {% endif %}
+                <td>{% include "packages/signoff_cell.html" %}</td>
+                <td class="wrap">{% if not group.default_spec %}{% with group.specification as spec %}
+                    {% if spec.required != 2 %}Required signoffs: {{ spec.required }}<br/>{% endif %}
+                    {% if not spec.enabled %}Signoffs are not currently enabled<br/>{% endif %}
+                    {% if spec.known_bad %}Package is known to be bad<br/>{% endif %}
+                    {{ spec.comments|default:""|linebreaksbr }}
+                {% endwith %}{% endif %}</td>
             </tr>
-            {% endwith %}
             {% endfor %}
         </tbody>
     </table>
@@ -60,8 +84,12 @@
 <script type="text/javascript">
 $(document).ready(function() {
     $('a.signoff-link').click(signoff_package);
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0]],
-        headers: { 6: { sorter: false } } });
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0]],
+        headers: { 5: { sorter: 'epochdate' }, 7: { sorter: false }, 8: {sorter: false } } });
+    $('#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();
 });
 </script>
 {% endblock %}
diff --git a/templates/public/about.html b/templates/public/about.html
index 5c9dc16d..099d5513 100644
--- a/templates/public/about.html
+++ b/templates/public/about.html
@@ -53,9 +53,10 @@
 
         <li>Host repositories. Mirrors are not abundant.</li>
         
-        <li>Take a look at our <a href="http://wiki.parabolagnulinux.org/TODO" title="TODO">TODO list</a></li>
+        <li>Take a look at our <a href="//wiki.parabolagnulinux.org/TODO" title="TODO">TODO list</a></li>
     </ul> 
 
 </div>
+<br /><br />
 {% endblock %}
 
diff --git a/templates/public/art.html b/templates/public/art.html
index 68179f23..3a92b8b4 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -10,7 +10,7 @@
     
     <p>You can help by creating artwork for Parabola GNU/Linux-libre.</p>
 
-    <p>Send your designs to web@list.parabolagnulinux.org and state they are CC-by-sa
+    <p>Send your designs to dev@lists.parabolagnulinux.org and state they are CC-by-sa
       or another free culture friendly license.</p>
 
 
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 2abbbfe4..5aa4c6b2 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -4,7 +4,7 @@
     <p>
     {% for dev in dev_list %}
     <a href="#{{ dev.username }}" title="Jump to profile for {{ dev.get_full_name }}">
-        {{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> &nbsp;&nbsp;
+        {{ dev.first_name }} {{ dev.last_name }}</a> &nbsp;&nbsp;
     {% endfor %}
     </p>
 </div>
@@ -21,7 +21,7 @@
             <table class="bio bio-{{ dev.username }}" cellspacing="0">
                 <tr>
                     <th>Name:</th>
-                    <td>{{ dev.get_full_name }}</td>
+                    <td>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}</td>
                 </tr><tr>
                     <th>Alias:</th>
                     <td>{{ prof.alias }}</td>
diff --git a/templates/public/donate.html b/templates/public/donate.html
index ef7f252d..c6e055f5 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -18,7 +18,7 @@
     anything, because we are a really small community of hackers.</p>
 
     <p>If you want, we have a pretty nice <a
-        href='http://wiki.parabolagnulinux.org/TODO' title='The TODO
+        href='//wiki.parabolagnulinux.org/TODO' title='The TODO
         list!'>TODO list</a> you can check to help us by donating some of your
     time. That will be very much appreciated by us :)</p>
 
diff --git a/templates/public/download.html b/templates/public/download.html
index 5c5cf5bd..2e1024b0 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -9,7 +9,7 @@
 
     <h2>Parabola Downloads</h2>
 
-    {% with "2011.09.1" as version %}
+    {% with "2010.12.29" as version %}
     <h3>Release Info</h3>
 
     <p>All available images can be burned to a CD, mounted as an ISO file,
@@ -19,18 +19,18 @@
 
     <ul>
         <li><strong>Current Release:</strong> {{ version }}</li>
-        <li><strong>Included Kernel:</strong> 3.0.3</li>
+        <li><strong>Included Kernel:</strong> 2.6.36.2</li>
         <li><strong>Resources:</strong>
             <ul>
                 <li><a
-                    href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
+                    href="//lists.parabolagnulinux.org/mailman/listinfo/dev"
                     title="Parabola Hackers Discussion List">Mailing List</a></li>
             </ul>
         </li>
         <li><strong>Instructions:</strong>
             <ul>
                 <li><a
-                    href="http://wiki.parabolagnulinux.org/installation_guide"
+                    href="//wiki.parabolagnulinux.org/installation_guide"
                     title="Official Installation Guide">Parabola Install Guide</a>.
                 </li>
             </ul>
@@ -42,7 +42,7 @@
     <p>If you are an Arch user, there is no need to download the ISO
     to update your existing system to Parabola. You can just follow the
     instructions in our wiki to convert your existing Arch system into a free
-    as in freedom one. <a href='http://wiki.parabolagnulinux.org/migration'
+    as in freedom one. <a href='//wiki.parabolagnulinux.org/migration'
         title='Migration Guide'>More here.</a></p>
 
     <h3>BitTorrent Download (recommended)</h3>
@@ -68,12 +68,12 @@
                 </td>
 
                 <td class="cpu-arch">
-                    <a href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-netinstall-i686.iso.torrent" 
+                    <a href="//repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-netinstall-i686.iso.torrent" 
                         title="Download for i686 architecture">Download</a>
                 </td>
 
                 <td class="cpu-arch">
-                    <a href="http://repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-netinstall-x86_64.iso.torrent" 
+                    <a href="//repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-netinstall-x86_64.iso.torrent" 
                     title="Download for x86-64 architecture">Download</a>
                 </td>
 
@@ -90,35 +90,22 @@
                 <td class="wrap">
                     Downloads and installs packages versions via FTP for absolute freshness.
                 </td>
-            </tr>
-            <tr>
+            </tr><tr>
                 <td>
                     Core Image
-                </td>
-
-                <td class="cpu-arch">
-                    <a href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.iso.torrent" 
+                </td><td class="cpu-arch">
+                    <a href="//repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.iso.torrent" 
                     title="Download for i686 architecture">Download</a>
-                </td>
-                
-                <td class="cpu-arch">
-                    <a href="http://repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-core-x86_64.iso.torrent" 
+                </td><td class="cpu-arch">
+                    <a href="//repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-core-x86_64.iso.torrent" 
                     title="Download for x86-64 architecture">Download</a>
-                </td>
-
-                <td class="magnet-link">
-                    <a
-                        href="magnet:?xt=urn:btih:d9bb9f9641a222d2d302988da95225f570bcdb6d&dn=parabola-2010.12.29-core-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                </td><td class="magnet-link">
+                    <a href="magnet:?xt=urn:btih:d9bb9f9641a222d2d302988da95225f570bcdb6d&dn=parabola-2010.12.29-core-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
                     title="Magnet Link for ISO image">i686 Magnet</a>
-                </td>
-
-                <td class="magnet-link">
-                    <a
-                        href="magnet:?xt=urn:btih:fae6de60f0dfa703165e94df5a77e9bd607ef4cf&dn=parabola-2010.12.29-core-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                </td><td class="magnet-link">
+                    <a href="magnet:?xt=urn:btih:fae6de60f0dfa703165e94df5a77e9bd607ef4cf&dn=parabola-2010.12.29-core-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
                     title="Magnet Link for ISO image">x86_64 Magnet</a>
-                </td>
-
-                <td class="wrap">
+                </td><td class="wrap">
                     Core packages are included on the media. Good for basic off-line installation.
                 </td>
             </tr>
@@ -132,7 +119,7 @@
     image matches the checksum from the MD5SUMS or SHA256SUMS file in the same
     directory as the image.</p>
 
-    <p><a href='http://repo.parabolagnulinux.org/isos/' title='Parabola ISOs
+    <p><a href='//repo.parabolagnulinux.org/isos/' title='Parabola ISOs
         directory'>Go to the Parabola ISOs directory.</a></p>
 
     {%endwith%}
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index 79e8a1aa..69789150 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -17,10 +17,10 @@
     the Parabola staff.</p>
 
     <p>The <a
-        href="http://wiki.parabolagnulinux.org/feed.php"
+        href="//wiki.parabolagnulinux.org/index.php?title=Special:RecentChanges&feed=atom"
         title="ParabolaWiki Recent Changes feed" class="rss">Parabola Wiki: Recent
         changes feed</a> is also available to track document changes from the
-    <a href="http://wiki.parabolagnulinux.org/" title="Parabola Wiki community
+    <a href="//wiki.parabolagnulinux.org/" title="Parabola Wiki community
         documentation">Parabola Wiki</a>.</p>
 
     <h3>Package Feeds</h3>
diff --git a/templates/public/https.html b/templates/public/https.html
index 7cfe44e9..e53dc8e9 100644
--- a/templates/public/https.html
+++ b/templates/public/https.html
@@ -19,9 +19,8 @@
     <h3>I just want to get the ISOs</h3>
 
     <p>You can proceed to our <a
-    href="http://wiki.parabolagnulinux.org/get">ISOs download page</a> on <a
-    href="http://wiki.parabolagnulinux.org/">our wiki</a> (which isn't secured
-    yet, sadly).</p>
+    href="https://wiki.parabolagnulinux.org/get">ISOs download page</a> on <a
+    href="https://wiki.parabolagnulinux.org/">our wiki</a>.</p>
 
     <h3>I want to do this the right way</h3>
 
diff --git a/templates/public/index.html b/templates/public/index.html
index c68baedb..36bb5484 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -112,38 +112,24 @@
     <h4>Documentation</h4>
 
     <ul>
-        <li><a href="http://wiki.parabolagnulinux.org/"
+        <li><a href="//wiki.parabolagnulinux.org/"
             title="Community documentation">Wiki</a></li>
-        <li><a href="http://wiki.parabolagnulinux.org/installation_guide"
+        <li><a href="//wiki.parabolagnulinux.org/installation_guide"
             title="Parabola Installation Guide">Official Parabola Installation Guide</a></li>
-        <li><a href="http://wiki.parabolagnulinux.org/Migration"
+        <li><a href="//wiki.parabolagnulinux.org/Migration"
             title="Free your Arch instalation">Migration from Archlinux</a></li>
     </ul>
 
     <h4>Community</h4>
 
     <ul>
-        <li>
-            <a href="http://list.parabolagnulinux.org/listinfo.cgi"
-                title="Community and developer mailing lists">Mailing
-                Lists</a>
-        </li>
-
-        <li>
-            <a
-            href="http://list.parabolagnulinux.org/pipermail/dev-parabolagnulinux.org/"
-            title="dev mailing list archives">Dev Archives</a>
-        </li>
-
-        <li>
-            <a href="http://wiki.parabolagnulinux.org/IRC_Channels"
-            title="Official and regional IRC communities">IRC Channels</a>
-        </li>
-
-        <li>
-            <a href="http://identi.ca/group/parabola" title="Parabola at
-                identi.ca">Identi.ca group</a>
-        </li>
+        <li><a href="//lists.parabolagnulinux.org/"
+                title="Community and developer mailing lists">Mailing Lists</a></li>
+        <li><a href="//lists.parabolagnulinux.org/pipermail/dev/"
+            title="dev mailing list archives">Dev Archives</a></li>
+        <li><a href="//wiki.parabolagnulinux.org/IRC_Channels"
+            title="Official and regional IRC communities">IRC Channels</a></li>
+        <li><a href="http://identi.ca/group/parabola" title="Parabola at identi.ca">Identi.ca group</a></li>
     </ul>
 
     <h4>Support</h4>
@@ -162,13 +148,15 @@
     <h4>Development</h4>
 
     <ul>
+        <li><a href="{% url page-keys %}"
+            title="Package/Database signing master keys">Master Keys</a></li>
         <li><a href="/packages/"
             title="View/search the package repository database">Packages</a></li>
         <li><a href="/groups/"
             title="View the available package groups">Package Groups</a></li>
-        <li><a href="https://projects.parabolagnulinux.org"
+        <li><a href="//projects.parabolagnulinux.org"
             title="Official Parabola projects (git)">Projects in Git</a></li>
-        <li><a href="https://bugs.parabolagnulinux.org/"
+        <li><a href="//bugs.parabolagnulinux.org/"
             title="Parabola's Issue Tracker">Issue Tracker</a></li>
         <li><a href="/todolists/"
             title="Hacker Todo Lists">Todo Lists</a></li>
@@ -180,7 +168,7 @@
         <li><a href="{% url page-about %}"
             title="Learn more about Parabola">About Parabola</a></li>
         <li><a href="/download/" title="Get Parabola">Download Parabola</a></li>
-        <li><a href="http://wiki.parabolagnulinux.org/Media"
+        <li><a href="//wiki.parabolagnulinux.org/Media"
             title="Parabola in the media">Media Appearances</a></li>
         <li><a href="{% url page-art %}" title="Parabola logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
         <li><a href="{% url news-list %}" title="News Archives">News Archives</a></li>
diff --git a/templates/public/keys.html b/templates/public/keys.html
new file mode 100644
index 00000000..2e7fcebe
--- /dev/null
+++ b/templates/public/keys.html
@@ -0,0 +1,57 @@
+{% extends "base.html" %}
+{% load pgp %}
+
+{% block title %}Arch Linux - Master Signing Keys{% endblock %}
+
+{% block content %}
+<div id="signing-keys" class="box">
+    <h2>Master Signing Keys</h2>
+
+    <p>This page lists the Arch Linux Master Keys. This is a distributed set of
+    keys that are seen as "official" signing keys of the distribution. Each key
+    is held by a different developer, and a revocation certificate for the key
+    is held by a different developer. Thus, no one developer has absolute hold
+    on any sort of absolute, root trust.</p>
+    <p>The {{ keys|length }} key{{ keys|pluralize }} listed below should be
+    regarded as the current set of master keys. They are available on public
+    keyservers and should be signed by the owner of the key.</p>
+    <p>All official Arch Linux developers and trusted users should have their
+    key signed by at least three of these master keys. This is in accordance
+    with the PGP <em>web of trust</em> concept. If a user is willing to
+    marginally trust all of the master keys, three signatures from different
+    master keys will consider a given developer's key as valid. For more
+    information on trust, please consult the
+    <a href="http://www.gnupg.org/gph/en/manual.html">GNU Privacy Handbook</a>
+    and <a href="http://www.gnupg.org/gph/en/manual.html#AEN385">Using trust to
+    validate keys</a>.</p>
+
+    <table class="pretty2">
+        <thead>
+            <tr>
+                <th>Master Key</th>
+                <th>Full Fingerprint</th>
+                <th>Owner</th>
+                <th>Owner's Signing Key</th>
+                <th>Revoker</th>
+                <th>Revoker's Signing Key</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for key in keys %}
+            <tr>
+                <td>{% pgp_key_link key.pgp_key %}</td>
+                <td>{{ key.pgp_key|pgp_fingerprint }}</td>
+                {% with key.owner.userprofile as owner_profile %}
+                <td><a href="{{ owner_profile.get_absolute_url }}">{{ key.owner.get_full_name }}</a></td>
+                <td>{% pgp_key_link owner_profile.pgp_key %}</td>
+                {% endwith %}
+                {% with key.revoker.userprofile as revoker_profile %}
+                <td><a href="{{ revoker_profile.get_absolute_url }}">{{ key.revoker.get_full_name }}</a></td>
+                <td>{% pgp_key_link revoker_profile.pgp_key %}</td>
+                {% endwith %}
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endblock %}
diff --git a/templates/public/svn.html b/templates/public/svn.html
index 80367eaf..4321f7c2 100644
--- a/templates/public/svn.html
+++ b/templates/public/svn.html
@@ -4,7 +4,7 @@
 <div class="box">
     <h2 class="title">SVN Repositories</h2>
     <p>Parabola doesn't use any SVN repositories. But you can find our <a
-        href="https://projects.parabolagnulinux.org" title="Projects
+        href="//projects.parabolagnulinux.org" title="Projects
         page">Projects</a> on git!
 	</p>
 
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index 66543191..cfb08d80 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -14,7 +14,6 @@
     {% with users as dev_list %}
     {% include 'public/developer_list.html' %}
     {% endwith %}
-
 </div>
 {% endcache %}
 {% endblock %}
diff --git a/templates/releng/add.html b/templates/releng/add.html
index 428812c9..402ceac6 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -6,17 +6,17 @@
 <div class="box">
     <h2>Parabola Releng Testbuild Feedback Entry</h2>
 
-    <p>This page allows you to submit feedback after testing an Parabola
-    installation using a release engineering testbuild. Mark all the
-    options you used during the installation; at the end you can specify
-    whether everything went OK. Be sure to only denote a successful
-    install after having checked the installation properly.  Some options
-    require you to check several things (such as config files), this will
-    be mentioned alongside the option.</p> <p>There is also an overview of
-    all feedback on the <a href="{% url releng-test-overview %}">results
-        page</a>. Once we have builds that are properly tested (enough
-    successful feedback for all important features of the ISO or a
-    slightly earlier ISO), we can release new official media.</p>
+    <p>This page allows you to submit feedback after testing an Parabola installation
+    using a release engineering testbuild.  Mark all the options you used during the
+    installation; at the end you can specify whether everything went OK.  Be
+    sure to only denote a successful install after having checked the
+    installation properly.  Some options require you to check several things (such as
+    config files), this will be mentioned alongside the option.</p>
+    <p>There is also an overview of all feedback on the
+    <a href="{% url releng-test-overview %}">results page</a>.  Once we have
+    builds that are properly tested (enough successful feedback for all
+    important features of the ISO or a slightly earlier ISO), we can release new
+    official media.</p>
 
     <div id="releng-feedback"> <form action="" method="post">{% csrf_token %}
             {{ form.as_p }}
diff --git a/templates/todolists/email_notification.txt b/templates/todolists/email_notification.txt
index 10b50f64..8b22b465 100644
--- a/templates/todolists/email_notification.txt
+++ b/templates/todolists/email_notification.txt
@@ -1,10 +1,11 @@
-{% autoescape off %}The todo list {{ todolist.name }} has had the following packages added to it for which you are a maintainer:
+{% autoescape off %}The todo list "{{ todolist.name }}" has had the following packages added to it for which you are a maintainer:
 
 {% for tpkg in todo_packages %}
 * {{ tpkg.pkg.repo.name|lower }}/{{ tpkg.pkg.pkgname }} ({{ tpkg.pkg.arch.name }}) - {{ tpkg.pkg.get_full_url }}{% endfor %}
 
 Todo list information:
-Creator: {{todolist.creator.get_full_name}}
-Name: {{todolist.name}}
+Name: {{ todolist.name }}
+URL: {{ todolist.get_full_url }}
+Creator: {{ todolist.creator.get_full_name }}
 Description:
-{{todolist.description|striptags|wordwrap:69}}{% endautoescape %}
+{{ todolist.description|striptags|wordwrap:78 }}{% endautoescape %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 5a80684f..d48c362d 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,6 +1,4 @@
 {% extends "base.html" %}
-{% load package_extras %}
-
 {% block title %}Parabola - Todo: {{ list.name }}{% endblock %}
 
 {% block content %}
@@ -29,7 +27,7 @@
                 <th>Name</th>
                 <th>Arch</th>
                 <th>Repo</th>
-                <th>Maintainer</th>
+                <th>Maintainers</th>
                 <th>Status</th>
             </tr>
         </thead>
diff --git a/templates/visualize/index.html b/templates/visualize/index.html
new file mode 100644
index 00000000..99525e69
--- /dev/null
+++ b/templates/visualize/index.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+
+{% block title %}Arch Linux - Visualizations{% endblock %}
+
+{% block content %}
+<div class="box">
+
+    <h2>Visualizations of Packaging Data</h2>
+
+    <h3>Package Treemap</h3>
+
+    <div class="visualize-buttons">
+        <div>
+            <span>Scale Using:</span>
+            <button id="visualize-archrepo-count" class="visualize-archrepo-scaleby active">Package Count</button>
+            <button id="visualize-archrepo-flagged" class="visualize-archrepo-scaleby">Flagged</button>
+            <button id="visualize-archrepo-csize" class="visualize-archrepo-scaleby">Compressed Size</button>
+            <button id="visualize-archrepo-isize" class="visualize-archrepo-scaleby">Installed Size</button>
+        </div>
+        <div>
+            <span>Group By:</span>
+            <button id="visualize-archrepo-repo" class="visualize-archrepo-groupby active">Repository</button>
+            <button id="visualize-archrepo-arch" class="visualize-archrepo-groupby">Architecture</button>
+        </div>
+    </div>
+    <div id="visualize-archrepo" class="visualize-chart"></div>
+</div>
+
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="/media/d3.min.js"></script>
+<script type="text/javascript" src="/media/d3.layout.min.js"></script>
+<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="/media/visualize.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    var orderings = {
+        "repo": { url: "{% url visualize-byrepo %}", color_attr: "repo" },
+        "arch": { url: "{% url visualize-byarch %}", color_attr: "arch" },
+    };
+    packages_treemap("#visualize-archrepo", orderings, "repo");
+});
+</script>
+{% endblock %}