new file 100644
From 68793c2e490bf27c9639633044c8edaae77853b5 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Sat, 8 Nov 2014 12:21:10 -0500
Subject: Changes to Mailman Python code for copyleft.org branding.
This does not completely fix the branding issues;
some patches to the templates in /etc/mailman/en/ will next be
required.
---
.etckeeper | 43 ++++++++++++++++-------------------------
mailman/Defaults.py | 2 +-
mailman/htmlformat.py | 51 +++++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/.etckeeper b/.etckeeper
index 1eaaa08..8ddd0b4 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -698,10 +698,10 @@ maybe chmod 0644 './mailcap'
maybe chmod 0644 './mailcap.order'
maybe chgrp list './mailman'
maybe chmod 0755 './mailman'
-maybe chgrp list './mailman/Defaults.py'
-maybe chmod 0644 './mailman/Defaults.py'
+maybe chmod 0600 './mailman/Defaults.py'
maybe chgrp list './mailman/Defaults.py.~1~'
maybe chmod 0644 './mailman/Defaults.py.~1~'
+maybe chmod 0600 './mailman/Defaults.py.~2~'
maybe chmod 0644 './mailman/apache.conf'
maybe chmod 0755 './mailman/de'
maybe chgrp list './mailman/de/admindbdetails.html'
@@ -809,22 +809,17 @@ maybe chgrp list './mailman/en/approve.txt'
maybe chmod 0644 './mailman/en/approve.txt'
maybe chgrp list './mailman/en/archidxentry.html'
maybe chmod 0644 './mailman/en/archidxentry.html'
-maybe chgrp list './mailman/en/archidxfoot.html'
-maybe chmod 0644 './mailman/en/archidxfoot.html'
-maybe chgrp list './mailman/en/archidxhead.html'
-maybe chmod 0644 './mailman/en/archidxhead.html'
+maybe chmod 0600 './mailman/en/archidxfoot.html'
+maybe chmod 0600 './mailman/en/archidxhead.html'
maybe chgrp list './mailman/en/archlistend.html'
maybe chmod 0644 './mailman/en/archlistend.html'
maybe chgrp list './mailman/en/archliststart.html'
maybe chmod 0644 './mailman/en/archliststart.html'
-maybe chgrp list './mailman/en/archtoc.html'
-maybe chmod 0644 './mailman/en/archtoc.html'
+maybe chmod 0600 './mailman/en/archtoc.html'
maybe chgrp list './mailman/en/archtocentry.html'
maybe chmod 0644 './mailman/en/archtocentry.html'
-maybe chgrp list './mailman/en/archtocnombox.html'
-maybe chmod 0644 './mailman/en/archtocnombox.html'
-maybe chgrp list './mailman/en/article.html'
-maybe chmod 0644 './mailman/en/article.html'
+maybe chmod 0600 './mailman/en/archtocnombox.html'
+maybe chmod 0600 './mailman/en/article.html'
maybe chgrp list './mailman/en/bounce.txt'
maybe chmod 0644 './mailman/en/bounce.txt'
maybe chgrp list './mailman/en/checkdbs.txt'
@@ -835,42 +830,36 @@ maybe chgrp list './mailman/en/cronpass.txt'
maybe chmod 0644 './mailman/en/cronpass.txt'
maybe chgrp list './mailman/en/disabled.txt'
maybe chmod 0644 './mailman/en/disabled.txt'
-maybe chgrp list './mailman/en/emptyarchive.html'
-maybe chmod 0644 './mailman/en/emptyarchive.html'
+maybe chmod 0600 './mailman/en/emptyarchive.html'
maybe chgrp list './mailman/en/headfoot.html'
maybe chmod 0644 './mailman/en/headfoot.html'
maybe chgrp list './mailman/en/help.txt'
maybe chmod 0644 './mailman/en/help.txt'
maybe chgrp list './mailman/en/invite.txt'
maybe chmod 0644 './mailman/en/invite.txt'
-maybe chgrp list './mailman/en/listinfo.html'
-maybe chmod 0644 './mailman/en/listinfo.html'
+maybe chmod 0600 './mailman/en/listinfo.html'
maybe chgrp list './mailman/en/masthead.txt'
maybe chmod 0644 './mailman/en/masthead.txt'
maybe chgrp list './mailman/en/newlist.txt'
maybe chmod 0644 './mailman/en/newlist.txt'
maybe chgrp list './mailman/en/nomoretoday.txt'
maybe chmod 0644 './mailman/en/nomoretoday.txt'
-maybe chgrp list './mailman/en/options.html'
-maybe chmod 0644 './mailman/en/options.html'
+maybe chmod 0600 './mailman/en/options.html'
maybe chgrp list './mailman/en/postack.txt'
maybe chmod 0644 './mailman/en/postack.txt'
maybe chgrp list './mailman/en/postauth.txt'
maybe chmod 0644 './mailman/en/postauth.txt'
maybe chgrp list './mailman/en/postheld.txt'
maybe chmod 0644 './mailman/en/postheld.txt'
-maybe chgrp list './mailman/en/private.html'
-maybe chmod 0644 './mailman/en/private.html'
+maybe chmod 0600 './mailman/en/private.html'
maybe chgrp list './mailman/en/probe.txt'
maybe chmod 0644 './mailman/en/probe.txt'
maybe chgrp list './mailman/en/refuse.txt'
maybe chmod 0644 './mailman/en/refuse.txt'
-maybe chgrp list './mailman/en/roster.html'
-maybe chmod 0644 './mailman/en/roster.html'
+maybe chmod 0600 './mailman/en/roster.html'
maybe chgrp list './mailman/en/subauth.txt'
maybe chmod 0644 './mailman/en/subauth.txt'
-maybe chgrp list './mailman/en/subscribe.html'
-maybe chmod 0644 './mailman/en/subscribe.html'
+maybe chmod 0600 './mailman/en/subscribe.html'
maybe chgrp list './mailman/en/subscribeack.txt'
maybe chmod 0644 './mailman/en/subscribeack.txt'
maybe chgrp list './mailman/en/unsub.txt'
@@ -972,10 +961,10 @@ maybe chgrp list './mailman/es/userpass.txt'
maybe chmod 0644 './mailman/es/userpass.txt'
maybe chgrp list './mailman/es/verify.txt'
maybe chmod 0644 './mailman/es/verify.txt'
-maybe chgrp list './mailman/htmlformat.py'
-maybe chmod 0644 './mailman/htmlformat.py'
+maybe chmod 0600 './mailman/htmlformat.py'
+maybe chmod 0600 './mailman/htmlformat.py.~1~'
maybe chmod 0644 './mailman/leftover'
-maybe chmod 0644 './mailman/mm_cfg.py'
+maybe chmod 0600 './mailman/mm_cfg.py'
maybe chmod 0755 './mailman/postfix-to-mailman.py'
maybe chmod 0755 './mailman/qmail-to-mailman.py'
maybe chmod 0644 './mailname'
diff --git a/mailman/Defaults.py b/mailman/Defaults.py
index 2668310..db73637 100644
--- a/mailman/Defaults.py
+++ b/mailman/Defaults.py
@@ -57,7 +57,7 @@ No = no = Off = off = False
IMAGE_LOGOS = '/doc/mailman/images/'
# The name of the Mailman favicon
-SHORTCUT_ICON = 'mm-icon.png'
+SHORTCUT_ICON = 'copyleft.ico'
# Don't change MAILMAN_URL, unless you want to point it at one of the mirrors.
MAILMAN_URL = 'http://www.gnu.org/software/mailman/index.html'
diff --git a/mailman/htmlformat.py b/mailman/htmlformat.py
index d530989..e129ba9 100644
--- a/mailman/htmlformat.py
+++ b/mailman/htmlformat.py
@@ -309,7 +309,9 @@ class Document(Container):
tab = ' ' * indent
output.extend([tab,
'<HTML>',
- '<HEAD>'
+ '<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" />'
])
if mm_cfg.IMAGE_LOGOS:
output.append('<LINK REL="SHORTCUT ICON" HREF="%s">' %
@@ -334,6 +336,37 @@ class Document(Container):
# Language direction
direction = Utils.GetDirection(self.language)
output.append('dir="%s">' % direction)
+ output.append("""
+ <header class="navbar navbar-default navbar-fixed-top copyleft-navbar">
+ <div class="container">
+ <div class="navbar-header">
+ <button class="navbar-toggle" data-target=".copyleft-navbar-collapse" data-toggle="collapse" type="button">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ </button>
+ <img alt="copyleft.org" src="http://copyleft.org/copyleftorg-green-stylized.png" width="245" height="50"></img>
+
+ </div>
+ <nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">
+ <ul class="nav navbar-nav navbar-right">
+ <li class="active"><a href="/">Mailing Lists</a></li>
+ <li><a href="/">Wiki</a></li>
+ <li><a href="/guide/">Tutorial and Guide</a></li>
+ </ul></nav>
+ </header>
+ <div class="content">
+ <ol class="breadcrumb copyleft-breadcrumb">
+ Wiki Path: <li> <a href="https://copyleft.org/">copyleft.org</a></li>
+ <li>mailing lists</li>
+ </ol>
+ </div> <!-- /container -->
+""")
# Always do this...
output.append(Container.Format(self, indent))
if not self.suppress_head:
@@ -632,7 +665,6 @@ GNU_HEAD = 'gnu-head-tiny.jpg'
def MailmanLogo():
t = Table(border=0, width='100%')
-
version = mm_cfg.VERSION
mmlink = _("Delivered by Mailman")
pylink = _("Python Powered")
@@ -650,7 +682,7 @@ def MailmanLogo():
if mm_cfg.SITE_LINK:
sitelink = logo(mm_cfg.SITE_LOGO, sitelink, "")
- mmlink = Link(MAILMAN_URL, mmlink + _('<br>version %(version)s'))
+ mmlink = Link(MAILMAN_URL, mmlink + _('version %(version)s'))
pylink = Link(PYTHON_URL, pylink)
gnulink = Link(GNU_URL, gnulink)
links = [mmlink, pylink, gnulink]
@@ -659,7 +691,18 @@ def MailmanLogo():
sitelink = Link(mm_cfg.SITE_URL, sitelink)
links.append(sitelink)
t.AddRow(links)
- return t
+ return("""
+ <footer class="navbar navbar-default navbar-fixed-bottom copyleft-navbar">
+ <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>
+""" % {'MAILMAN': mmlink.Format()})
+# return t
class SelectOptions:
--
1.7.10.4
From 4b6b9e651458acc8f37ddfac5607d39ef78da9b0 Mon Sep 17 00:00:00 2001
Date: Sat, 8 Nov 2014 12:22:41 -0500
Subject: Rebranding changes for copyleft.org to mailman HTML templates.
mailman/en/archidxfoot.html | 15 ++++++++++++--
mailman/en/archidxhead.html | 32 ++++++++++++++++++++++++++++++
mailman/en/archtoc.html | 43 +++++++++++++++++++++++++++++++++++++++++
mailman/en/archtocnombox.html | 15 ++++++++++++++
mailman/en/article.html | 43 +++++++++++++++++++++++++++++++++++++++++
mailman/en/emptyarchive.html | 43 +++++++++++++++++++++++++++++++++++++++++
mailman/en/listinfo.html | 31 ++++++++++++++++++++++++++++-
mailman/en/options.html | 31 +++++++++++++++++++++++++++++
mailman/en/private.html | 43 +++++++++++++++++++++++++++++++++++++++++
mailman/en/roster.html | 31 +++++++++++++++++++++++++++++
mailman/en/subscribe.html | 35 ++++++++++++++++++++++++++++++++-
11 files changed, 358 insertions(+), 4 deletions(-)
diff --git a/mailman/en/archidxfoot.html b/mailman/en/archidxfoot.html
index 0b0a420..e067a37 100644
--- a/mailman/en/archidxfoot.html
+++ b/mailman/en/archidxfoot.html
@@ -15,7 +15,18 @@
</ul>
<p>
<hr>
- <i>This archive was generated by
- Pipermail %(version)s.</i>
+ <p class="navbar-text navbar-left">
+ <i>This archive was generated by
+ Pipermail %(version)s.</i></p>
</BODY>
</HTML>
diff --git a/mailman/en/archidxhead.html b/mailman/en/archidxhead.html
index 2227dfd..15bf066 100644
--- a/mailman/en/archidxhead.html
+++ b/mailman/en/archidxhead.html
@@ -1,11 +1,43 @@
<!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="shortcut icon" href="/images/mailman/copyleft.ico"/>
<title>The %(listname)s %(archive)s Archive by %(archtype)s</title>
<META NAME="robots" CONTENT="noindex,follow">
%(encoding)s
</HEAD>
<BODY BGCOLOR="#ffffff">
+ <li><a href="https://lists.copyleft.org/">mailing lists</a></li>
+ <li>archvies</li>
+ </div></div>
<a name="start"></A>
<h1>%(archive)s Archives by %(archtype)s</h1>
<ul>
diff --git a/mailman/en/archtoc.html b/mailman/en/archtoc.html
index 32ecb71..1636319 100644
--- a/mailman/en/archtoc.html
+++ b/mailman/en/archtoc.html
@@ -2,10 +2,41 @@
<title>The %(listname)s Archives</title>
%(meta)s
<h1>The %(listname)s Archives </h1>
You can get <a href="%(listinfo)s">more information about this list</a>
@@ -16,5 +47,17 @@
%(archive_listing_start)s
%(archive_listing)s
%(archive_listing_end)s
diff --git a/mailman/en/archtocnombox.html b/mailman/en/archtocnombox.html
index e2c5b3d..76729c6 100644
--- a/mailman/en/archtocnombox.html
+++ b/mailman/en/archtocnombox.html
@@ -2,6 +2,9 @@
@@ -14,5 +17,17 @@
diff --git a/mailman/en/article.html b/mailman/en/article.html
index beb361f..f1627eb 100644
--- a/mailman/en/article.html
+++ b/mailman/en/article.html
@@ -1,6 +1,9 @@
<TITLE> %(title)s
</TITLE>
<LINK REL="Index" HREF="index.html" >
@@ -16,6 +19,34 @@
%(next)s
<H1>%(subject_html)s</H1>
<B>%(author_html)s</B>
<A HREF="mailto:%(email_url)s?Subject=%(subject_url)s&In-Reply-To=%(in_reply_to_url)s"
@@ -52,4 +83,16 @@
<a href="%(listurl)s">More information about the %(listname)s
mailing list</a><br>
</body></html>
diff --git a/mailman/en/emptyarchive.html b/mailman/en/emptyarchive.html
index 8585a32..8ab9f5a 100644
--- a/mailman/en/emptyarchive.html
+++ b/mailman/en/emptyarchive.html
@@ -2,14 +2,57 @@
No messages have been posted to this list yet, so the archives are
currently empty. You can get <a href="%(listinfo)s">more information
about this list</a>.
</p>
diff --git a/mailman/en/listinfo.html b/mailman/en/listinfo.html
index f02b170..e02c0c9 100644
--- a/mailman/en/listinfo.html
+++ b/mailman/en/listinfo.html
@@ -3,10 +3,39 @@
<TITLE><MM-List-Name> Info Page</TITLE>
<P>
<TABLE BORDER="0" CELLSPACING="4" CELLPADDING="5">
<TR>
diff --git a/mailman/en/options.html b/mailman/en/options.html
index 8213b1f..eab207d 100644
--- a/mailman/en/options.html
+++ b/mailman/en/options.html
@@ -3,8 +3,39 @@
<link rel="SHORTCUT ICON" href="<mm-favicon>">
<title><MM-Presentable-User> membership configuration for <MM-List-Name>
</title>
</head>
<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
<TR><TD WIDTH="100%" BGCOLOR="#99CCFF"><B>
<FONT COLOR="#000000" SIZE=+1>
diff --git a/mailman/en/private.html b/mailman/en/private.html
index fa7bfed..9a5ac0c 100644
--- a/mailman/en/private.html
+++ b/mailman/en/private.html
@@ -2,8 +2,39 @@
<head>
<title>%(realname)s Private Archives Authentication</title>
<script>function sf(){document.f.username.focus();}</script>
<body bgcolor="#ffffff" onLoad="sf()">
<FORM METHOD=POST ACTION="%(action)s" name="f">
%(message)s
<TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
@@ -56,5 +87,17 @@
</tr>
</TABLE>
</FORM>
</body>
</html>
diff --git a/mailman/en/roster.html b/mailman/en/roster.html
index be3d1c8..bfad45e 100644
--- a/mailman/en/roster.html
+++ b/mailman/en/roster.html
@@ -2,9 +2,40 @@
<TITLE><MM-List-Name> Subscribers</TITLE>
<TABLE WIDTH="100%" COLS="1" BORDER="0" CELLSPACING="4" CELLPADDING="5">
diff --git a/mailman/en/subscribe.html b/mailman/en/subscribe.html
index 197e636..ce0cf7c 100644
--- a/mailman/en/subscribe.html
+++ b/mailman/en/subscribe.html
@@ -1,7 +1,40 @@
<!-- $Revision: 3550 $ -->
<html>
-<head><title><MM-List-Name> Subscription results</title></head>
+<head><title><MM-List-Name> Subscription results</title>
+</head>
<body bgcolor="white">
<h1><MM-List-Name> Subscription results</h1>
<MM-Results>
<MM-Mailman-Footer>