diff -Pur mailman-2.0-base/Mailman/Archiver/HyperArch.py mailman-2.0/Mailman/Archiver/HyperArch.py --- mailman-2.0-base/Mailman/Archiver/HyperArch.py Mon Nov 13 15:50:05 2000 +++ mailman-2.0/Mailman/Archiver/HyperArch.py Thu Dec 14 18:20:36 2000 @@ -94,7 +94,7 @@ %(prev)s %(next)s - +

%(subject_html)s

%(author_html)s @@ -287,6 +287,7 @@ d["email_url"] = url_quote(self.email) d["datestr_html"] = self.quote(self.datestr) d["body"] = self._get_body() + d["background_color"] = mm_cfg.BACKGD_COLOR if self.charset is not None: d["encoding"] = html_charset % self.charset @@ -449,7 +450,7 @@ %(encoding)s - +
%(archive)s Archives by %(archtype)s

@@ -505,7 +506,7 @@ The %(listname)s Archives - +
The %(listname)s Archives

You can get more information about this list @@ -625,6 +626,7 @@ "firstdate": html_quote(self.firstdate), "lastdate": html_quote(self.lastdate), "size": self.size, + "background_color": mm_cfg.BACKGD_COLOR, } for t in ("thread", "subject", "author", "date"): cap = string.upper(t[0]) + t[1:] @@ -663,6 +665,7 @@ d["archive_listing"] = string.join(accum, '') if not d.has_key("encoding"): d["encoding"] = "" + d["background_color"] = mm_cfg.BACKGD_COLOR return self.html_TOC_tmpl % d def html_TOC_entry(self, arch): diff -Pur mailman-2.0-base/Mailman/Cgi/admin.py mailman-2.0/Mailman/Cgi/admin.py --- mailman-2.0-base/Mailman/Cgi/admin.py Thu Sep 28 19:05:04 2000 +++ mailman-2.0/Mailman/Cgi/admin.py Thu Dec 14 18:21:55 2000 @@ -106,7 +106,7 @@ varhelp = qs[0] if varhelp: FormatOptionHelp(doc, varhelp, mlist) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return if cgidata.has_key('bounce_matching_headers'): @@ -133,7 +133,7 @@ until you fix this problem.''') FormatConfiguration(doc, mlist, category, category_suffix, cgidata) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) finally: mlist.Save() mlist.Unlock() @@ -150,7 +150,7 @@ table = Table(border=0, width="100%") table.AddRow([Center(Header(2, legend))]) table.AddCellInfo(max(table.GetCurrentRowIndex(), 0), 0, - colspan=2, bgcolor="#99ccff") + colspan=2, bgcolor=mm_cfg.MAJOR_COLOR) advertised = [] names = Utils.list_names() @@ -217,7 +217,7 @@ doc.AddItem(table) doc.AddItem('
') doc.AddItem(MailmanLogo()) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) @@ -308,7 +308,7 @@ label = v big_table.AddRow([Center(Header(2, label))]) big_table.AddCellInfo(max(big_table.GetCurrentRowIndex(), 0), 0, - colspan=2, bgcolor="#99ccff") + colspan=2, bgcolor=mm_cfg.MAJOR_COLOR) def ColHeader(big_table = big_table): big_table.AddRow([Center(Bold('Description')), Center(Bold('Value'))]) @@ -356,9 +356,9 @@ val = GetItemGuiValue(mlist, kind, varname, params) table.AddRow([descr, val]) table.AddCellInfo(max(table.GetCurrentRowIndex(), 0), 1, - bgcolor="#cccccc") + bgcolor=mm_cfg.FIELD_COLOR) table.AddCellInfo(max(table.GetCurrentRowIndex(), 0), 0, - bgcolor="#cccccc") + bgcolor=mm_cfg.FIELD_COLOR) @@ -390,7 +390,7 @@ % (mlist.real_name, varname)) header.AddRow([Center(Header(3, legend))]) header.AddCellInfo(max(header.GetCurrentRowIndex(), 0), 0, - colspan=2, bgcolor="#99ccff") + colspan=2, bgcolor=mm_cfg.MAJOR_COLOR) doc.SetTitle("Mailman %s List Option Help" % varname) doc.AddItem(header) doc.AddItem("%s (%s): %s
" % (varname, category, descr)) @@ -516,13 +516,13 @@ header = Table(width="100%") header.AddRow([Center(Header(2, "Membership Management"))]) header.AddCellInfo(max(header.GetCurrentRowIndex(), 0), 0, - colspan=2, bgcolor="#99ccff") + colspan=2, bgcolor=mm_cfg.MAJOR_COLOR) container.AddItem(header) user_table = Table(width="90%", border='2') user_table.AddRow([Center(Header(4, "Membership List"))]) user_table.AddCellInfo(user_table.GetCurrentRowIndex(), user_table.GetCurrentCellIndex(), - bgcolor="#cccccc", colspan=8) + bgcolor=mm_cfg.FIELD_COLOR, colspan=8) user_table.AddRow( [Center(Italic("(%s members total, max. %s at a time displayed)" % (len(mlist.members) @@ -530,7 +530,7 @@ mlist.admin_member_chunksize)))]) user_table.AddCellInfo(user_table.GetCurrentRowIndex(), user_table.GetCurrentCellIndex(), - bgcolor="#cccccc", colspan=8) + bgcolor=mm_cfg.FIELD_COLOR, colspan=8) user_table.AddRow(map(Center, ['member address', 'subscr', 'hide', 'nomail', 'ack', 'not metoo', @@ -613,7 +613,7 @@ t.AddRow([Center(Header(4, "Mass Subscribe Members"))]) t.AddCellInfo(t.GetCurrentRowIndex(), t.GetCurrentCellIndex(), - bgcolor="#cccccc", colspan=8) + bgcolor=mm_cfg.FIELD_COLOR, colspan=8) if mlist.send_welcome_msg: nochecked = 0 yeschecked = 1 @@ -636,17 +636,17 @@ def FormatPasswordStuff(): - change_pw_table = Table(bgcolor="#99cccc", border=0, + change_pw_table = Table(bgcolor=mm_cfg.ADMPW_COLOR, border=0, cellspacing=0, cellpadding=2, valign="top") change_pw_table.AddRow( [Bold(Center('To Change The Administrator Password'))]) change_pw_table.AddCellInfo(0, 0, align="left", colspan=2) - old = Table(bgcolor="#99cccc", border=1, + old = Table(bgcolor=mm_cfg.ADMPW_COLOR, border=1, cellspacing=0, cellpadding=2, valign="top") old.AddRow(['
Enter current password:
', PasswordBox('adminpw')]) - new = Table(bgcolor="#99cccc", border=1, + new = Table(bgcolor=mm_cfg.ADMPW_COLOR, border=1, cellspacing=0, cellpadding=2, valign="top") new.AddRow(['
Enter new password:
', PasswordBox('newpw')]) @@ -660,7 +660,7 @@ def FormatSubmit(): - submit = Table(bgcolor="#99ccff", + submit = Table(bgcolor=mm_cfg.MAJOR_COLOR, border=0, cellspacing=0, cellpadding=2) submit.AddRow([Bold(SubmitButton('submit', 'Submit Your Changes'))]) submit.AddCellInfo(submit.GetCurrentRowIndex(), 0, align="middle") @@ -919,7 +919,7 @@ def AddErrorMessage(doc, errmsg, tag='Warning: ', *args): doc.AddItem(Header(3, Bold(FontAttr( - tag, color="#ff0000", size="+2")).Format() + + tag, color=mm_cfg.ERROR_COLOR, size="+2")).Format() + Italic(errmsg % args).Format())) diff -Pur mailman-2.0-base/Mailman/Cgi/admindb.py mailman-2.0/Mailman/Cgi/admindb.py --- mailman-2.0-base/Mailman/Cgi/admindb.py Thu Sep 28 19:05:05 2000 +++ mailman-2.0/Mailman/Cgi/admindb.py Thu Dec 14 18:00:15 2000 @@ -43,7 +43,7 @@ link = link + '/' link = link + 'admin' doc.AddItem(Link(link, 'list of available mailing lists.')) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) @@ -89,7 +89,7 @@ else: doc.SetTitle("%s Admindb" % mlist.real_name) PrintRequests(mlist, doc) - text = doc.Format(bgcolor="#ffffff") + text = doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) print text finally: mlist.Save() diff -Pur mailman-2.0-base/Mailman/Cgi/edithtml.py mailman-2.0/Mailman/Cgi/edithtml.py --- mailman-2.0-base/Mailman/Cgi/edithtml.py Thu Sep 28 19:05:05 2000 +++ mailman-2.0/Mailman/Cgi/edithtml.py Thu Dec 14 18:28:11 2000 @@ -42,7 +42,7 @@ parts = Utils.GetPathPieces() if not parts: doc.AddItem(Header(2, "List name is required.")) - print doc.Format(bgcolor='#ffffff') + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return listname = string.lower(parts[0]) @@ -50,7 +50,7 @@ mlist = MailList.MailList(listname, lock=0) except Errors.MMListError, e: doc.AddItem(Header(2, 'No such list %s' % listname)) - print doc.Format(bgcolor='#ffffff') + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) syslog('error', 'No such list "%s": %s\n' % (listname, e)) return @@ -77,7 +77,7 @@ doc.SetTitle('Edit HTML : Error') doc.AddItem(Header(2, "%s: Invalid template" % template_name)) doc.AddItem(mlist.GetMailmanFooter()) - print doc.Format(bgcolor='#ffffff') + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return else: doc.SetTitle('%s -- HTML Page Editing' % mlist.real_name) @@ -89,7 +89,7 @@ template_list.AddItem(l) doc.AddItem(FontSize("+2", template_list)) doc.AddItem(mlist.GetMailmanFooter()) - print doc.Format(bgcolor='#ffffff') + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return try: @@ -98,7 +98,7 @@ FormatHTML(mlist, doc, template_name, template_info) finally: doc.AddItem(mlist.GetMailmanFooter()) - print doc.Format(bgcolor='#ffffff') + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) diff -Pur mailman-2.0-base/Mailman/Cgi/handle_opts.py mailman-2.0/Mailman/Cgi/handle_opts.py --- mailman-2.0-base/Mailman/Cgi/handle_opts.py Thu Nov 9 10:19:03 2000 +++ mailman-2.0/Mailman/Cgi/handle_opts.py Thu Dec 14 18:00:15 2000 @@ -42,7 +42,7 @@ replacements[''] = operation output = mlist.ParseTags('handle_opts.html', replacements) doc.AddItem(output) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) # hrm... sys.exit(0) @@ -54,7 +54,7 @@ if not parts or len(parts) < 2: doc.AddItem(Header(2, "Error")) doc.AddItem(Bold("Invalid options to CGI script.")) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return listname = string.lower(parts[0]) @@ -65,7 +65,7 @@ except Errors.MMListError, e: doc.AddItem(Header(2, "Error")) doc.AddItem(Bold('No such list %s' % listname)) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) syslog('error', 'No such list "%s": %s\n' % (listname, e)) return @@ -170,7 +170,7 @@ for name, link in all_links: items.AddItem(link) doc.AddItem(items) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) elif form.has_key("changepw"): if form.has_key('opw') and \ diff -Pur mailman-2.0-base/Mailman/Cgi/listinfo.py mailman-2.0/Mailman/Cgi/listinfo.py --- mailman-2.0-base/Mailman/Cgi/listinfo.py Thu Sep 28 19:05:05 2000 +++ mailman-2.0/Mailman/Cgi/listinfo.py Thu Dec 14 18:00:15 2000 @@ -71,7 +71,7 @@ table = Table(border=0, width="100%") table.AddRow([Center(Header(2, legend))]) table.AddCellInfo(max(table.GetCurrentRowIndex(), 0), 0, - colspan=2, bgcolor="#99ccff") + colspan=2, bgcolor=mm_cfg.MAJOR_COLOR) advertised = [] names = Utils.list_names() @@ -142,7 +142,7 @@ doc.AddItem(table) doc.AddItem('
') doc.AddItem(MailmanLogo()) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) diff -Pur mailman-2.0-base/Mailman/Cgi/private.py mailman-2.0/Mailman/Cgi/private.py --- mailman-2.0-base/Mailman/Cgi/private.py Mon Oct 2 15:52:35 2000 +++ mailman-2.0/Mailman/Cgi/private.py Thu Dec 14 18:34:06 2000 @@ -35,7 +35,7 @@ %(listname)s Private Archives Authentication - +
@@ -96,7 +96,7 @@ if not parts: doc.SetTitle("Private Archive Error") doc.AddItem(Header(3, "You must specify a list.")) - print doc.Format(bgcolor="#FFFFFF") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) sys.exit(0) path = os.environ.get('PATH_INFO') @@ -133,7 +133,7 @@ msg = 'No such list %s' % listname doc.SetTitle("Private Archive Error - %s" % msg) doc.AddItem(Header(2, msg)) - print doc.Format(bgcolor="#FFFFFF") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) syslog('error', 'No such list "%s": %s\n' % (listname, e)) sys.exit(0) @@ -174,6 +174,7 @@ while path and path[0] == '/': path=path[1:] # Remove leading /'s basepath = os.path.split(mlist.GetBaseArchiveURL())[0] listname = mlist.real_name + background_color = mm_cfg.BACKGD_COLOR print page % vars() sys.exit(0) diff -Pur mailman-2.0-base/Mailman/Cgi/subscribe.py mailman-2.0/Mailman/Cgi/subscribe.py --- mailman-2.0-base/Mailman/Cgi/subscribe.py Thu Sep 28 19:05:05 2000 +++ mailman-2.0/Mailman/Cgi/subscribe.py Thu Dec 14 18:25:28 2000 @@ -36,7 +36,7 @@ if not parts: doc.AddItem(Header(2, "Error")) doc.AddItem(Bold('Invalid options to CGI script')) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return listname = string.lower(parts[0]) @@ -46,7 +46,7 @@ except Errors.MMListError, e: doc.AddItem(Header(2, "Error")) doc.AddItem(Bold('No such list %s' % listname)) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) syslog('error', 'No such list "%s": %s\n' % (listname, e)) return try: @@ -87,7 +87,7 @@ doc.AddItem(Header(2, "Error")) doc.AddItem(Bold("You must supply your email address.")) doc.AddItem(mlist.GetMailmanFooter()) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return addr = form['info'].value @@ -97,7 +97,7 @@ doc.AddItem(Bold("%s has no subscribed addr %s." % (mlist.real_name, addr))) doc.AddItem(mlist.GetMailmanFooter()) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) return call_script(mlist, member, 'options') @@ -217,7 +217,7 @@ replacements[''] = results output = mlist.ParseTags('subscribe.html', replacements) doc.AddItem(output) - print doc.Format(bgcolor="#ffffff") + print doc.Format(bgcolor=mm_cfg.BACKGD_COLOR) diff -Pur mailman-2.0-base/Mailman/Defaults.py.in mailman-2.0/Mailman/Defaults.py.in --- mailman-2.0-base/Mailman/Defaults.py.in Wed Nov 15 22:23:52 2000 +++ mailman-2.0/Mailman/Defaults.py.in Thu Dec 14 18:00:15 2000 @@ -478,6 +478,28 @@ ##### +# HTML formatting defaults +##### +BACKGD_COLOR = "#FFFFFF" # Page background +MAJOR_COLOR = "#99CCFF" # Major section headers +MINOR_COLOR = "#FFF0D0" # Minor section headers +UINFO_COLOR = "#DDDDDD" # User name and password changes +ADMPW_COLOR = "#99CCCC" # List admin password changes +FIELD_COLOR = "#CCCCCC" # List admin field descriptions +OPTION_COLOR = "#DCDCDC" # User option field descriptions +TEXT_COLOR = "#000000" # Primary text color +ERROR_COLOR = "#FF66CC" # Error text color +LINK_COLOR = "" # If nonnull, forces LINK= in Document() +ALINK_COLOR = "" # If nonnull, forces ALINK= in Document() +VLINK_COLOR = "" # If nonnull, forces VLINK= in Document() + +# HTML to contain each page in a localized container -- site banner, etc. +GLOBAL_HEADER = "" +GLOBAL_FOOTER = "" + + + +##### # Nothing below here is user configurable. Most of these values are in this # file for convenience. Don't change any of them or override any of them in # your mm_cfg.py file! diff -Pur mailman-2.0-base/Mailman/HTMLFormatter.py mailman-2.0/Mailman/HTMLFormatter.py --- mailman-2.0-base/Mailman/HTMLFormatter.py Sat Sep 9 14:13:58 2000 +++ mailman-2.0/Mailman/HTMLFormatter.py Thu Dec 14 18:00:15 2000 @@ -368,6 +368,13 @@ '' : self.GetAdminEmail(), '' : self.FormatReminder(), '' : self.host_name, + '' : mm_cfg.MAJOR_COLOR, + '' : mm_cfg.MINOR_COLOR, + '' : mm_cfg.OPTION_COLOR, + '' : mm_cfg.UINFO_COLOR, + '' : mm_cfg.FIELD_COLOR, + '' : mm_cfg.BACKGD_COLOR, + '' : mm_cfg.TEXT_COLOR, } def GetAllReplacements(self): diff -Pur mailman-2.0-base/Mailman/htmlformat.py mailman-2.0/Mailman/htmlformat.py --- mailman-2.0-base/Mailman/htmlformat.py Mon Sep 11 23:02:36 2000 +++ mailman-2.0/Mailman/htmlformat.py Thu Dec 14 18:00:15 2000 @@ -280,6 +280,12 @@ output.append('%s' % tab) output.append('%s' % (tab, string.join(quals, ' '))) diff -Pur mailman-2.0-base/templates/admlogin.html mailman-2.0/templates/admlogin.html --- mailman-2.0-base/templates/admlogin.html Thu Dec 14 17:45:37 2000 +++ mailman-2.0/templates/admlogin.html Thu Dec 14 18:00:15 2000 @@ -2,13 +2,13 @@ <MM-List-Name> Administrative Authentication - +

- diff -Pur mailman-2.0-base/templates/admlogin.txt mailman-2.0/templates/admlogin.txt --- mailman-2.0-base/templates/admlogin.txt Thu Jul 20 15:23:33 2000 +++ mailman-2.0/templates/admlogin.txt Thu Dec 14 18:00:15 2000 @@ -2,13 +2,13 @@ %(listname)s Administrative Authentication - + %(message)s

ALIGN="CENTER"> - SIZE="+1"> Administrative + + Administrative Authentication

- diff -Pur mailman-2.0-base/templates/listinfo.html mailman-2.0/templates/listinfo.html --- mailman-2.0-base/templates/listinfo.html Tue Nov 16 10:50:33 1999 +++ mailman-2.0/templates/listinfo.html Thu Dec 14 18:00:15 2000 @@ -4,14 +4,14 @@ <MM-List-Name> Info Page - +

- %(listname)s Administrative + + %(listname)s Administrative Authentication

- @@ -21,8 +21,8 @@ - @@ -36,8 +36,8 @@ - @@ -50,8 +50,8 @@ - @@ -64,7 +64,7 @@

- -- + + --

- About + + About

- Using + + Using

- Subscribing to + + Subscribing to

- + @@ -78,11 +78,11 @@ - + - + @@ -102,9 +102,9 @@ - diff -Pur mailman-2.0-base/templates/options.html mailman-2.0/templates/options.html --- mailman-2.0-base/templates/options.html Wed Nov 24 11:52:56 1999 +++ mailman-2.0/templates/options.html Thu Dec 14 18:00:15 2000 @@ -4,10 +4,10 @@ <MM-Presentable-User> Configuration for <MM-List-Name> - +

Your email address: Your email address:

Pick a password: Pick a password:

Reenter password to confirm: Reenter password to confirm:

+ - Subscribers + Subscribers

-
- +
+ Configuration for

@@ -24,9 +24,9 @@ - @@ -51,7 +51,7 @@
+
Unsubscribing from - + Your other subscriptions

- @@ -74,15 +74,15 @@
Change Your Password
+
Your Password

- + - + - +

Old password: Old password:

New password: New password:

Again to confirm: Again to confirm:

@@ -93,7 +93,7 @@ -
+
Your Subscription Options

@@ -101,7 +101,7 @@ Current values are checked.

- - - - - - -
+
Disable mail delivery
Turn this on if you want mail to not be delivered to you for a little while.
@@ -109,7 +109,7 @@ On

+
Set Digest Mode
If you turn digest mode on, you'll get posts bundled together once a day, instead singly when they're sent. If digest mode is changed from @@ -117,28 +117,28 @@ Off On

+
Get MIME or Plain Text Digests?
If you have any problems with MIME digests, select plain text.
MIME Plain Text

+
Receive posts you send to the list?
Yes No

+
Receive acknowledgement mail when you send mail to the list?
No Yes

+
Conceal yourself from subscriber list?
No Yes

+
Password:

diff -Pur mailman-2.0-base/templates/roster.html mailman-2.0/templates/roster.html --- mailman-2.0-base/templates/roster.html Thu Apr 9 19:02:48 1998 +++ mailman-2.0/templates/roster.html Thu Dec 14 18:00:15 2000 @@ -4,13 +4,13 @@ <MM-List-Name> Subscribers - +
- @@ -23,15 +23,15 @@ - -

- + + Subscribers

+ - + Non-digested Members of : + - Digested + Digested Members of :

- -- +		+ --
- About +		+ About
- Using +		+ Using
- Subscribing to +		+ Subscribing to

Your email address:	Your email address:
Pick a password:	Pick a password:
Reenter password to confirm:	Reenter password to confirm:
+		- Subscribers + Subscribers

Old password:	Old password:
New password:	New password:
Again to confirm:	Again to confirm:

- +		+ Subscribers
+	- + Non-digested Members of :	+	- Digested + Digested Members of :