Merge lp:~barry/launchpad/430065-person into lp:launchpad

[Barry Warsaw]

[Barry Warsaw (barry)]

= Summary =

This branch fixes bug 430065 which converts the ~person/+editemails and
~person/+changepassword pages to UI 3.0. Along the way, I was able to close
an old bug 180349 which adds some useful links to the mailing list
subscription section on the +editemails page.

== Proposed fix ==

Update the templates and views, fix tests, and do a minimal redesign on the
+editemails page. That page is actually pretty horrendous, but time boxing
only allows for a moderate redesign and improvement. In particular, on the
+editemails page it would be nice to move the Add button to next to the "Add a
new address" text box, but given the way the form is laid out, this isn't
possible.

The ui has been approved by rockstar and edwin.

== Pre-implementation notes ==

None really. By now, conversions are pretty straightforward.

== Implementation details ==

Changes in this branch:

* Get rid of the person-changepassword.pt template altogether, substituting
  generic-edit.pt for it.

* Removed some pagetitles that are no longer necessary.

* Fixed a stylistic nit in launchpad.py Hierarchy class.

* Cleaned up the PersonEditEmailsView implementation. Also, change the
  mailing_list_widgets property implementation to return a dictionary instead
  of the widgets directly. This allowed me to fix bug 180349.

* Update a bunch of doctests.

== Tests ==

% bin/test -vv -t mailinglist -t stories/foaf -t stories/gpg-coc -t conduct

== Demo and Q/A ==

For a person with no preferred email address and no mailing list
subscriptions:

    http://launchpad.dev/~matsubara/+editemails

For a person with a preferred email address but no mailing list subscriptions:

    http://launchpad.dev/~no-priv/+editemails

For a person with several validated email addresses and a mailing list
subscription:

    http://launchpad.dev/~name16/+editemails

To see the change password page:

    http://launchpad.dev/~no-priv/+changepassword

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/stories/mailinglists/subscriptions.txt
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/stories/foaf/xx-validate-email.txt
  lib/lp/registry/templates/person-editemails.pt
  lib/canonical/launchpad/browser/launchpad.py
  lib/lp/registry/stories/foaf/xx-setpreferredemail.txt
  lib/lp/registry/browser/person.py

== Pylint notices ==

lib/lp/registry/browser/person.py
    117: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    118: [F0401] Unable to import 'lazr.config' (No module named config)
    119: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)

[Brad Crittenden (bac)]

Hi Barry,

The changes look good. Thanks for taking the time to make a lot of drive-by fixes.

I've got a few questions below.

--Brad

> === modified file 'lib/lp/registry/browser/person.py'
> --- lib/lp/registry/browser/person.py 2009-09-16 17:07:14 +0000
> +++ lib/lp/registry/browser/person.py 2009-09-16 21:19:47 +0000
> @@ -4086,6 +4086,8 @@
> custom_widget('mailing_list_auto_subscribe_policy',
> LaunchpadRadioWidgetWithDescription)
>
> + label = 'Change your e-mail settings'
> +
> def initialize(self):
> if self.context.is_team:
> # +editemails is not available on teams.
> @@ -4191,13 +4193,11 @@
> which the user is subscribed to this mailing list.
> """
> subscription = mailing_list.getSubscription(self.context)
> - if subscription is not None:
> - if subscription.email_address is None:
> - return "Preferred address"
> - else:
> - return subscription.email_address
> - else:
> + if subscription is None:
> return "Don't subscribe"
> + if subscription.email_address is None:

Hmm, I'd have used an elif.

> + return 'Preferred address'
> + return subscription.email_address
>
> def _mailing_list_fields(self):
> """Creates a field for each mailing list the user can subscribe to.
> @@ -4233,8 +4235,22 @@
> @property
> def mailing_list_widgets(self):
> """Return all the mailing list subscription widgets."""
> - return [widget for widget in self.widgets
> - if 'field.subscription.' in widget.name]
> + mailing_list_set = getUtility(IMailingListSet)
> + widgets = []
> + for widget in self.widgets:
> + if 'field.subscription.' in widget.name:

Why not use 'startswith'? Can it really be anywhere in the name?

