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

Conflicts:
	templates/base.html

3 files changed, 20 insertions, 7 deletions

diff --git a/templates/base.html b/templates/base.html
index d0378567..ca492281 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -20,9 +20,9 @@
                 <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="http://bugs.parabolagnulinux.org" title="Issue Tracker">Bugs</a></li>
-                <li id="anb-projects"><a href="http://projects.parabolagnulinux.org" title="Our Code">Projects</a></li>
-                <li id="anb-download"><a href="{% url page-download as pdl %}{{ pdl }}" title="Get Parabola">Download</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>
             </ul>
         </div>
     </div><!-- #archnavbar -->
@@ -32,7 +32,7 @@
             {% if user.is_authenticated %}
                 <ul>
                     <li><a href="/devel/" title="Developer Dashboard">Dashboard</a></li>
-                    <li><a href="http://projects.parabolagnulinux.org/" title="Git Projects">Projects</a></li>
+                    <li><a href="https://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>
@@ -42,6 +42,9 @@
                     href="http://list.parabolagnulinux.org/pipermail/dev-parabolagnulinux.org/"
                         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 %}
+                    <li><a href="{% url admin:index %}" title="Django Admin Interface">Django Admin</a></li>
+                    {% endif %}
                     <li><a href="/devel/profile/" title="Modify your account profile">Profile</a></li>
                     <li><a href="/logout/" title="Logout of the developer interface">Logout</a></li>
                 </ul>
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 7b728a91..99973f1b 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -106,6 +106,9 @@
         <li><a href="reports/old/">Old</a>:
         Packages last built more than two years 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>
@@ -184,6 +187,10 @@
 
     <h2>Stats by Maintainer</h2>
 
+    {% if perms.main.change_package %}
+    <p><a href="/packages/stale_relations/">Look for stale relations</a></p>
+    {% endif %}
+
     <table id="stats-by-maintainer" class="results dash-stats">
         <thead>
             <tr>
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index bb03f439..2abbbfe4 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -1,12 +1,12 @@
-<div id="arch-bio-toc">
+{% load pgp %}
 
+<div id="arch-bio-toc">
     <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;
     {% endfor %}
     </p>
-
 </div>
 
 <table class="arch-bio-entry">
@@ -32,12 +32,15 @@
                     <th>Other Contact:</th>
                     <td>{{ prof.other_contact }}</td>
                 </tr><tr>
+                    <th>PGP Key:</th>
+                    <td>{% pgp_key_link prof.pgp_key %}</td>
+                </tr><tr>
                     <th>Roles:</th>
                     <td>{{ prof.roles }}<br />
                     </td>
                 </tr><tr>
                     <th>Website:</th>
-                    <td>{% if prof %}<a href="{{ prof.website }}"
+                    <td>{% if prof.website %}<a href="{{ prof.website }}"
                             title="Visit the website for {{ dev.get_full_name }}">
                             {{ prof.website }}</a>{% endif %}</td>
                 </tr><tr>