Copyleft/copyleft-wiki
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Additional patch for mailman branding.

Browse source
This commit is contained in:
Bradley M. Kuhn 2014-11-08 13:47:28 -05:00
parent 03bb7403ef
commit 8e87abf40a
1 changed files with 369 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

369
mailman-branding-patches.mbox
View file

@ -788,3 +788,372 @@ index 197e636..ce0cf7c 100644
-- --
1.7.10.4 1.7.10.4
From 63277ce47401fb3fa2779822c44d40dc69e5dec6 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
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 @@
<li>%(MAILMAN)s</li></ul></nav>
</div>
</footer>
- <script src="http://copyleft.org/jquery-1.10.2.js"></script>
- <script src="http://copyleft.org/bootstrap.js"></script>
+ <script src="/jquery-1.10.2.js"></script>
+ <script src="/bootstrap.js"></script>
</BODY>
</HTML>
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 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<HEAD>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
<title>The %(listname)s %(archive)s Archive by %(archtype)s</title>
<META NAME="robots" CONTENT="noindex,follow">
@@ -18,7 +18,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
diff --git a/mailman/en/archtoc.html b/mailman/en/archtoc.html
index 1636319..cf7a749 100644
--- a/mailman/en/archtoc.html
+++ b/mailman/en/archtoc.html
@@ -2,8 +2,8 @@
<HTML>
<HEAD>
<title>The %(listname)s Archives</title>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
<META NAME="robots" CONTENT="noindex,follow">
%(meta)s
@@ -18,7 +18,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
@@ -57,7 +57,7 @@
<li>%(MAILMAN)s</li></ul></nav>
</div>
</footer>
- <script src="http://copyleft.org/jquery-1.10.2.js"></script>
- <script src="http://copyleft.org/bootstrap.js"></script>
+ <script src="/jquery-1.10.2.js"></script>
+ <script src="/bootstrap.js"></script>
</BODY>
</HTML>
diff --git a/mailman/en/archtocnombox.html b/mailman/en/archtocnombox.html
index 76729c6..bb0a94a 100644
--- a/mailman/en/archtocnombox.html
+++ b/mailman/en/archtocnombox.html
@@ -2,8 +2,8 @@
<HTML>
<HEAD>
<title>The %(listname)s Archives</title>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
<META NAME="robots" CONTENT="noindex,follow">
%(meta)s
@@ -27,7 +27,7 @@
<li>%(MAILMAN)s</li></ul></nav>
</div>
</footer>
- <script src="http://copyleft.org/jquery-1.10.2.js"></script>
- <script src="http://copyleft.org/bootstrap.js"></script>
+ <script src="/jquery-1.10.2.js"></script>
+ <script src="/bootstrap.js"></script>
</BODY>
</HTML>
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 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<HEAD>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
<TITLE> %(title)s
</TITLE>
@@ -28,7 +28,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
@@ -93,6 +93,6 @@ mailing list</a><br>
<li>%(MAILMAN)s</li></ul></nav>
</div>
</footer>
- <script src="http://copyleft.org/jquery-1.10.2.js"></script>
- <script src="http://copyleft.org/bootstrap.js"></script>
+ <script src="/jquery-1.10.2.js"></script>
+ <script src="/bootstrap.js"></script>
</body></html>
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 @@
<HTML>
<HEAD>
<title>The %(listname)s Archives</title>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
<META NAME="robots" CONTENT="noindex,follow">
</HEAD>
@@ -17,7 +17,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
@@ -52,7 +52,7 @@
<li>%(MAILMAN)s</li></ul></nav>
</div>
</footer>
- <script src="http://copyleft.org/jquery-1.10.2.js"></script>
- <script src="http://copyleft.org/bootstrap.js"></script>
+ <script src="/jquery-1.10.2.js"></script>
+ <script src="/bootstrap.js"></script>
</BODY>
</HTML>
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 @@
<HTML>
<HEAD>
<TITLE><MM-List-Name> Info Page</TITLE>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
</HEAD>
<BODY BGCOLOR="#ffffff">
@@ -17,7 +17,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
diff --git a/mailman/en/options.html b/mailman/en/options.html
index eab207d..8f06f73 100644
--- a/mailman/en/options.html
+++ b/mailman/en/options.html
@@ -3,8 +3,8 @@
<link rel="SHORTCUT ICON" href="<mm-favicon>">
<title><MM-Presentable-User> membership configuration for <MM-List-Name>
</title>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
</head>
<BODY BGCOLOR="#ffffff">
@@ -17,7 +17,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
diff --git a/mailman/en/private.html b/mailman/en/private.html
index 9a5ac0c..63b97f5 100644
--- a/mailman/en/private.html
+++ b/mailman/en/private.html
@@ -2,8 +2,8 @@
<head>
<title>%(realname)s Private Archives Authentication</title>
<script>function sf(){document.f.username.focus();}</script>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
</head>
<body bgcolor="#ffffff" onLoad="sf()">
@@ -16,7 +16,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
@@ -97,7 +97,7 @@
<li>%(MAILMAN)s</li></ul></nav>
</div>
</footer>
- <script src="http://copyleft.org/jquery-1.10.2.js"></script>
- <script src="http://copyleft.org/bootstrap.js"></script>
+ <script src="/jquery-1.10.2.js"></script>
+ <script src="/bootstrap.js"></script>
</body>
</html>
diff --git a/mailman/en/roster.html b/mailman/en/roster.html
index bfad45e..8cb6197 100644
--- a/mailman/en/roster.html
+++ b/mailman/en/roster.html
@@ -2,8 +2,8 @@
<HTML>
<HEAD>
<TITLE><MM-List-Name> Subscribers</TITLE>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
</HEAD>
@@ -17,7 +17,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
diff --git a/mailman/en/subscribe.html b/mailman/en/subscribe.html
index ce0cf7c..eea41c4 100644
--- a/mailman/en/subscribe.html
+++ b/mailman/en/subscribe.html
@@ -1,8 +1,8 @@
<!-- $Revision: 3550 $ -->
<html>
<head><title><MM-List-Name> Subscription results</title>
- <link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />
- <link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />
+ <link rel="stylesheet" href="/bootstrap.css" type="text/css" />
+ <link rel="stylesheet" href="/local.css" type="text/css" />
<link rel="shortcut icon" href="/images/mailman/copyleft.ico"/>
</head>
@@ -16,7 +16,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
diff --git a/mailman/htmlformat.py b/mailman/htmlformat.py
index e129ba9..f903e66 100644
--- a/mailman/htmlformat.py
+++ b/mailman/htmlformat.py
@@ -310,8 +310,8 @@ class Document(Container):
output.extend([tab,
'<HTML>',
'<HEAD>',
- '<link rel="stylesheet" href="http://copyleft.org/bootstrap.css" type="text/css" />',
- '<link rel="stylesheet" href="http://copyleft.org/local.css" type="text/css" />'
+ '<link rel="stylesheet" href="/bootstrap.css" type="text/css" />',
+ '<link rel="stylesheet" href="/local.css" type="text/css" />'
])
if mm_cfg.IMAGE_LOGOS:
output.append('<LINK REL="SHORTCUT ICON" HREF="%s">' %
@@ -346,7 +346,7 @@ class Document(Container):
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+ <img alt="copyleft.org" src="/copyleftorg-green-stylized.png" width="245" height="50"></img>
</div>
<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
@@ -699,8 +699,8 @@ def MailmanLogo():
<li>%(MAILMAN)s</li></ul></nav>
</div>
</footer>
- <script src="http://copyleft.org/jquery-1.10.2.js"></script>
- <script src="http://copyleft.org/bootstrap.js"></script>
+ <script src="/jquery-1.10.2.js"></script>
+ <script src="/bootstrap.js"></script>
""" % {'MAILMAN': mmlink.Format()})
# return t
--
1.7.10.4