> + team_name = widget.label
> + mailing_list = mailing_list_set.get(team_name)
> + assert mailing_list is not None, 'Missing mailing list'
> + widget_dict = dict(
> + team=mailing_list.team,
> + widget=widget,
> + )
> + widgets.append(widget_dict)
> + # We'll put the label in the first column, so don't include it
> + # in the second column.
> + widget.display_label = False
> + return widgets
>
> def _validate_selected_address(self, data, field='VALIDATED_SELECTED'):
> """A generic validator for this view's actions.

> === modified file 'lib/lp/registry/stories/foaf/xx-setpreferredemail.txt'
> --- lib/lp/registry/stories/foaf/xx-setpreferredemail.txt 2008-09-08 13:35:16 +0000
> +++ lib/lp/registry/stories/foaf/xx-setpreferredemail.txt 2009-09-16 21:00:11 +0000
> @@ -1,11 +1,14 @@
> -= A person's contact email address =
> +================================
> +A person's contact email address
> +================================

Thanks for converting this test.

> === modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
> --- lib/lp/registry/stories/maili...

review: Approve (code)

[Barry Warsaw (barry)]

On Sep 16, 2009, at 10:24 PM, Brad Crittenden wrote:

>The changes look good. Thanks for taking the time to make a lot of drive-by fixes.
>
>I've got a few questions below.

Thanks for the review Brad!

>> === modified file 'lib/lp/registry/browser/person.py'
>> --- lib/lp/registry/browser/person.py 2009-09-16 17:07:14 +0000
>> +++ lib/lp/registry/browser/person.py 2009-09-16 21:19:47 +0000
>> @@ -4086,6 +4086,8 @@
>> custom_widget('mailing_list_auto_subscribe_policy',
>> LaunchpadRadioWidgetWithDescription)
>>
>> + label = 'Change your e-mail settings'
>> +
>> def initialize(self):
>> if self.context.is_team:
>> # +editemails is not available on teams.
>> @@ -4191,13 +4193,11 @@
>> which the user is subscribed to this mailing list.
>> """
>> subscription = mailing_list.getSubscription(self.context)
>> - if subscription is not None:
>> - if subscription.email_address is None:
>> - return "Preferred address"
>> - else:
>> - return subscription.email_address
>> - else:
>> + if subscription is None:
>> return "Don't subscribe"
>> + if subscription.email_address is None:
>
>Hmm, I'd have used an elif.

Changed.

>
>> + return 'Preferred address'
>> + return subscription.email_address
>>
>> def _mailing_list_fields(self):
>> """Creates a field for each mailing list the user can subscribe to.
>> @@ -4233,8 +4235,22 @@
>> @property
>> def mailing_list_widgets(self):
>> """Return all the mailing list subscription widgets."""
>> - return [widget for widget in self.widgets
>> - if 'field.subscription.' in widget.name]
>> + mailing_list_set = getUtility(IMailingListSet)
>> + widgets = []
>> + for widget in self.widgets:
>> + if 'field.subscription.' in widget.name:
>
>Why not use 'startswith'? Can it really be anywhere in the name?

Good call. This was cut-and-pasted from the original code, but .startswith()
is better, so I changed this.

>> @@ -87,24 +77,21 @@
>> lists. You can subscribe to a team's mailing list using any of
>> your verified email addresses.</p>
>>
>> - <table class="form">
>> + <table class="listing" style="width: 45em;">
>> <thead>
>> - <th style="white-space:nowrap">For this mailing list...</th>
>> - <td><strong>Subscribe with this address</strong></td>
>> + <th style="white-space:nowrap">For mailing list</th>
>
>Missing semi-colon

Cut-and-paste, but good catch! Changed. Here's the incremental.

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2009-09-16 21:19:47 +0000
+++ lib/lp/registry/browser/person.py 2009-09-16 23:50:16 +0000
@@ -4195,9 +4195,10 @@
         subscription = mailing_list.getSubscription(self.context)
         if subscription is None:
             return "Don't subscribe"
- if subscription.email_address is None:
+ elif subscription.email_address is None:
             return 'Preferred address'
- return subscription.ema...

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2009-09-08 22:42:42 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2009-09-16 19:56:45 +0000
@@ -250,7 +250,7 @@
                 if extra_breadcrumb is not None:
                     breadcrumbs.insert(idx + 1, extra_breadcrumb)
                     break
-        if len(breadcrumbs):
+        if len(breadcrumbs) > 0:
             page_crumb = self.makeBreadcrumbForRequestedPage()
             if page_crumb:
                 breadcrumbs.append(page_crumb)

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-16 17:07:14 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-16 21:27:18 +0000
@@ -657,15 +657,8 @@
 person_answer_contact_for = ContextDisplayName(
     'Projects for which %s is an answer contact')
 
-person_changepassword = 'Change your password'
-
-person_codesofconduct = ContextDisplayName(
-    smartquote("%s's code of conduct signatures"))
-
 person_edit = ContextDisplayName(smartquote("%s's details"))
 
-person_editemails = ContextDisplayName(smartquote("%s's e-mail addresses"))
-
 # person_foaf is an rdf file
 
 person_hwdb_submissions = ContextDisplayName(

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-09-16 17:07:14 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-09-16 21:19:47 +0000
@@ -801,7 +801,7 @@
             for="lp.registry.interfaces.person.IPerson"
             class="lp.registry.browser.person.PersonChangePasswordView"
             permission="launchpad.Edit"
-            template="../templates/person-changepassword.pt"/>
+            template="../../app/templates/generic-edit.pt"/>
         <browser:page
             name="+editlanguages"
             for="lp.registry.interfaces.person.IPerson"

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-09-16 17:07:14 +0000
+++ lib/lp/registry/browser/person.py	2009-09-16 21:19:47 +0000
@@ -4086,6 +4086,8 @@
     custom_widget('mailing_list_auto_subscribe_policy',
                   LaunchpadRadioWidgetWithDescription)
 
+    label = 'Change your e-mail settings'
+
     def initialize(self):
         if self.context.is_team:
             # +editemails is not available on teams.
@@ -4191,13 +4193,11 @@
         which the user is subscribed to this mailing list.
         """
         subscription = mailing_list.getSubscription(self.context)
