From 4ab05a025f424c0b5ce140ff68182e20595b04a2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Apr 2013 19:11:04 -0400
Subject: manually replace more instances of the Arch name

---
 templates/packages/flaghelp.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/packages/flaghelp.html')

diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 819a2f01..9080f611 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -30,7 +30,7 @@ <h3>Flagging Packages</h3>
 
         <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.archlinux.org"
-            title="Arch Linux Bugtracker">bugtracker</a> instead.</p>
+            title="{{ BRANDING_DISTRONAME }} Bugtracker">bugtracker</a> instead.</p>
 
     </body>
 </html>
-- 
cgit v1.2.3-54-g00ecf


From 55b52a92806e4e76b1db17178f323362e3ddfe09 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 20 Apr 2013 00:24:29 -0400
Subject: add MAILMAN_BASE_URL to abstract mailing list links

---
 main/context_processors.py       | 1 +
 settings.py                      | 2 ++
 templates/base.html              | 2 +-
 templates/packages/flag.html     | 2 +-
 templates/packages/flaghelp.html | 2 +-
 templates/public/download.html   | 2 +-
 templates/public/index.html      | 4 ++--
 7 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'templates/packages/flaghelp.html')

diff --git a/main/context_processors.py b/main/context_processors.py
index 5ac31744..d6456a9d 100644
--- a/main/context_processors.py
+++ b/main/context_processors.py
@@ -9,6 +9,7 @@ def branding(request):
         'BRANDING_SHORTNAME': settings.BRANDING_SHORTNAME,
         'BRANDING_WIKINAME': settings.BRANDING_WIKINAME,
         'BRANDING_EMAIL': settings.BRANDING_EMAIL,
+        'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL,
     }
 
 # vim: set ts=4 sw=4 et:
diff --git a/settings.py b/settings.py
index 09f2df9c..ba9560f7 100644
--- a/settings.py
+++ b/settings.py
@@ -139,6 +139,8 @@
 # community bit on the end, repo.svn_root is appended)
 SVN_BASE_URL = 'svn://svn.archlinux.org/'
 
+MAILMAN_BASE_URL = 'https://mailman.archlinux.org/mailman'
+
 BRANDING_APPNAME = 'archweb'
 BRANDING_DISTRONAME = 'Arch Linux'
 BRANDING_SHORTNAME = 'Arch'
diff --git a/templates/base.html b/templates/base.html
index 2b3aed66..bc4db84f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -39,7 +39,7 @@
                     <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="{% url 'devel-clocks' %}" title="Developer world clocks">Dev Clocks</a></li>
