aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Mailman/Cgi/confirm.py6
-rw-r--r--NEWS4
2 files changed, 7 insertions, 3 deletions
diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py
index 214d1b3f..95b33dca 100644
--- a/Mailman/Cgi/confirm.py
+++ b/Mailman/Cgi/confirm.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2010 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
@@ -300,8 +300,8 @@ def subscription_prompt(mlist, doc, cookie, userdesc):
table.AddRow([Hidden('cookie', cookie)])
table.AddCellInfo(table.GetCurrentRowIndex(), 0, colspan=2)
table.AddRow([
- Label(SubmitButton('cancel', _('Cancel my subscription request'))),
- SubmitButton('submit', _('Subscribe to list %(listname)s'))
+ Label(SubmitButton('submit', _('Subscribe to list %(listname)s'))),
+ SubmitButton('cancel', _('Cancel my subscription request'))
])
form.AddItem(table)
doc.AddItem(form)
diff --git a/NEWS b/NEWS
index 64ad6f68..25dc54a1 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Reordered the 'cancel' and 'subscribe' buttons on the subscription
+ confirmation web page so the default action upon 'enter' will be the
+ subscribe button in browsers that pick the first button. Bug #530654.
+
- Fixed a bug in the admindb interface that could apply a moderator
action to a message not displayed. Bug #533468.