From 294db8d3b87c2d75c60e0b8b69a07496a92e36b2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 21 Apr 2013 20:58:14 -0400
Subject: lingering things from the merge

---
 main/templatetags/wiki.py    |  4 ++--
 templates/public/donate.html |  2 +-
 templates/public/https.html  | 10 +++++-----
 templates/public/index.html  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/main/templatetags/wiki.py b/main/templatetags/wiki.py
index b1b8dd55..4a3b2f83 100644
--- a/main/templatetags/wiki.py
+++ b/main/templatetags/wiki.py
@@ -4,6 +4,6 @@
 @register.simple_tag
 def wiki_url(article=""):
     if article == "":
-        return "https://wiki.archlinux.org/"
+        return "https://wiki.parabolagnulinux.org/"
     else:
-        return "https://wiki.archlinux.org/index.php/"+article.replace(' ', '_')
+        return "https://wiki.parabolagnulinux.org/"+article.replace(' ', '_')
diff --git a/templates/public/donate.html b/templates/public/donate.html
index 6e2cc853..f7087dc9 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -9,7 +9,7 @@
 {% cache 600 donations secure %}
 <div id="donations" class="box">
 
-    <h2>Donate to Parabola</h2>
+    <h2>Donate to {{ BRANDING_SHORTNAME }}</h2>
 
     <h3>We don't accept any money donations</h3>
 
diff --git a/templates/public/https.html b/templates/public/https.html
index e53dc8e9..0d54c6c0 100644
--- a/templates/public/https.html
+++ b/templates/public/https.html
@@ -1,8 +1,9 @@
 {% extends "base.html" %}
-{% block title %}Parabola - HTTPS Only site{% endblock %}
+{% load wiki %}
+{% block title %}{{ BRANDING_DISTRONAME }} - HTTPS Only site{% endblock %}
 {% block content %}
 <div class="box">
-    <h2 class="title">Parabola GNU/Linux-libre</h2>
+    <h2 class="title">{{ BRANDING_DISTRONAME }}</h2>
 
     <p>Hi! This is not the main site. You're seeing this message because you
     entered our website without using a secure connection. We like privacy for
@@ -19,8 +20,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="https://wiki.parabolagnulinux.org/get">ISOs download page</a> on <a
-    href="https://wiki.parabolagnulinux.org/">our wiki</a>.</p>
+    href="{% wiki_url 'get' %}">ISOs download page</a> on <a
+    href="{% wiki_url %}">our wiki</a>.</p>
 
     <h3>I want to do this the right way</h3>
 
@@ -35,4 +36,3 @@ <h3>I want to do this the right way</h3>
 
 </div>
 {% endblock %}
-
diff --git a/templates/public/index.html b/templates/public/index.html
index a59e8eec..ef8f2d69 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -30,7 +30,7 @@ <h2>A <em>libre</em> version of Arch Linux</h2>
         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>
+    if you want to learn more about {{BRANDING_SHORTNAME}}.</p>
 
     <p class="readmore"><a href="{% url 'page-about' %}"
         title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p>
-- 
cgit v1.2.3-54-g00ecf