-                    <li><a href="https://mailman.archlinux.org/mailman/private/arch-dev/"
+                    <li><a href="{{ MAILMAN_BASE_URL }}/private/arch-dev/"
                         title="arch-dev mailing list archives">Archives</a></li>
                     <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
                     <li><a href="https://stats.archlinux.org/munin/"
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index d7b86dde..2b492d45 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -23,7 +23,7 @@ <h2>Flag Package: {{ package.pkgname }} {{ package.full_version }} ({{ package.a
     <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="https://mailman.archlinux.org/mailman/listinfo/arch-general"
+    an email to the <a href="{{ MAILMAN_BASE_URL }}/listinfo/arch-general"
         title="Visit the arch-general mailing list">arch-general mailing list</a>
     with your additional text.</p>
 
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 9080f611..e2d67e06 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -24,7 +24,7 @@ <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://mailman.archlinux.org/mailman/listinfo/arch-general"
+        an email to the <a target="_blank" href="{{ MAILMAN_BASE_URL }}/listinfo/arch-general"
             title="Visit the arch-general mailing list">arch-general mailing list</a>
         with your additional text.</p>
 
diff --git a/templates/public/download.html b/templates/public/download.html
index 72d21736..f473915a 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -27,7 +27,7 @@ <h3>Release Info</h3>
             <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="https://mailman.archlinux.org/mailman/listinfo/arch-releng"
+                <li><a href="{{ MAILMAN_BASE_URL }}/listinfo/arch-releng"
                     title="Arch Linux Release Engineering mailing list">Mailing List</a></li>
             </ul>
         </li>
diff --git a/templates/public/index.html b/templates/public/index.html
index 7c22c251..aeeff175 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -27,7 +27,7 @@ <h2>A simple, lightweight distribution</h2>
     <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="https://mailman.archlinux.org/mailman/listinfo/"
+    and <a href="{{ MAILMAN_BASE_URL }}/listinfo/"
         title="Arch Mailing Lists">mailing lists</a>
     to get your feet wet.  Also glance through our <a href="{% wiki_url %}"
         title="{{BRANDING_WIKINAME}}">wiki</a>
@@ -127,7 +127,7 @@ <h4>Documentation</h4>
     <h4>Community</h4>
 
     <ul>
-        <li><a href="https://mailman.archlinux.org/mailman/listinfo/"
+        <li><a href="{{ MAILMAN_BASE_URL }}/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
         <li><a href="{% wiki_url 'IRC_Channels' %}"
             title="Official and regional IRC communities">IRC Channels</a></li>
-- 
cgit v1.2.3-54-g00ecf


From f9fb5909bbcb5f5ff727a2d8f0081a4185138414 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 20 Apr 2013 13:42:30 -0400
Subject: remove /mailman from the MAILMAN_BASE_URL, use it every time

---
 settings.py                      | 2 +-
 templates/base.html              | 2 +-
 templates/packages/flag.html     | 2 +-
 templates/packages/flaghelp.html | 2 +-
 templates/public/download.html   | 2 +-
 templates/public/index.html      | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates/packages/flaghelp.html')

diff --git a/settings.py b/settings.py
index ba9560f7..bc15b0ab 100644
--- a/settings.py
+++ b/settings.py
@@ -139,7 +139,7 @@
 # community bit on the end, repo.svn_root is appended)
 SVN_BASE_URL = 'svn://svn.archlinux.org/'
 
-MAILMAN_BASE_URL = 'https://mailman.archlinux.org/mailman'
+MAILMAN_BASE_URL = 'https://mailman.archlinux.org/'
 
 BRANDING_APPNAME = 'archweb'
 BRANDING_DISTRONAME = 'Arch Linux'
diff --git a/templates/base.html b/templates/base.html
index bc4db84f..e6553449 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -39,7 +39,7 @@
                     <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="{% url 'devel-clocks' %}" title="Developer world clocks">Dev Clocks</a></li>
-                    <li><a href="{{ MAILMAN_BASE_URL }}/private/arch-dev/"
+                    <li><a href="{{ MAILMAN_BASE_URL }}/mailman/private/arch-dev/"
                         title="arch-dev mailing list archives">Archives</a></li>
                     <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
                     <li><a href="https://stats.archlinux.org/munin/"
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 2b492d45..6cd5bedf 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -23,7 +23,7 @@ <h2>Flag Package: {{ package.pkgname }} {{ package.full_version }} ({{ package.a
     <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="{{ MAILMAN_BASE_URL }}/listinfo/arch-general"
+    an email to the <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
         title="Visit the arch-general mailing list">arch-general mailing list</a>
     with your additional text.</p>
 
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index e2d67e06..01534d8f 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -24,7 +24,7 @@ <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="{{ MAILMAN_BASE_URL }}/listinfo/arch-general"
+        an email to the <a target="_blank" href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
             title="Visit the arch-general mailing list">arch-general mailing list</a>
         with your additional text.</p>
 
diff --git a/templates/public/download.html b/templates/public/download.html
index f473915a..70b27b73 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -27,7 +27,7 @@ <h3>Release Info</h3>
             <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="{{ MAILMAN_BASE_URL }}/listinfo/arch-releng"
+                <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-releng"
                     title="Arch Linux Release Engineering mailing list">Mailing List</a></li>
             </ul>
         </li>
diff --git a/templates/public/index.html b/templates/public/index.html
index aeeff175..8856fd95 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -27,7 +27,7 @@ <h2>A simple, lightweight distribution</h2>
     <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="{{ MAILMAN_BASE_URL }}/listinfo/"
+    and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
         title="Arch Mailing Lists">mailing lists</a>
     to get your feet wet.  Also glance through our <a href="{% wiki_url %}"
         title="{{BRANDING_WIKINAME}}">wiki</a>
@@ -127,7 +127,7 @@ <h4>Documentation</h4>
     <h4>Community</h4>
 
     <ul>
-        <li><a href="{{ MAILMAN_BASE_URL }}/listinfo/"
+        <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
         <li><a href="{% wiki_url 'IRC_Channels' %}"
             title="Official and regional IRC communities">IRC Channels</a></li>
-- 
cgit v1.2.3-54-g00ecf


From 753784954794259c6a674a7b33e8b1e0105f55d1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 21 Apr 2013 01:01:35 -0400
Subject: add BUGTRACKER_URL

---
 main/context_processors.py       | 1 +
 settings.py                      | 1 +
 templates/base.html              | 2 +-
 templates/packages/flag.html     | 2 +-
 templates/packages/flaghelp.html | 2 +-
 templates/public/feeds.html      | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'templates/packages/flaghelp.html')

diff --git a/main/context_processors.py b/main/context_processors.py
index d6456a9d..2543a3de 100644
--- a/main/context_processors.py
+++ b/main/context_processors.py
@@ -10,6 +10,7 @@ def branding(request):
         'BRANDING_WIKINAME': settings.BRANDING_WIKINAME,
         'BRANDING_EMAIL': settings.BRANDING_EMAIL,
         'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL,
+        'BUGTRACKER_URL': settings.BUGTRACKER_URL,
     }
 
 # vim: set ts=4 sw=4 et:
diff --git a/settings.py b/settings.py
index bc15b0ab..8cde6342 100644
--- a/settings.py
+++ b/settings.py
@@ -140,6 +140,7 @@
 SVN_BASE_URL = 'svn://svn.archlinux.org/'
 
 MAILMAN_BASE_URL = 'https://mailman.archlinux.org/'
+BUGTRACKER_URL = 'https://bugs.archlinux.org/'
 
 BRANDING_APPNAME = 'archweb'
 BRANDING_DISTRONAME = 'Arch Linux'
diff --git a/templates/base.html b/templates/base.html
index e6553449..f555b83d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -22,7 +22,7 @@
                 <li id="anb-packages"><a href="/packages/" title="{{ BRANDING_SHORTNAME }} Package Database">Packages</a></li>
                 <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
                 <li id="anb-wiki"><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li>
-                <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
+                <li id="anb-bugs"><a href="{{ BUGTRACKER_URL }}" title="Report and track bugs">Bugs</a></li>
                 <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
                 <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get {{ BRANDING_DISTRONAME }}">Download</a></li>
             </ul>
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 6cd5bedf..063e1d1e 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.archlinux.org/" title="{{ BRANDING_DISTRONAME }} Bugtracker">Use the
+    <a href="{{ BUGTRACKER_URL }}" title="{{ BRANDING_DISTRONAME }} 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 01534d8f..fddc1bda 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -29,7 +29,7 @@ <h3>Flagging Packages</h3>
         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.archlinux.org"
+        package is broken! Use the <a target="_blank" href="{{ BUGTRACKER_URL }}"
             title="{{ BRANDING_DISTRONAME }} Bugtracker">bugtracker</a> instead.</p>
 
     </body>
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index f298de7f..91cd9e71 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -61,7 +61,7 @@ <h3>Package Feeds</h3>
     <h3>Development Feeds</h3>
 
     <p>Subscribe to any of the following to track bug tickets and feature
-    requests from the <a href="https://bugs.archlinux.org/" title="Arch Linux Bugs">Arch Linux Bugtracker</a>:</p>
+    requests from the <a href="{{BUGTRACKER_URL}}" title="{{BRANDING_DISTRONAME}} Bugs">{{BRANDING_DISTRONAME}} Bugtracker</a>:</p>
 
     <table class="pretty2">
         <thead>
-- 
cgit v1.2.3-54-g00ecf