[Pkg-mailman-hackers] Pkg-mailman commit - rev 656 - in trunk/debian: . patches

[Thijs Kinkhorst]

Author: thijs
Date: 2010-05-24 14:10:48 +0000 (Mon, 24 May 2010)
New Revision: 656

Added:
   trunk/debian/patches/25_site_logo.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Add 25_site_logo patch by Paul Wise (closes: #267243).

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-05-24 13:54:07 UTC (rev 655)
+++ trunk/debian/changelog	2010-05-24 14:10:48 UTC (rev 656)
@@ -1,8 +1,9 @@
 mailman (1:2.1.13-3) UNRELEASED; urgency=low
 
   * Drop unneeded Indexes option from shipped apache.conf.
+  * Add 25_site_logo patch by Paul Wise (closes: #267243).
 
- -- Thijs Kinkhorst <thijs at debian.org>  Fri, 02 Apr 2010 21:26:48 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 24 May 2010 16:10:15 +0200
 
 mailman (1:2.1.13-2) unstable; urgency=low
 

Added: trunk/debian/patches/25_site_logo.patch
===================================================================
--- trunk/debian/patches/25_site_logo.patch	                        (rev 0)
+++ trunk/debian/patches/25_site_logo.patch	2010-05-24 14:10:48 UTC (rev 656)
@@ -0,0 +1,75 @@
+Patch: 25_site_logo.patch
+Author: Paul Wise <pabs at debian.org>
+Allow each mailman site to have a custom text, link and logo. Also fix existing logo linkage.
+http://bugs.debian.org/267243
+http://sf.net/support/tracker.php?aid=1615748
+diff -urNad mailman-2.1.5/Mailman/Defaults.py.in /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/Defaults.py.in
+--- mailman-2.1.5/Mailman/Defaults.py.in	2005-01-05 15:11:16.000000000 +0800
++++ /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/Defaults.py.in	2005-01-05 15:13:10.000000000 +0800
+@@ -65,6 +65,12 @@
+ #MAILMAN_URL = 'http://www.list.org/'
+ #MAILMAN_URL = 'http://mailman.sf.net/'
+ 
++# The site logo/text presence, site text, site url and site logo
++SITE_LINK = No
++SITE_TEXT = ''
++SITE_URL = None
++SITE_LOGO = ''
++
+ # Mailman needs to know about (at least) two fully-qualified domain names
+ # (fqdn); 1) the hostname used in your urls, and 2) the hostname used in email
+ # addresses for your domain.  For example, if people visit your Mailman system
+diff -urNad mailman-2.1.5/Mailman/htmlformat.py /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/htmlformat.py
+--- mailman-2.1.5/Mailman/htmlformat.py	2005-01-05 15:11:16.000000000 +0800
++++ /tmp/dpep.h3m72C/mailman-2.1.5/Mailman/htmlformat.py	2005-01-05 15:18:57.000000000 +0800
+@@ -618,24 +618,33 @@
+ 
+ def MailmanLogo():
+     t = Table(border=0, width='100%')
++
++    version = mm_cfg.VERSION
++    mmlink = _("Delivered by Mailman")
++    pylink = _("Python Powered")
++    gnulink = _("GNU's Not Unix")
++    if mm_cfg.SITE_LINK:
++        sitelink = mm_cfg.SITE_TEXT
++
+     if mm_cfg.IMAGE_LOGOS:
+-        def logo(file):
+-            return mm_cfg.IMAGE_LOGOS + file
+-        mmlink = '<img src="%s" alt="Delivered by Mailman" border=0>' \
+-                 '<br>version %s' % (logo(DELIVERED_BY), mm_cfg.VERSION)
+-        pylink = '<img src="%s" alt="Python Powered" border=0>' % \
+-                 logo(PYTHON_POWERED)
+-        gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
+-                  logo(GNU_HEAD)
+-        t.AddRow([mmlink, pylink, gnulink])
+-    else:
+-        # use only textual links
+-        version = mm_cfg.VERSION
+-        mmlink = Link(MAILMAN_URL,
+-                      _('Delivered by Mailman<br>version %(version)s'))
+-        pylink = Link(PYTHON_URL, _('Python Powered'))
+-        gnulink = Link(GNU_URL, _("Gnu's Not Unix"))
+-        t.AddRow([mmlink, pylink, gnulink])
++        def logo(file, alt, base=mm_cfg.IMAGE_LOGOS):
++            return '<img src="%s" alt="%s" border="0" />' % \
++              (base + file, alt)
++        mmlink = logo(DELIVERED_BY, mmlink)
++        pylink = logo(PYTHON_POWERED, pylink)
++        gnulink = logo(GNU_HEAD, gnulink)
++        if mm_cfg.SITE_LINK:
++            sitelink = logo(mm_cfg.SITE_LOGO, sitelink, "")
++
++    mmlink = Link(MAILMAN_URL, mmlink + _('<br>version %(version)s'))
++    pylink = Link(PYTHON_URL, pylink)
++    gnulink = Link(GNU_URL, gnulink)
++    links = [mmlink, pylink, gnulink]
++    if mm_cfg.SITE_LINK:
++        if mm_cfg.SITE_URL:
++            sitelink = Link(mm_cfg.SITE_URL, sitelink)
++        links.append(sitelink)
++    t.AddRow(links)
+     return t
+ 
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2010-05-24 13:54:07 UTC (rev 655)
+++ trunk/debian/patches/series	2010-05-24 14:10:48 UTC (rev 656)
@@ -6,6 +6,7 @@
 16_update_debian.patch
 20_qmail_to_mailman.debian.patch
 21_newlist_help.patch
+25_site_logo.patch
 51_nocompile.pyc.patch
 52_check_perms_lstat.patch
 53_disable_addons.patch