-        if subscription is not None:
-            if subscription.email_address is None:
-                return "Preferred address"
-            else:
-                return subscription.email_address
-        else:
+        if subscription is None:
             return "Don't subscribe"
+        if subscription.email_address is None:
+            return 'Preferred address'
+        return subscription.email_address
 
     def _mailing_list_fields(self):
         """Creates a field for each mailing list the user can subscribe to.
@@ -4207,10 +4207,12 @@
         """
         mailing_list_set = getUtility(IMailingListSet)
         fields = []
-        terms = [SimpleTerm("Preferred address"),
-                 SimpleTerm("Don't subscribe")]
-        terms += [SimpleTerm(email, email.email)
-                   for email in self.validated_addresses]
+        terms = [
+            SimpleTerm("Preferred address"),
+            SimpleTerm("Don't subscribe"),
+            ]
+        for email in self.validated_addresses:
+            terms.append(SimpleTerm(email, email.email))
         for team in self.context.teams_participated_in:
             mailing_list = mailing_list_set.get(team.name)
             if mailing_list is not None and mailing_list.is_usable:
@@ -4233,8 +4235,22 @@
     @property
     def mailing_list_widgets(self):
         """Return all the mailing list subscription widgets."""
-        return [widget for widget in self.widgets
-                if 'field.subscription.' in widget.name]
+        mailing_list_set = getUtility(IMailingListSet)
+        widgets = []
+        for widget in self.widgets:
+            if 'field.subscription.' in widget.name:
+                team_name = widget.label
+                mailing_list = mailing_list_set.get(team_name)
+                assert mailing_list is not None, 'Missing mailing list'
+                widget_dict = dict(
+                    team=mailing_list.team,
+                    widget=widget,
+                    )
+                widgets.append(widget_dict)
+                # We'll put the label in the first column, so don't include it
+                # in the second column.
+                widget.display_label = False
+        return widgets
 
     def _validate_selected_address(self, data, field='VALIDATED_SELECTED'):
         """A generic validator for this view's actions.
@@ -4479,7 +4495,8 @@
         Valid addresses are the ones presented as options for the mailing
         list widgets.
         """
-        names = [w.context.getName() for w in self.mailing_list_widgets]
+        names = [widget_dict['widget'].context.getName()
+                 for widget_dict in self.mailing_list_widgets]
         self.validate_widgets(data, names)
         return self.errors
 
@@ -4490,7 +4507,8 @@
         mailing_list_set = getUtility(IMailingListSet)
         dirty = False
         prefix_length = len('subscription.')
