Merge commit '91c451'

Conflicts:
	devel/views.py
	feeds.py
	local_settings.py.example
	packages/management/commands/signoff_report.py
	packages/views/flag.py
	public/views.py
	templates/404.html
	templates/base.html
	templates/devel/clock.html
	templates/devel/index.html
	templates/devel/packages.html
	templates/devel/profile.html
	templates/general_form.html
	templates/mirrors/mirror_details.html
	templates/mirrors/mirrorlist.txt
	templates/mirrors/mirrorlist_generate.html
	templates/mirrors/mirrorlist_status.txt
	templates/mirrors/mirrors.html
	templates/mirrors/status.html
	templates/news/add.html
	templates/news/delete.html
	templates/news/list.html
	templates/news/view.html
	templates/packages/details.html
	templates/packages/differences.html
	templates/packages/files.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/flaghelp.html
	templates/packages/groups.html
	templates/packages/opensearch.xml
	templates/packages/packages_list.html
	templates/packages/search.html
	templates/packages/signoff_options.html
	templates/packages/signoffs.html
	templates/packages/stale_relations.html
	templates/public/about.html
	templates/public/art.html
	templates/public/blank.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/public/keys.html
	templates/public/svn.html
	templates/public/userlist.html
	templates/registration/login.html
	templates/registration/logout.html
	templates/releng/add.html
	templates/releng/results.html
	templates/releng/thanks.html
	templates/todolists/list.html
	templates/todolists/public_list.html
	templates/todolists/todolist_confirm_delete.html
	templates/todolists/view.html
	templates/visualize/index.html
	todolists/views.py

8 files changed, 119 insertions, 57 deletions

diff --git a/templates/public/about.html b/templates/public/about.html
index 402379d2..b31b05ed 100644
--- a/templates/public/about.html
+++ b/templates/public/about.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
-{% block title %}Parabola - About{% endblock %}
+{% load wiki %}
+{% block title %}{{ BRANDING_DISTRONAME }} - About{% endblock %}
 {% block content %}
 <div class="box">
     <h2 class="title">Parabola Presentation</h2>
 
-    <p>Almost a year ago we started a project to offer the Free Software
+    <p>In 2009 we started a project to offer the Free Software
     community the chance of using an Arch Linux system completely
     freed from proprietary software.</p>
 
@@ -53,7 +54,7 @@
 
         <li>Host repositories. Mirrors are not abundant.</li>
         
-        <li>Take a look at our <a href="https://wiki.parabolagnulinux.org/TODO" title="TODO">TODO list</a></li>
+        <li>Take a look at our <a href="{% wiki_url 'TODO' %}" title="TODO">TODO list</a></li>
     </ul> 
 
 </div>
diff --git a/templates/public/art.html b/templates/public/art.html
index b32cbd92..8aad43f4 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -1,28 +1,25 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
 
