Merge branch 'master' of /srv/git/repositories/parabolaweb

11 files changed, 135 insertions, 77 deletions

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 bb03f439..5aa4c6b2 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;
+        {{ dev.first_name }} {{ dev.last_name }}</a> &nbsp;&nbsp;
     {% endfor %}
     </p>
-
 </div>
 
 <table class="arch-bio-entry">
@@ -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>
@@ -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>
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 7c123b3f..2e1024b0 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -9,7 +9,8 @@
 
     <h2>Parabola Downloads</h2>
 
-    {% with "2010.12.29" as version %} <h3>Release Info</h3>
+    {% 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,
     or be directly written to a USB stick using a utility like `dd`. These
@@ -22,14 +23,14 @@
         <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>
@@ -41,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>
@@ -67,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>
 
@@ -89,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>
@@ -131,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 6254d7b0..36bb5484 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -33,17 +33,40 @@
 
 <div id="news">
 
-    <h3>Latest News <span class="more">(<a href="{% url news-list %}"
-                title="Browse the news archives">more</a>)</span></h3>
+    <h3>
+        <a href="{% url news-list %}" title="Browse the news archives">Latest News</a>
+        <span class="arrow"></span>
+    </h3>
 
     <a href="/feeds/news/" title="Parabola News RSS Feed"
         class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
 
     {% for news in news_updates %}
-    <h4><a href="{{ news.get_absolute_url }}"
-            title="View full article: {{ news.title }}">{{ news.title }}</a></h4>
+    {% if forloop.counter0 < 5 %}
+    <h4>
+        <a href="{{ news.get_absolute_url }}"
+            title="View full article: {{ news.title }}">{{ news.title }}</a>
+    </h4>
     <p class="timestamp">{{ news.postdate|date }}</p>
     <div class="article-content">{{ news.content|markdown|truncatewords_html:75 }}</div>
+    {% else %}
+    {% if forloop.counter0 == 5 %}
+    <h3>
+        <a href="{% url news-list %}"
+            title="Browse the news archives">Older News</a>
+        <span class="arrow"></span>
+    </h3>
+    <dl class="newslist">
+    {% endif %}
+        <dt>{{ news.postdate|date }}</dt>
+        <dd>
+            <a href="{{ news.get_absolute_url }}"
+                title="View full article: {{ news.title }}">{{ news.title }}</a>
+        </dd>
+    {% if forloop.last %}
+    </dl>
+    {% endif %}
+    {% endif %}
     {% endfor %}
 
 </div><!-- #news -->
@@ -75,7 +98,7 @@
         {% for update in pkg_updates %}
         <tr>
             <td class="pkg-name"><span class="{{ update.repo|lower }}">{{ update.pkgbase }} {{ update.version }}</span></td>
-			<td class="pkg-arch">
+            <td class="pkg-arch">
                 {% for pkg in update.package_links %}<a href="{{ pkg.get_absolute_url }}"
                     title="Details for {{ pkg.pkgname }} [{{ pkg.repo|lower }}]">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
             </td>
@@ -89,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>
@@ -139,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>
@@ -157,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 %}