Update of /cvsroot/mailman/mailman/admin/www
In directory usw-pr-cvs1:/tmp/cvs-serv7670
Modified Files:
Tag: Release_2_0_1-branch
MMGenerator.py
Log Message:
Merge in some changes requested by the FSF.
__init__(): The copyright notice includes a license for copying and
distributing.
get_title(): Include advertising for the FSF.
get_meta(): Blame the [EMAIL PROTECTED] <wink>
Index: MMGenerator.py
===================================================================
RCS file: /cvsroot/mailman/mailman/admin/www/MMGenerator.py,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** MMGenerator.py 5 Jan 2001 16:23:07 -0000 1.2.2.2
--- MMGenerator.py 4 Apr 2002 17:51:53 -0000 1.2.2.3
***************
*** 6,10 ****
--- 6,12 ----
"""
+ import time
import os
+ import re
from Skeleton import Skeleton
***************
*** 14,17 ****
--- 16,21 ----
from LinkFixer import LinkFixer
+ COMMA = ','
+
***************
*** 50,65 ****
self.__linkfixer.massage(p.sidebar, self.__d)
# tweak
! p.sidebar.append((None,
! '''<a href="http://www.python.org/";><img border=0
! src="%(rootdir)s/images/PythonPoweredSmall.png"
! ></a> <a href="http://sourceforge.net";><img
! src="http://sourceforge.net/sflogo.php?group_id=103";
! width="88" height="31" border="0"
! alt="SourceForge Logo"></a>'''
! % self.__d))
p.sidebar.append(BLANKCELL)
! copyright = self.__parser.get('copyright', '1998,1999,2000,2001')
! p.sidebar.append((None, '© ' + copyright +
! '<br>Free Software Foundation, Inc.'))
Sidebar.__init__(self, p.sidebar)
#
--- 54,77 ----
self.__linkfixer.massage(p.sidebar, self.__d)
# tweak
! p.sidebar.append((None, """\
! <center><a href="http://www.python.org/";><img border=0
! src="%(rootdir)s/images/PythonPoweredSmall.png"></a> <a
! href="http://sourceforge.net";><img
! src="http://sourceforge.net/sflogo.php?group_id=103";
! width="88" height="31" border="0"
! alt="SourceForge Logo"></a>
! """ % self.__d))
p.sidebar.append(BLANKCELL)
! years = COMMA.join([str(x)
! for x in range(1998, time.localtime()[0]+1)])
! copyright = self.__parser.get('copyright', years)
! p.sidebar.append((None, '© ' + copyright + """\
! <br>Free Software Foundation, Inc.<br>
! Verbatim copying and distribution of this entire article is permitted in
! any medium, provided this notice is preserved.<br>
! Please send comments on these pages to <a href="mailto:[EMAIL PROTECTED]";>
! <[EMAIL PROTECTED]></a>, other questions to <a
! href="mailto:[EMAIL PROTECTED]";><[EMAIL PROTECTED]></a>.
! """))
Sidebar.__init__(self, p.sidebar)
#
***************
*** 91,95 ****
def get_title(self):
! return self.__parser.get('title')
def get_sidebar(self):
--- 103,113 ----
def get_title(self):
! title = self.__parser.get('title')
! return title + ' - GNU Project - Free Software Foundation (FSF)'
!
! def get_meta(self):
! skel = Skeleton.get_meta(self)
! extra = '\n<LINK REV="made" HREF="mailto:[EMAIL PROTECTED]";>'
! return skel + extra
def get_sidebar(self):
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