-        for widget in self.mailing_list_widgets:
+        for widget_dict in self.mailing_list_widgets:
+            widget = widget_dict['widget']
             mailing_list_name = widget.context.getName()[prefix_length:]
             mailing_list = mailing_list_set.get(mailing_list_name)
             new_value = data[widget.context.getName()]

=== modified file 'lib/lp/registry/stories/foaf/xx-setpreferredemail.txt'
--- lib/lp/registry/stories/foaf/xx-setpreferredemail.txt	2008-09-08 13:35:16 +0000
+++ lib/lp/registry/stories/foaf/xx-setpreferredemail.txt	2009-09-16 21:00:11 +0000
@@ -1,11 +1,14 @@
-= A person's contact email address =
+================================
+A person's contact email address
+================================
 
 A person may have many confirmed email address which he may use to
 login with, but only one email address will be the contact email
 address.
 
 
-== Setting the contact email address ==
+Setting the contact email address
+=================================
 
 Sample Person chooses to change his contact email address to the
 address he prefers to login with.
@@ -14,10 +17,10 @@
     >>> browser.open('http://launchpad.dev/~name12')
     >>> browser.getLink('Change details').click()
     >>> browser.getLink('E-mail Settings').click()
-    >>> browser.url
-    'http://launchpad.dev/~name12/+editemails'
-    >>> browser.title
-    "Sample Person's e-mail addresses"
+    >>> print browser.url
+    http://launchpad.dev/~name12/+editemails
+    >>> print browser.title
+    +editemails : Sample Person
 
 Sample Person has a second browser open to the same page; maybe he is
 absent minded.
@@ -62,13 +65,14 @@
     [e-mail] is already set as your contact address.
 
 
-== Unclaimed users ==
+Unclaimed users
+===============
 
 An unclaimed user will probably have no contact email address.
 
    >>> admin_browser.open('http://launchpad.dev/~matsubara')
-   >>> admin_browser.title
-   'Diogo Matsubara does not use Launchpad'
+   >>> print admin_browser.title
+   Diogo Matsubara does not use Launchpad
    >>> admin_browser.getLink('Change e-mail settings').click()
    >>> print find_tag_by_id(admin_browser.contents,
    ...                      'no-contact-address').string

=== modified file 'lib/lp/registry/stories/foaf/xx-validate-email.txt'
--- lib/lp/registry/stories/foaf/xx-validate-email.txt	2009-09-10 23:58:31 +0000
+++ lib/lp/registry/stories/foaf/xx-validate-email.txt	2009-09-16 21:00:11 +0000
@@ -1,4 +1,6 @@
-= Validating an email address =
+===========================
+Validating an email address
+===========================
 
 The user 'salgado' has an unvalidated email address that was probably
 added by gina. Now he wants to validate it.
@@ -10,7 +12,7 @@
     >>> browser = setupBrowser(auth='Basic [e-mail]:zeca')
     >>> browser.open('http://launchpad.dev/~salgado/+editemails')
     >>> print browser.title
-    Guilherme Salgado's e-mail addresses
+    +editemails : Guilherme Salgado
 
     >>> browser.getControl(name="field.UNVALIDATED_SELECTED").getControl(
     ...     value='[e-mail]').selected = True
@@ -79,7 +81,8 @@
     An e-mail message was sent to '[e-mail]'...
 
 
-== Validating the email address string ==
+Validating the email address string
+===================================
 
 Leaving the email address field blank and hitting the 'Add' button
 should display an error message.
@@ -88,8 +91,8 @@
     ''
 
     >>> browser.getControl('Add', index=1).click()
-    >>> browser.title
-    "Guilherme Salgado's e-mail addresses"
+    >>> print browser.title
+    +editemails : Guilherme Salgado
 
     >>> for msg in get_feedback_messages(browser.contents):
     ...     print msg
@@ -99,13 +102,13 @@
 Entering a string that does not look like an email address causes an
 error to be displayed.
 
-    >>> browser.title
-    "Guilherme Salgado's e-mail addresses"
+    >>> print browser.title
+    +editemails : Guilherme Salgado
 
     >>> browser.getControl('Add a new address').value = 'foo'
     >>> browser.getControl('Add', index=1).click()
-    >>> browser.title
-    "Guilherme Salgado's e-mail addresses"
+    >>> print browser.title
+    +editemails : Guilherme Salgado
 
     >>> for msg in get_feedback_messages(browser.contents):
     ...     print msg
