From ee2a587738f3e571f4e0e61153061ba6853475eb Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 3 Apr 2012 14:55:27 -0500
Subject: Use https:// links for all internal sites

We already use HTTPS exclusively for wiki, bugs, forums, etc. and we
have it available for our other sites, so link only to the https://
protocol locations when pointing users at other sites.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/download.html | 20 ++++++++++----------
 templates/public/index.html    |  8 ++++----
 templates/public/svn.html      |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'templates/public')

diff --git a/templates/public/download.html b/templates/public/download.html
index a3ff2a37..67c70be1 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -26,7 +26,7 @@
             <ul>
                 <li><a href="https://bugs.archlinux.org/index.php?project=6"
                     title="Arch Linux Bugtracker:Release Engineering">Bug Tracker</a></li>
-                <li><a href="http://mailman.archlinux.org/mailman/listinfo/arch-releng"
+                <li><a href="https://mailman.archlinux.org/mailman/listinfo/arch-releng"
                     title="Arch Linux Release Engineering mailing list">Mailing List</a></li>
             </ul>
         </li>
@@ -35,7 +35,7 @@
     <p><strong>Links and Instructions:</strong></p>
 
     <ul id="download-help">
-        <li><a href="http://www.archlinux.org/iso/{{ version }}/README"
+        <li><a href="https://www.archlinux.org/iso/{{ version }}/README"
             title="Official download instructions">Readme and Instructions</a></li>
         <li><a href="https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
             title="Official Installation Guide">Arch Linux Install Guide</a></li>
@@ -68,13 +68,13 @@
                 <td>
                     Netinstall Image
                 </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-i686.iso.torrent" 
+                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-i686.iso.torrent" 
                         title="Download for i686 architecture">Download</a>
                 </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-x86_64.iso.torrent" 
+                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-x86_64.iso.torrent" 
                     title="Download for x86-64 architecture">Download</a>
                 </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent" 
+                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent" 
                     title="Download for both architectures">Download</a>
                 </td><td class="wrap">
                     Downloads and installs packages versions via FTP for absolute freshness.
@@ -83,13 +83,13 @@
                 <td>
                     Core Image
                 </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent" 
+                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent" 
                     title="Download for i686 architecture">Download</a>
                 </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent" 
+                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent" 
                     title="Download for x86-64 architecture">Download</a>
                 </td><td class="cpu-arch">
-                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent" 
+                    <a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent" 
                     title="Download for both architectures">Download</a>
                 </td><td class="wrap">
                     Core packages are included on the media. Good for basic off-line installation.
@@ -143,9 +143,9 @@
     <p>File integrity checksums for the latest releases can be found below:</p>
 
     <ul>
-        <li><a href="http://www.archlinux.org/iso/{{version}}/sha1sums.txt" 
+        <li><a href="https://www.archlinux.org/iso/{{version}}/sha1sums.txt" 
             title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
-        <li><a href="http://www.archlinux.org/iso/{{version}}/md5sums.txt" 
+        <li><a href="https://www.archlinux.org/iso/{{version}}/md5sums.txt" 
             title="Get the latest MD5 checksums">MD5 checksums</a></li>
     </ul>
 
diff --git a/templates/public/index.html b/templates/public/index.html
index 04c4795d..de77b47f 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -26,7 +26,7 @@
     <p>Our strong community is diverse and helpful, and we pride ourselves
     on the range of skillsets and uses for Arch that stem from it. Please
     check out our <a href="https://bbs.archlinux.org/" title="Arch Forums">forums</a>
-    and <a href="http://mailman.archlinux.org/mailman/listinfo/"
+    and <a href="https://mailman.archlinux.org/mailman/listinfo/"
         title="Arch Mailing Lists">mailing lists</a>
     to get your feet wet.  Also glance through our <a href="https://wiki.archlinux.org/"
         title="Arch Wiki">wiki</a>
@@ -126,11 +126,11 @@
     <h4>Community</h4>
 
     <ul>
-        <li><a href="http://mailman.archlinux.org/mailman/listinfo/"
+        <li><a href="https://mailman.archlinux.org/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
         <li><a href="https://wiki.archlinux.org/index.php/IRC_Channels"
             title="Official and regional IRC communities">IRC Channels</a></li>
-        <li><a href="http://planet.archlinux.org/"
+        <li><a href="https://planet.archlinux.org/"
             title="Arch in the blogosphere">Planet Arch</a></li>
         <li><a href="https://wiki.archlinux.org/index.php/International_Communities"
             title="Arch communities in your native language">International Communities</a></li>
@@ -163,7 +163,7 @@
     <h4>Development</h4>
 
     <ul>
-        <li><a href="http://projects.archlinux.org/"
+        <li><a href="https://projects.archlinux.org/"
             title="Official Arch projects (git)">Projects in Git</a></li>
         <li><a href="{% url 'page-svn' %}"
             title="View SVN entries for packages">SVN Repositories</a></li>
diff --git a/templates/public/svn.html b/templates/public/svn.html
index aedd9a73..0d067098 100644
--- a/templates/public/svn.html
+++ b/templates/public/svn.html
@@ -9,9 +9,9 @@
     </p>
     <p>The SVN repositories have been cloned into git repositories and can be
     viewed via the cgit interface.
-    <a href="http://projects.archlinux.org/svntogit/packages.git/">All
+    <a href="https://projects.archlinux.org/svntogit/packages.git/">All
         packages</a> are available here except for
-    <a href="http://projects.archlinux.org/svntogit/community.git/">community
+    <a href="https://projects.archlinux.org/svntogit/community.git/">community
         and multilib</a> which are available in a different repository.</p>
     <p>
     You can also get individual PKGBUILDs directly from SVN. This can be
-- 
cgit v1.2.3-2-g168b


From ec7130f6ac194ce7ad53d06e3169030b16da6fed Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 7 Apr 2012 14:50:26 -0500
Subject: Allow sorting of lower table on master keys page

Add some styling for sortable pretty2 tables to the CSS, and convert the
header row into a single row since that is all tablesorter seems to
support correctly when assigning styles.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/keys.html | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'templates/public')

diff --git a/templates/public/keys.html b/templates/public/keys.html
index a7c91c43..05524c48 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
 {% load pgp %}
 
 {% block title %}Arch Linux - Master Signing Keys{% endblock %}
@@ -66,17 +67,11 @@
     <table class="pretty2" id="key-status">
         <thead>
             <tr>
-                <th></th>
+                <th>Developer</th>
                 <th>PGP Key</th>
                 {% for key in keys %}
-                <th>{{ key.owner.get_full_name }}</th>
-                {% endfor %}
-            </tr>
-            <tr>
-                <th></th>
-                <th></th>
-                {% for key in keys %}
-                <th>{% pgp_key_link key.pgp_key %}</th>
+                <th>{{ key.owner.get_full_name }}<br/>
+                {% pgp_key_link key.pgp_key %}</th>
                 {% endfor %}
             </tr>
         </thead>
@@ -94,4 +89,14 @@
         </tbody>
     </table>
 </div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $("#key-status").tablesorter({
+        headers: { 1: { sorter: false } }
+    });
+});
+</script>
 {% endblock %}
-- 
cgit v1.2.3-2-g168b