diff --git a/mailman-branding-patches.mbox b/mailman-branding-patches.mbox index c99246ab50e4f94437e88b9d45f6d3efd0a5e610..a4cf137e60ab08192bef6c304431c3bd69748b05 100644 --- a/mailman-branding-patches.mbox +++ b/mailman-branding-patches.mbox @@ -788,3 +788,372 @@ index 197e636..ce0cf7c 100644 -- 1.7.10.4 +From 63277ce47401fb3fa2779822c44d40dc69e5dec6 Mon Sep 17 00:00:00 2001 +From: "Bradley M. Kuhn" +Date: Sat, 8 Nov 2014 13:45:25 -0500 +Subject: No longer hard code copyleft.org in URLs + +Since I want to use the same site for SSL and non-SSL, the http:// +cannot be hard coded. I've now just made sure that Apache redirects +things from lists.copyleft.org to the appropriate copyleft.org URLs. +--- + .etckeeper | 2 -- + mailman/en/archidxfoot.html | 4 ++-- + mailman/en/archidxhead.html | 6 +++--- + mailman/en/archtoc.html | 10 +++++----- + mailman/en/archtocnombox.html | 8 ++++---- + mailman/en/article.html | 10 +++++----- + mailman/en/emptyarchive.html | 10 +++++----- + mailman/en/listinfo.html | 6 +++--- + mailman/en/options.html | 6 +++--- + mailman/en/private.html | 10 +++++----- + mailman/en/roster.html | 6 +++--- + mailman/en/subscribe.html | 6 +++--- + mailman/htmlformat.py | 10 +++++----- + 13 files changed, 46 insertions(+), 48 deletions(-) + +diff --git a/.etckeeper b/.etckeeper +index deb5ee0..2ac566e 100755 +--- a/.etckeeper ++++ b/.etckeeper +@@ -35,8 +35,6 @@ maybe chmod 0755 '.' + maybe chmod 0700 './.etckeeper' + maybe chmod 0600 './.gitignore' + maybe chmod 0600 './.pwd.lock' +-maybe chmod 0600 './0001-Changes-to-Mailman-Python-code-for-copyleft.org-bran.patch' +-maybe chmod 0600 './0002-Rebranding-changes-for-copyleft.org-to-mailman-HTML-.patch' + maybe chmod 0755 './ImageMagick' + maybe chmod 0644 './ImageMagick/coder.xml' + maybe chmod 0644 './ImageMagick/colors.xml' +diff --git a/mailman/en/archidxfoot.html b/mailman/en/archidxfoot.html +index e067a37..8d1bedf 100644 +--- a/mailman/en/archidxfoot.html ++++ b/mailman/en/archidxfoot.html +@@ -26,7 +26,7 @@ +
  • %(MAILMAN)s
    • + + +- +- ++ ++ + + +diff --git a/mailman/en/archidxhead.html b/mailman/en/archidxhead.html +index 15bf066..c187293 100644 +--- a/mailman/en/archidxhead.html ++++ b/mailman/en/archidxhead.html +@@ -1,8 +1,8 @@ + + + +- +- ++ ++ + + The %(listname)s %(archive)s Archive by %(archtype)s + +@@ -18,7 +18,7 @@ + + + +- copyleft.org ++ copyleft.org + + + + + +- +- ++ ++ + + +diff --git a/mailman/en/article.html b/mailman/en/article.html +index f1627eb..9e9de0b 100644 +--- a/mailman/en/article.html ++++ b/mailman/en/article.html +@@ -1,8 +1,8 @@ + + + +- +- ++ ++ + + %(title)s + +@@ -28,7 +28,7 @@ + + + +- copyleft.org ++ copyleft.org + + + + + +- +- ++ ++ + +diff --git a/mailman/en/emptyarchive.html b/mailman/en/emptyarchive.html +index 8ab9f5a..46c7143 100644 +--- a/mailman/en/emptyarchive.html ++++ b/mailman/en/emptyarchive.html +@@ -2,8 +2,8 @@ + + + The %(listname)s Archives +- +- ++ ++ + + + +@@ -17,7 +17,7 @@ + + + +- copyleft.org ++ copyleft.org + + + + + +- +- ++ ++ + + +diff --git a/mailman/en/listinfo.html b/mailman/en/listinfo.html +index e02c0c9..f825632 100644 +--- a/mailman/en/listinfo.html ++++ b/mailman/en/listinfo.html +@@ -3,8 +3,8 @@ + + + <MM-List-Name> Info Page +- +- ++ ++ + + + +@@ -17,7 +17,7 @@ + + + +- copyleft.org ++ copyleft.org + + +