@@ -117,8 +120,8 @@
 will not run. A malicious hacker cannot use a XSS vulnerability to gain
 information about Launchpad users.
 
-    >>> browser.title
-    "Guilherme Salgado's e-mail addresses"
+    >>> print browser.title
+    +editemails : Guilherme Salgado
 
     >>> browser.getControl('Add a new address').value = (
     ...     "[e-mail]<br/><script>window.alert('XSS')</script>")
@@ -130,7 +133,8 @@
     doesn't seem to be a valid email address.
 
 
-== +editemails for teams ==
++editemails for teams
+=====================
 
 Because people and teams share the same namespace, it used to be possible to
 hack the url to get to a team's +editemails page.  This makes no sense, and

=== modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
--- lib/lp/registry/stories/mailinglists/subscriptions.txt	2009-09-14 01:28:41 +0000
+++ lib/lp/registry/stories/mailinglists/subscriptions.txt	2009-09-16 21:00:11 +0000
@@ -85,8 +85,10 @@
     >>> browser.open('http://launchpad.dev/~carlos')
     >>> browser.getLink("Change details").click()
     >>> browser.getLink("E-mail Settings").click()
-    >>> browser.title
-    "Carlos Perell\xc3\xb3 Mar\xc3\xadn's e-mail addresses"
+
+    >>> from canonical.launchpad.helpers import backslashreplace
+    >>> print backslashreplace(browser.title)
+    +editemails : Carlos Perell\xf3 Mar\xedn
 
     >>> admins = browser.getControl(name='field.subscription.admins')
     >>> rosetta_admins = browser.getControl(
@@ -211,8 +213,8 @@
     >>> browser.open('http://launchpad.dev/~carlos')
     >>> browser.getLink("Change details").click()
     >>> browser.getLink("E-mail Settings").click()
-    >>> browser.title
-    "Carlos Perell\xc3\xb3 Mar\xc3\xadn's e-mail addresses"
+    >>> print backslashreplace(browser.title)
+    +editemails : Carlos Perell\xf3 Mar\xedn
 
     >>> rosetta_admins = browser.getControl(
     ...     name='field.subscription.rosetta-admins')
@@ -245,8 +247,8 @@
     >>> browser.open('http://launchpad.dev/~jdub')
     >>> browser.getLink("Change details").click()
     >>> browser.getLink("E-mail Settings").click()
-    >>> browser.title
-    "Jeff Waugh's e-mail addresses"
+    >>> print browser.title
+    +editemails : Jeff Waugh
 
     >>> browser.getControl(
     ...     name='field.subscription.rosetta-admins')
@@ -270,8 +272,8 @@
     >>> browser.open('http://launchpad.dev/~jdub')
     >>> browser.getLink("Change details").click()
     >>> browser.getLink("E-mail Settings").click()
-    >>> browser.title
-    "Jeff Waugh's e-mail addresses"
+    >>> print browser.title
+    +editemails : Jeff Waugh
 
     >>> rosetta_team = browser.getControl(
     ...     name='field.subscription.rosetta-admins')
@@ -472,8 +474,8 @@
     >>> browser.open('http://launchpad.dev/~carlos')
     >>> browser.getLink("Change details").click()
     >>> browser.getLink("E-mail Settings").click()
-    >>> browser.title
-    "Carlos Perell\xc3\xb3 Mar\xc3\xadn's e-mail addresses"
+    >>> print backslashreplace(browser.title)
+    +editemails : Carlos Perell\xf3 Mar\xedn
 
 Carlos's default setting, 'Ask me when I join a team', is still in place.
 

=== removed file 'lib/lp/registry/templates/person-changepassword.pt'
--- lib/lp/registry/templates/person-changepassword.pt	2009-07-18 00:05:49 +0000
+++ lib/lp/registry/templates/person-changepassword.pt	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/onecolumn"
-  i18n:domain="launchpad"
->
-  <body>
-
-  <metal:style fill-slot="head_epilogue">
-    <style type="text/css">
-      #launchpad-form-widgets th {
-        width: 12em;
-        }
-    </style>
-  </metal:style>
-
-
-  <div metal:fill-slot="main">
-
-    <div metal:use-macro="context/@@launchpad_form/form">
-
-    </div>
-
-  </div>
-
-</body>
-</html>