-{% block title %}Parabola - Artwork{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Artwork{% endblock %}
 
 {% block content %}
 <div id="artwork" class="box">
 
-    <h2>Parabola Logos and Artwork</h2>
+    <h2>{{ BRANDING_DISTRONAME }} Logos and Artwork</h2>
     
-    <p>You can help by creating artwork for Parabola GNU/Linux-libre.</p>
+    <p>You can help by creating artwork for {{ BRANDING_DISTRONAME }}.</p>
 
     <p>Send your designs to dev@lists.parabolagnulinux.org and state they are CC-by-sa
       or another free culture friendly license.</p>
 
-
-
-      {% comment %}
+{% comment %}
     <h3>Logos for Press Usage</h3>
 
-    <p>The following Parabola logos are available for press and other use.</p>
+    <p>The following {{BRANDING_DISTRONAME}} logos are available for press and other use.</p>
 
-    <p><strong>Two-color standard version</strong><br/>
+    <p><strong>Two-color standard version</strong><br />
 
-{% comment %}
 <!-- This is an example of how images should be added here -->
     <em>Also available in print-quality
         <a href="{% static "logos/parabola-logo-dark-1200dpi.png" %}"
diff --git a/templates/public/blank.html b/templates/public/blank.html
index b69b4e5d..3bf2cb2b 100644
--- a/templates/public/blank.html
+++ b/templates/public/blank.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Parabola - Sample Page Title{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Sample Page Title{% endblock %}
 
 {% block content %}
 <div id="sample-page-id" class="box">
diff --git a/templates/public/donate.html b/templates/public/donate.html
index e0771606..6e2cc853 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -1,8 +1,9 @@
 {% extends "base.html" %}
 {% load cache %}
 {% load static from staticfiles %}
+{% load wiki %}
 
-{% block title %}Parabola - Donate{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Donate{% endblock %}
 
 {% block content %}
 {% cache 600 donations secure %}
@@ -18,7 +19,7 @@
     anything, because we are a really small community of hackers.</p>
 
     <p>If you want, we have a pretty nice <a
-        href="https://wiki.parabolagnulinux.org/TODO" title="The TODO
+        href="{% wiki_url '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/feeds.html b/templates/public/feeds.html
index 11c050a0..9fdd3162 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -1,32 +1,29 @@
-{% extends "base.html" %}
-{% block title %}Parabola - RSS Feeds{% endblock %}
+{% extends "base.html" %}{% load wiki %}
+{% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %}
 
 {% block content %}
 <div id="rss-feeds" class="box">
 
     <h2>RSS Feeds</h2>
 
-    <p>Several RSS feeds are available for consumption from the Parabola website.
+    <p>Several RSS feeds are available for consumption from the {{ BRANDING_SHORTNAME }} website.
     The majority of these are package-related and allow feeds to be customized
     for the updates you care about.</p>
 
     <h3>News and Activity Feeds</h3>
 
-    <p>Grab the <a href="/feeds/news/" class="rss" title="Parabola News
-        feed">news item feed</a> to keep up-to-date with the latest news from
-    the Parabola staff.</p>
+    <p>Grab the <a href="/feeds/news/" class="rss" title="{{ BRANDING_DISTRONAME }} News feed">news item feed</a>
+    to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.</p>
 
-    <p>The <a
-        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="https://wiki.parabolagnulinux.org/" title="Parabola Wiki community
-        documentation">Parabola Wiki</a>.</p>
+    <p>The <a href="{% wiki_url 'Special:RecentChanges?feed=rss' %}"
+    title="{{ BRANDING_WIKINAME }} Recent Changes feed" class="rss">{{ BRANDING_WIKINAME }}: Recent changes feed</a>
+    is also available to track document changes from the <a href="{% wiki_url %}"
+    title="{{ BRANDING_WIKINAME }} community documentation">{{ BRANDING_WIKINAME }}</a>.</p>
 
     <h3>Package Feeds</h3>
 
     <p>If you are interested in <a href="/feeds/packages/" class="rss"
-        title="Parabola package updates feed">all package updates</a>,
+        title="{{ BRANDING_DISTRONAME }} package updates feed">all package updates</a>,
     then grab this feed. Note that when a package is updated for multiple
     architectures, you will see each individual update show up here.
     Alternatively, you can select a packages feed from the below table that is
@@ -58,5 +55,69 @@
         </tbody>
     </table>
 
+    <h3>Development Feeds</h3>
+
+    <p>Subscribe to any of the following to track bug tickets and feature
+    requests from the <a href="{{BUGTRACKER_URL}}" title="{{BRANDING_DISTRONAME}} Bugs">{{BRANDING_DISTRONAME}} Bugtracker</a>:</p>
+
+    <table class="pretty2">
+        <thead>
+            <tr>
+                <th>Project</th>
+                <th>Activity</th>
+                <th>Issues</th>
+                <th>News</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>All Projects</td>
+                <td><a href="https://labs.parabola.nu/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Art4Parabola</td>
+                <td><a href="https://labs.parabola.nu/projects/art4parabola/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/art4parabola/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/art4parabola/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Documentation</td>
+                <td><a href="https://labs.parabola.nu/projects/documentation/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/documentation/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/documentation/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Installation media (i686 and x86_64)</td>
+                <td><a href="https://labs.parabola.nu/projects/isos/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/isos/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/isos/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Libretools</td>
+                <td><a href="https://labs.parabola.nu/projects/libretools/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/libretools/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/libretools/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Packages (i686 and x86_64)</td>
+                <td><a href="https://labs.parabola.nu/projects/issue-tracker/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/issue-tracker/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/issue-tracker/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Ports</td>
+                <td><a href="https://labs.parabola.nu/projects/ports/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/ports/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/ports/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Port: Loongson 2F (mips64el)</td>
+                <td><a href="https://labs.parabola.nu/projects/mips64el/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/mips64el/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/mips64el/news.atom" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Servers</td>
+                <td><a href="https://labs.parabola.nu/projects/servers/activity.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/servers/issues.atom" class="rss">Feed</a></td>
+                <td><a href="https://labs.parabola.nu/projects/servers/news.atom" class="rss">Feed</a></td>
+            </tr>
+        </tbody>
+    </table>
+
  </div>
 {% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
index ebfcde27..a59e8eec 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -2,10 +2,11 @@
 {% load markup cache %}
 {% load url from future %}
 {% load static from staticfiles %}
+{% load wiki %}
 
 {% block head %}
-<link rel="alternate" type="application/rss+xml" title="Parabola News Updates" href="/feeds/news/" />
-<link rel="alternate" type="application/rss+xml" title="Parabola Package Updates" href="/feeds/packages/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISRONAME }} News Updates" href="/feeds/news/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISRONAME }} Package Updates" href="/feeds/packages/" />
 {% endblock %}
 
 {% block content_left %}
@@ -13,7 +14,7 @@
 <div id="intro" class="box">
     <h2>A <em>libre</em> version of Arch Linux</h2>
 
-    <p>You've reached the website for <strong>Parabola GNU/Linux-libre</strong>,
+    <p>You've reached the website for <strong>{{BRANDING_DISTRONAME}}</strong>,
     a project aiming to provide a fully free (as in freedom)
     derivative of Arch Linux, the lightweight and flexible GNU/Linux
     distribution that tries to Keep It Simple.</p>
@@ -25,14 +26,14 @@
 
     <p>Our strong community is diverse and helpful. Please
     check out our <a href="irc://chat.freenode.net#parabola" title="IRC channel">IRC channel</a>
-    and <a href="https://lists.parabolagnulinux.org/mailman/listinfo/"
-        title="Parabola Mailing Lists">mailing lists</a>
-    to get your feet wet.  Also glance through our <a href="https://wiki.parabolagnulinux.org/"
-        title="Parabola Wiki">wiki</a>
+    and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
+        title="{{ BRANDING_SHORTNAME }} Mailing Lists">mailing lists</a>
+    to get your feet wet.  Also glance through our <a href="{% wiki_url %}"
+        title="{{BRANDING_WIKINAME}}">wiki</a>
     if you want to learn more about Parabola.</p>
 
     <p class="readmore"><a href="{% url 'page-about' %}"
-        title="Learn more about Parabola">Learn more...</a></p>
+        title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p>
 </div>
 
 <div id="news">
@@ -41,7 +42,7 @@
         <span class="arrow"></span>
     </h3>
 
-    <a href="/feeds/news/" title="Parabola News RSS Feed"
+    <a href="/feeds/news/" title="{{ BRANDING_SHORTNAME }} News RSS Feed"
         class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a>
 
     {% for news in news_updates %}
@@ -94,7 +95,7 @@
     <h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
             title="Browse all of the latest packages">more</a>)</span></h3>
 
-    <a href="/feeds/packages/" title="Parabola Package Updates RSS Feed"
+    <a href="/feeds/packages/" title="{{ BRANDING_SHORTNAME }} Package Updates RSS Feed"
         class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a>
 
     <table>
@@ -114,30 +115,32 @@
     <h4>Documentation</h4>
 
     <ul>
-        <li><a href="https://wiki.parabolagnulinux.org/"
+        <li><a href="{% wiki_url %}"
             title="Community documentation">Wiki</a></li>
-        <li><a href="https://wiki.parabolagnulinux.org/installation_guide"
+        <li><a href="{% wiki_url 'Installation Guide' %}"
             title="Official installation guide">Official Installation Guide</a></li>
-        <li><a href="https://wiki.parabolagnulinux.org/Migration"
+        <li><a href="{% wiki_url "Beginners'_Guide" %}"
+            title="A good place to start for beginners">Unofficial Beginners' Guide</a></li>
+        <li><a href="{% wiki_url 'Migration' %}"
             title="Free your Arch installation">Migration from Arch Linux</a></li>
     </ul>
 
     <h4>Community</h4>
 
     <ul>
-        <li><a href="https://lists.parabolagnulinux.org/mailman/listinfo/"
+        <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
-        <li><a href="https://lists.parabolagnulinux.org/pipermail/dev/"
-            title="dev mailing list archives">Dev Archives</a></li>
-        <li><a href="https://wiki.parabolagnulinux.org/IRC_Channels"
+        <li><a href="{% wiki_url 'IRC_Channels' %}"
             title="Official and regional IRC communities">IRC Channels</a></li>
-        <li><a href="https://identi.ca/group/parabola" title="Parabola at identi.ca">Identi.ca group</a></li>
+        <li><a href="https://identi.ca/group/parabola"
+            title="Parabola at identi.ca">Identi.ca group</a></li>
     </ul>
 
     <h4>Support</h4>
 
     <ul>
-        <li><a href="{% url 'page-donate' %}" title="Help support Parabola">Donate</a></li>
+        <li><a href="{% url 'page-donate' %}"
+            title="Help support {{ BRANDING_DISTRONAME }}">Donate</a></li>
     </ul>
 
     <h4>Tools</h4>
@@ -160,7 +163,7 @@
 {% comment %}
         <li><a href="{% url 'page-svn' %}"
             title="View SVN entries for packages">SVN Repositories</a></li>
-        <li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki"
+        <li><a href="{% wiki_url 'DeveloperWiki' %}"
             title="Developer Wiki articles">Developer Wiki</a></li>
 {% endcomment %}
         <li><a href="/groups/"
@@ -180,9 +183,9 @@
         <li><a href="{% url 'page-keys' %}"
             title="Package/Database signing master keys">Signing Master Keys</a>
         <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
-        <li><a href="https://wiki.parabolagnulinux.org/Media"
-            title="Parabola in the media">Press Coverage</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="{% wiki_url 'Media' %}"
+            title="{{ BRANDING_DISTRONAME }} in the media">Press Coverage</a></li>
+        <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} 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>
         <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
         <li><a href="{% url 'page-devs' %}" title="Active hackers">Hackers Profiles</a></li>
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 257a16ae..4afc6d6b 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -2,13 +2,13 @@
 {% load static from staticfiles %}
 {% load pgp %}
 
-{% block title %}Parabola - Master Signing Keys{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Master Signing Keys{% endblock %}
 
 {% block content %}
 <div id="signing-keys" class="box">
     <h2>Master Signing Keys</h2>
 
-    <p>This page lists the Parabola Master Keys. This is a distributed set of
+    <p>This page lists the {{ BRANDING_DISTORNAME }} 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
@@ -53,7 +53,7 @@
     personal key of the developer is signed by the given master key. A 'No'
     indicates it has not been signed; however, this does not necessarily mean
     the key should not be trusted.</p>
-    <p>All official Arch Linux developers and trusted users should have their
+    <p>All official {{ BRANDING_DISTRONAME }} developers and trusted users should have their
     key signed by at least three master keys if they are responsible for
     packaging software in the repositories. This is in accordance with the PGP
     <em>web of trust</em> concept. If a user is willing to marginally trust all
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index cfb08d80..197346c3 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -1,13 +1,12 @@
 {% extends "base.html" %}
 {% load cache %}
 
-{% block title %}Parabola - {{ user_type }}{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - {{ user_type }}{% endblock %}
 
 {% block content %}
 {% cache 600 dev-tu-profiles user_type %}
 <div id="dev-tu-profiles" class="box">
-
-    <h2>Parabola {{user_type}}</h2>
+    <h2>{{BRANDING_DISTRONAME}} {{user_type}}</h2>
 
     <p>{{description}}</p>