Update of /cvsroot/mailman/mailman/Mailman/Cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14160/Mailman/Cgi

Modified Files:
      Tag: Release_2_1-maint
        admin.py edithtml.py 
Log Message:
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


Index: admin.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/admin.py,v
retrieving revision 2.86.2.6
retrieving revision 2.86.2.7
diff -u -d -r2.86.2.6 -r2.86.2.7
--- admin.py    24 Dec 2003 17:27:45 -0000      2.86.2.6
+++ admin.py    28 Dec 2004 04:11:57 -0000      2.86.2.7
@@ -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 @@
     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>')

Index: edithtml.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/edithtml.py,v
retrieving revision 2.16
retrieving revision 2.16.2.1
diff -u -d -r2.16 -r2.16.2.1
--- edithtml.py 22 May 2002 03:00:18 -0000      2.16
+++ edithtml.py 28 Dec 2004 04:11:59 -0000      2.16.2.1
@@ -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 @@
         ('listinfo.html',    _('General list information page')),
         ('subscribe.html',   _('Subscribe results page')),
         ('options.html',     _('User specific options page')),
+        ('subscribeack.txt', _('Welcome email text file')),
         )
 
     _ = i18n._

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to