=== modified file 'lib/lp/registry/templates/person-editemails.pt'
--- lib/lp/registry/templates/person-editemails.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-editemails.pt	2009-09-16 21:00:11 +0000
@@ -3,35 +3,25 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/onecolumn"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
   <body>
 <div metal:fill-slot="main">
   <div metal:use-macro="context/@@launchpad_form/form">
     <metal:extra-info fill-slot="extra_info">
-      <h1>Change your e-mail settings</h1>
       <h2>Your e-mail addresses</h2>
-      <tal:block condition="context/preferredemail">
-        <p>Your preferred contact address for all Launchpad e-mail is:</p>
-        <ul id="preferred-email">
-          <li class="mail"><b tal:content="context/preferredemail/email" /></li>
-        </ul>
-      </tal:block>
-
-      <tal:block tal:condition="not: context/preferredemail">
-        <p id="no-contact-address">
-          Currently you don't have a contact address in
-          Launchpad.
-        </p>
-      </tal:block>
+      <p tal:condition="context/preferredemail">
+        Your preferred contact address for all Launchpad e-mail is:
+        <b tal:content="context/preferredemail/email" />
+      </p>
+      <p tal:condition="not: context/preferredemail"
+         id="no-contact-address">
+          Currently you don't have a contact address in Launchpad.
+      </p>
     </metal:extra-info>
 
     <metal:widgets fill-slot="widgets">
-
       <table class="form">
         <tal:validated tal:condition="view/validated_addresses">
           <tal:widget define="widget nocall:view/widgets/VALIDATED_SELECTED">
@@ -87,24 +77,21 @@
       lists. You can subscribe to a team's mailing list using any of
       your verified email addresses.</p>
 
-    <table class="form">
+    <table class="listing" style="width: 45em;">
       <thead>
-        <th style="white-space:nowrap">For this mailing list...</th>
-        <td><strong>Subscribe with this address</strong></td>
+        <th style="white-space:nowrap">For mailing list</th>
+        <th>Subscribe with</th>
       </thead>
       <tbody>
-        <metal:block tal:repeat="widget view/mailing_list_widgets">
-          <metal:block use-macro="context/@@launchpad_form/widget_row" />
-        </metal:block>
-          <tr>
-            <td></td>
-            <td>
-              <input tal:replace="structure
-                     view/action_update_subscriptions/render" />
-            </td>
-          </tr>
+        <tr tal:repeat="widget view/mailing_list_widgets">
+          <td tal:content="structure widget/team/fmt:link">Team</td>
+          <td tal:content="structure widget/widget">Widget</td>
+        </tr>
       </tbody>
     </table>
+    <div style="padding-top: 1em; padding-bottom: 1em;">
+      <input tal:replace="structure view/action_update_subscriptions/render" />
+    </div>
   </form>
 
   <form action=""
@@ -128,7 +115,7 @@
             <th style="white-space:nowrap; text-align:left;">
               <div style="margin-bottom: 1em;">
                 <label tal:attributes="for widget/name"
-		       tal:content="structure widget/label" />
+                       tal:content="structure widget/label" />
               </div>
             </th>
             <td></td>
@@ -140,8 +127,8 @@
           <tr>
             <td>
               <input
-		 tal:replace="structure
-			      view/action_update_autosubscribe_policy/render" />
+                 tal:replace="structure
+                              view/action_update_autosubscribe_policy/render" />
             </td>
             <td></td>
           </tr>
@@ -152,37 +139,5 @@
   </form>
 
 </div>
-
-<div metal:fill-slot="help">
-  <p>
-    This page displays all the email addresses associated with your
-    Launchpad account. Some of these addresses are verified (known to
-    be associated with you), but some may need confirmation before you
-    can use them in Launchpad.
-  </p>
-
-  <p>
-    When you confirm that an address is yours, Launchpad will send a
-    verification email to that address. To complete the verification
-    process, simply visit the URL contained in the email.
-  </p>
-
-  <p>
-    You may choose one of your verified addresses to be your
-    preferred email address. Email from Launchpad will be sent to
-    this address.
-  </p>
-
-  <p id="mailing-list-help" tal:condition="view/mailing_list_widgets">
-    This page also displays mailing lists for all of your
-    teams that have them. You can subscribe to a list using any of
-    your verified email addresses, or you can choose to have messages
-    delivered to your preferred address. That way, if you change your
-    preferred address, you won't have to change all your subscriptions
-    to use the new address.
-  </p>
-
-</div>
-
 </body>
 </html>