aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Cgi
diff options
context:
space:
mode:
authorbwarsaw <>2004-12-28 04:11:59 +0000
committerbwarsaw <>2004-12-28 04:11:59 +0000
commit945a7a6d824dcb262ba06d23f2e92c06c630eae6 (patch)
tree2f455802f830a7058625bca35fc66e22545d9238 /Mailman/Cgi
parent4dda127d809171eb51d77a8c20ef1ad46f54b546 (diff)
downloadmailman2-945a7a6d824dcb262ba06d23f2e92c06c630eae6.tar.gz
mailman2-945a7a6d824dcb262ba06d23f2e92c06c630eae6.tar.xz
mailman2-945a7a6d824dcb262ba06d23f2e92c06c630eae6.zip
admin.py:
show_results(): Slightly reworded the "Edit the public..." link to include a reference to the public text files, e.g. the welcome message. edithtml.py Grant Bowman's patch # 1085501 to allow editing the welcome message via the admin page. inthenews.ht More names ACKNOWLEDGMENTS, NEWS Updates for #1085501
Diffstat (limited to 'Mailman/Cgi')
-rw-r--r--Mailman/Cgi/admin.py8
-rw-r--r--Mailman/Cgi/edithtml.py9
2 files changed, 8 insertions, 9 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index cbe0a410..31e41a3d 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2004 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -14,9 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-"""Process and produce the list-administration options forms.
-
-"""
+"""Process and produce the list-administration options forms."""
# For Python 2.1.x compatibility
from __future__ import nested_scopes
@@ -413,7 +411,7 @@ def show_results(mlist, doc, category, subcat, cgidata):
otherlinks.AddItem(Link(mlist.GetScriptURL('listinfo'),
_('Go to the general list information page')))
otherlinks.AddItem(Link(mlist.GetScriptURL('edithtml'),
- _('Edit the public HTML pages')))
+ _('Edit the public HTML pages and text files')))
otherlinks.AddItem(Link(mlist.GetBaseArchiveURL(),
_('Go to list archives')).Format() +
'<br>&nbsp;<br>')
diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py
index cd235162..493763b4 100644
--- a/Mailman/Cgi/edithtml.py
+++ b/Mailman/Cgi/edithtml.py
@@ -1,17 +1,17 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2004 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""Script which implements admin editing of the list's html templates."""
@@ -43,6 +43,7 @@ def main():
('listinfo.html', _('General list information page')),
('subscribe.html', _('Subscribe results page')),
('options.html', _('User specific options page')),
+ ('subscribeack.txt', _('Welcome email text file')),
)
_ = i18n._