From a10b6d884f4f102f5216f4b341f35bb341cee176 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 1 Dec 2011 23:55:27 -0500
Subject: Normalize the URI scheme used for inbound links. Don't use one when
 possible, else use https

---
 templates/base.html              | 12 ++++++------
 templates/packages/flag.html     |  2 +-
 templates/packages/flaghelp.html |  4 ++--
 templates/packages/search.html   |  2 +-
 templates/public/about.html      |  2 +-
 templates/public/donate.html     |  2 +-
 templates/public/download.html   | 16 ++++++++--------
 templates/public/feeds.html      |  4 ++--
 templates/public/https.html      |  5 ++---
 templates/public/index.html      | 18 +++++++++---------
 templates/public/svn.html        |  2 +-
 11 files changed, 34 insertions(+), 35 deletions(-)

(limited to 'templates')

diff --git a/templates/base.html b/templates/base.html
index b537c603..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://lists.parabolagnulinux.org/pipermail/dev/"
+                    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/packages/flag.html b/templates/packages/flag.html
index 4bb23b85..ea199618 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -29,7 +29,7 @@ <h2>Flag Package: {{ package.pkgname }} {{ package.full_version }} ({{ package.a
 
     <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/flaghelp.html b/templates/packages/flaghelp.html
index d60018fa..eac13f83 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -25,12 +25,12 @@ <h3>Flagging Packages</h3>
         <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="https://lists.parabolagnulinux.org/mailman/listinfo/dev"
+        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 4a61298e..bb5c1c8b 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -165,7 +165,7 @@ <h3>Package Search</h3>
     <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'
+        href='//repo.parabolagnulinux.org/sources/packages'
         title='Sourceballed packages'>sources repo</a>.</p> </div>
 
 <script type="text/javascript" src="/jsi18n/"></script>
diff --git a/templates/public/about.html b/templates/public/about.html
index a01a33fe..099d5513 100644
--- a/templates/public/about.html
+++ b/templates/public/about.html
@@ -53,7 +53,7 @@ <h3>Participate</h3>
 
         <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>
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 @@ <h3>We don't accept any money donations</h3>
     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 207414dc..2e1024b0 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -23,14 +23,14 @@ <h3>Release Info</h3>
         <li><strong>Resources:</strong>
             <ul>
                 <li><a
-                    href="https://lists.parabolagnulinux.org/mailman/listinfo/dev"
+                    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 @@ <h3>Existing Arch Users</h3>
     <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 @@ <h3>BitTorrent Download (recommended)</h3>
                 </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>
 
@@ -94,10 +94,10 @@ <h3>BitTorrent Download (recommended)</h3>
                 <td>
                     Core Image
                 </td><td class="cpu-arch">
-                    <a href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.iso.torrent" 
+                    <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" 
+                    <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"
@@ -119,7 +119,7 @@ <h3>HTTP/FTP Direct Downloads</h3>
     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 da70e6ee..69789150 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -17,10 +17,10 @@ <h3>News and Activity Feeds</h3>
     the Parabola staff.</p>
 
     <p>The <a
-        href="https://wiki.parabolagnulinux.org/index.php?title=Special:RecentChanges&feed=atom"
+        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 @@ <h2 class="title">Parabola GNU/Linux-libre</h2>
     <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 044b586f..188c572f 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -112,22 +112,22 @@ <h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
     <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://lists.parabolagnulinux.org/"
+        <li><a href="//lists.parabolagnulinux.org/"
                 title="Community and developer mailing lists">Mailing Lists</a></li>
-        <li><a href="https://lists.parabolagnulinux.org/pipermail/dev/"
+        <li><a href="//lists.parabolagnulinux.org/pipermail/dev/"
             title="dev mailing list archives">Dev Archives</a></li>
-        <li><a href="http://wiki.parabolagnulinux.org/IRC_Channels"
+        <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>
@@ -152,9 +152,9 @@ <h4>Development</h4>
             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>
@@ -166,7 +166,7 @@ <h4>About</h4>
         <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/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>
 
-- 
cgit v1.2.3-54-g00ecf