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

16 files changed, 44 insertions, 36 deletions

diff --git a/main/fixtures/arches.json b/main/fixtures/arches.json
index 1e9dbc91..f7e7fdc0 100644
--- a/main/fixtures/arches.json
+++ b/main/fixtures/arches.json
@@ -30,5 +30,13 @@
             "agnostic": false,
             "name": "mips64el"
         }
+    },
+    {
+        "pk": 5, 
+        "model": "main.arch", 
+        "fields": {
+            "agnostic": false, 
+            "name": "i586"
+        }
     }
 ]
diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json
index aa826b83..385e321d 100644
--- a/main/fixtures/groups.json
+++ b/main/fixtures/groups.json
@@ -3,7 +3,7 @@
         "pk": 1, 
         "model": "auth.group", 
         "fields": {
-            "name": "Developers", 
+            "name": "Hackers",
             "permissions": [
                 [
                     "change_package", 
diff --git a/media/archnavbar/archnavbar.css b/media/archnavbar/archnavbar.css
index f83b8544..61d2b29b 100644
--- a/media/archnavbar/archnavbar.css
+++ b/media/archnavbar/archnavbar.css
@@ -11,7 +11,7 @@
 
 #archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 50px !important; width: 397px !important; }
 /* and use a proper PNG for all other modern browsers */
-html > body #archnavbarlogo { background: url('parabolabw.png') no-repeat !important; }
+html > body #archnavbarlogo { background: url('parabolabw-sopa.png') no-repeat !important; }
 
 /* move the heading/paragraph text offscreen */
 #archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
diff --git a/media/archnavbar/parabolabw-sopa.png b/media/archnavbar/parabolabw-sopa.png
new file mode 100644
index 00000000..f062e11e
--- /dev/null
+++ b/media/archnavbar/parabolabw-sopa.png
diff --git a/media/archnavbar/parabolabw-sopa.xcf b/media/archnavbar/parabolabw-sopa.xcf
new file mode 100644
index 00000000..0319bf75
--- /dev/null
+++ b/media/archnavbar/parabolabw-sopa.xcf
diff --git a/templates/base.html b/templates/base.html
index 746c6cf4..c6ac73da 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="//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>
+                <li id="anb-wiki"><a href='https://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='https://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="//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>
                     <li><a href="/packages/differences/" title="Package
                     architecture differences">Architecture Differences</a></li>
                     <li><a
-                    href="//lists.parabolagnulinux.org/pipermail/dev/"
+                    href='https://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/mirrors/index.html b/templates/mirrors/index.html
index c77bf44d..43e5ce28 100644
--- a/templates/mirrors/index.html
+++ b/templates/mirrors/index.html
@@ -28,7 +28,7 @@
     <h3>Customized by country mirrorlist</h3>
 
     <p>The following form can generate a custom up-to-date
-    <a href="//wiki.parabolagnulinux.org/Pacman">pacman</a>
+    <a href='https://wiki.parabolagnulinux.org/Pacman">pacman</a>
     mirrorlist based on geography and
     desired protocol(s).  Simply replace the contents of
     <code>/etc/pacman.d/mirrorlist</code> with your generated list.
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 27ff73b0..d1fd2182 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -23,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="//lists.parabolagnulinux.org/mailman/listinfo/dev"
+    an email to the <a href='https://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="//bugs.parabolagnulinux.org/" title="Parabola Bugtracker">Use the
+    <a href='https://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 eac13f83..0bb0c367 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -25,12 +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="//lists.parabolagnulinux.org/mailman/listinfo/dev"
+        an email to the <a target="_blank" href='https://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="//bugs.parabolagnulinux.org"
+        package is broken! Use the <a target="_blank" href='https://bugs.parabolagnulinux.org"
             title="Parabola Bugtracker">bugtracker</a> instead.</p>
 
     </body>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index bb5c1c8b..db838ed3 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -165,7 +165,7 @@
     <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'
+        href='https://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 099d5513..d7941b26 100644
--- a/templates/public/about.html
+++ b/templates/public/about.html
@@ -53,7 +53,7 @@
 
         <li>Host repositories. Mirrors are not abundant.</li>
         
-        <li>Take a look at our <a href="//wiki.parabolagnulinux.org/TODO" title="TODO">TODO list</a></li>
+        <li>Take a look at our <a href='https://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 c6e055f5..775aeba2 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='//wiki.parabolagnulinux.org/TODO' title='The TODO
+        href='https://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 2e1024b0..ea86b14b 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -23,14 +23,14 @@
         <li><strong>Resources:</strong>
             <ul>
                 <li><a
-                    href="//lists.parabolagnulinux.org/mailman/listinfo/dev"
+                    href='https://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="//wiki.parabolagnulinux.org/installation_guide"
+                    href='https://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='//wiki.parabolagnulinux.org/migration'
+    as in freedom one. <a href='https://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="//repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-netinstall-i686.iso.torrent" 
+                    <a href='https://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="//repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-netinstall-x86_64.iso.torrent" 
+                    <a href='https://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 @@
                 <td>
                     Core Image
                 </td><td class="cpu-arch">
-                    <a href="//repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.iso.torrent" 
+                    <a href='https://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="//repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-core-x86_64.iso.torrent" 
+                    <a href='https://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 @@
     image matches the checksum from the MD5SUMS or SHA256SUMS file in the same
     directory as the image.</p>
 
-    <p><a href='//repo.parabolagnulinux.org/isos/' title='Parabola ISOs
+    <p><a href='https://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 69789150..a2bea2a8 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -17,10 +17,10 @@
     the Parabola staff.</p>
 
     <p>The <a
-        href="//wiki.parabolagnulinux.org/index.php?title=Special:RecentChanges&feed=atom"
+        href='https://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="//wiki.parabolagnulinux.org/" title="Parabola Wiki community
+    <a href='https://wiki.parabolagnulinux.org/" title="Parabola Wiki community
         documentation">Parabola Wiki</a>.</p>
 
     <h3>Package Feeds</h3>
diff --git a/templates/public/index.html b/templates/public/index.html
index 36bb5484..f446dfa6 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -112,22 +112,22 @@
     <h4>Documentation</h4>
 
     <ul>
-        <li><a href="//wiki.parabolagnulinux.org/"
+        <li><a href='https://wiki.parabolagnulinux.org/"
             title="Community documentation">Wiki</a></li>
-        <li><a href="//wiki.parabolagnulinux.org/installation_guide"
+        <li><a href='https://wiki.parabolagnulinux.org/installation_guide"
             title="Parabola Installation Guide">Official Parabola Installation Guide</a></li>
-        <li><a href="//wiki.parabolagnulinux.org/Migration"
+        <li><a href='https://wiki.parabolagnulinux.org/Migration"
             title="Free your Arch instalation">Migration from Archlinux</a></li>
     </ul>
 
     <h4>Community</h4>
 
     <ul>
-        <li><a href="//lists.parabolagnulinux.org/"
+        <li><a href='https://lists.parabolagnulinux.org/"
                 title="Community and developer mailing lists">Mailing Lists</a></li>
-        <li><a href="//lists.parabolagnulinux.org/pipermail/dev/"
+        <li><a href='https://lists.parabolagnulinux.org/pipermail/dev/"
             title="dev mailing list archives">Dev Archives</a></li>
-        <li><a href="//wiki.parabolagnulinux.org/IRC_Channels"
+        <li><a href='https://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>
@@ -154,9 +154,9 @@
             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="//projects.parabolagnulinux.org"
+        <li><a href='https://projects.parabolagnulinux.org"
             title="Official Parabola projects (git)">Projects in Git</a></li>
-        <li><a href="//bugs.parabolagnulinux.org/"
+        <li><a href='https://bugs.parabolagnulinux.org/"
             title="Parabola's Issue Tracker">Issue Tracker</a></li>
         <li><a href="/todolists/"
             title="Hacker Todo Lists">Todo Lists</a></li>
@@ -168,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="//wiki.parabolagnulinux.org/Media"
+        <li><a href='https://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 4321f7c2..ba19845e 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="//projects.parabolagnulinux.org" title="Projects
+        href='https://projects.parabolagnulinux.org" title="Projects
         page">Projects</a> on git!
 	</p>