Merge lp:~bac/launchpad/bug-421983 into lp:launchpad

[Brad Crittenden]

[Brad Crittenden (bac)]

= Summary =

Bug 421983 is about converting the pages for joining, leaving, and self-renewal of
team membership to UI 3.0.

== Proposed fix ==

Ideally this would've been a very fast, mechanical change. Unfortunately the first
two pages were created before the Bronze Age using only rocks, goat intestines, and
spittle. I converted them to use LaunchpadFormView, refactored a bunch of stuff,
changed non-conforming names, and did general clean up. The conversion to LPFV
required changes to test code that referred to the actual form element names.

== Pre-implementation notes ==

None.

== Implementation details ==

As above.

== Tests ==

bin/test -vvm lp.registry

== Demo and Q/A ==

* Log in as karl. Join and leave ~testing-spanish-team.
* Try to join to a team you have already joined and to unsubscribe from a team you
haven't joined.
* As mark create and approve a mailing list for ~testing-spanish-team. Don't forget
to start with 'make run_all'.
* Demoing the self-renewal is a little more involved. As mark, set the team renewal
policy to allow self-renewal and put in a renewal period. Then go to the (hidden, I
think) URL https://launchpad.dev/~testing-spanish-team/+member/karl and set him to
expire within a few days. Then as an karl go to
https://launchpad.dev/+expiringmembership and do the renewal.

= 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/stories/mailinglists/subscriptions.txt
  lib/lp/registry/browser/tests/team-join-views.txt
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/templates/team-join.pt
  lib/lp/registry/browser/person.py
  lib/lp/registry/templates/teammembership-self-renewal.pt
  lib/lp/registry/templates/team-leave.pt
  lib/lp/registry/templates/team-portlet-membership.pt

== XmlLint notices ==

lib/lp/registry/templates/team-portlet-membership.pt
    131: parser error : Opening and ending tag mismatch: div line 7 and tal:root
    </tal:root>
    ^
    132: parser error : Premature end of data in tag root line 1

    ^

== Pylint notices ==

lib/lp/registry/browser/person.py
    1198: [C0301] Line too long (79/78)
    1285: [C0301] Line too long (79/78)
    3139: [W0311] Bad indentation. Found 10 spaces, expected 12
    3143: [W0311] Bad indentation. Found 10 spaces, expected 12
    3856: [C0301] Line too long (79/78)
    119: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    120: [F0401] Unable to import 'lazr.config' (No module named config)
    121: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)

I'll find which of these are real and fix them.

[Celso Providelo (cprov)]

Hi Bac,

The changes look very good, you can land it as long as you fix the lint issues.

You've done a fantastic job updating the views to the 21st century!

Thank you.

review: Approve (code)

[Paul Hummer (rockstar)]

review: Approve (ui)

[Barry Warsaw (barry)]

Brad, the pages look good. I was not able to view the +expiringmembership page unfortunately, but the leave and join pages look fine, with one caveat. The headers and title are not correct, but there's nothing (good) you can do about that right now. After my branch for bug 417089 lands, you'll need to update the templates and views to conform them to the 3.0 UI standard. It should be an easy upgrade though, and a lot of pages will need updating, so I'll mark this ui=me under that condition.

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-02 12:37:58 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-03 17:20:42 +0000
@@ -1166,10 +1166,6 @@
 
 team_invitations = ContextBrowsername("Invitations sent to %s")
 
-team_join = ContextBrowsername('Join %s')
-
-team_leave = ContextBrowsername('Leave %s')
-
 team_mailinglist = 'Configure mailing list'
 
 team_mailinglist_moderate = 'Moderate mailing list'
@@ -1193,11 +1189,6 @@
     return "Make %s a member of %s" % (
         context.person.displayname, context.team.displayname)
 
-def teammembership_self_renewal(context, view):
-    """Return the page title renew membership in a team."""
-    return "Renew membership of %s in %s" % (
-        context.person.displayname, context.team.displayname)
-
 team_mentoringoffers = ContextTitle('Mentoring available for newcomers to %s')
 
 team_newpoll = ContextTitle('New poll for team %s')

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-09-01 21:49:24 +0000
+++ lib/lp/registry/browser/person.py	2009-09-03 17:20:42 +0000
@@ -8,7 +8,6 @@
 __metaclass__ = type
 
 
-
 __all__ = [
     'BeginTeamClaimView',
     'BugSubscriberPackageBugsSearchListingView',
@@ -481,30 +480,37 @@
     template = ViewPageTemplateFile(
         '../templates/teammembership-self-renewal.pt')
 
+    @property
+    def page_title(self):
+        return "Renew membership of %s in %s" % (
+            self.context.person.displayname, self.context.team.displayname)
+
     def __init__(self, context, request):
         # Only the member himself or admins of the member (in case it's a
         # team) can see the page in which they renew memberships that are
         # about to expire.
         if not check_permission('launchpad.Edit', context.person):
             raise Unauthorized(
-                "Only the member himself can renew his memberships.")
+                "You may not renew the membership for %s." %
+                context.person.displayname)
         LaunchpadFormView.__init__(self, context, request)
 
     def browserDefault(self, request):
         return self, ()
 
-    def getReasonForDeniedRenewal(self):
+    @property
+    def get_reason_for_denied_renewal(self):
         """Return text describing why the membership can't be renewed."""
         context = self.context
         ondemand = TeamMembershipRenewalPolicy.ONDEMAND
         admin = TeamMembershipStatus.ADMIN
         approved = TeamMembershipStatus.APPROVED
-        date_limit = datetime.now(pytz.timezone('UTC')) - timedelta(
+        date_limit = datetime.now(pytz.UTZ) - timedelta(
             days=DAYS_BEFORE_EXPIRATION_WARNING_IS_SENT)
         if context.status not in (admin, approved):
             text = "it is not active."
         elif context.team.renewal_policy != ondemand:
-            text = ('<a href="%s">%s</a> is not a team which accepts its '
+            text = ('<a href="%s">%s</a> is not a team which allows its '
                     'members to renew their own memberships.'
                     % (canonical_url(context.team),
                        context.team.unique_displayname))
@@ -531,6 +537,10 @@
     def next_url(self):
         return canonical_url(self.context.person)
 
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
     @action(_("Renew"), name="renew")
     def renew_action(self, action, data):
         member = self.context.person
@@ -539,11 +549,6 @@
             _("Membership renewed until ${date}.", mapping=dict(
                     date=self.context.dateexpires.strftime('%Y-%m-%d'))))
 
-    @action(_("Let it Expire"), name="nothing")
-    def do_nothing_action(self, action, data):
-        # Redirect back and wait for the membership to expire automatically.
-        pass
-
 
 class ITeamMembershipInvitationAcknowledgementForm(Interface):
     """Schema for the form in which team admins acknowledge invitations.
@@ -896,7 +901,6 @@
         return Link(target, text)
 
 
-
 class PersonOverviewMenu(ApplicationMenu, CommonMenuLinks):
 
     usedfor = IPerson
@@ -2508,7 +2512,67 @@
             rootsite='answers')
 
 
-class PersonView(LaunchpadView, FeedsMixin):
+class TeamJoinMixin:
+    """Mixin class for views related to joining teams."""
+
+    @property
+    def user_can_subscribe_to_list(self):
+        """Can the user subscribe to this team's mailing list?
+
+        A user can subscribe to the list if the team has an active
+        mailing list, and if they do not already have a subscription.
+        """
+        if self.team_has_mailing_list:
+            # If we are already subscribed, then we can not subscribe again.
+            return not self.user_is_subscribed_to_list
+        else:
+            return False
+
+    @property
+    def user_is_subscribed_to_list(self):
+        """Is the user subscribed to the team's mailing list?
+
+        Subscriptions hang around even if the list is deactivated, etc.
+
+        It is an error to ask if the user is subscribed to a mailing list
+        that doesn't exist.
+        """
+        if self.user is None:
+            return False
+
+        mailing_list = self.context.mailing_list
+        assert mailing_list is not None, "This team has no mailing list."
+        has_subscription = bool(mailing_list.getSubscription(self.user))
+        return has_subscription
+
+    @property
+    def team_has_mailing_list(self):
+        """Is the team mailing list available for subscription?"""
+        mailing_list = self.context.mailing_list
+        return mailing_list is not None and mailing_list.is_usable
+
+    @property
+    def user_is_active_member(self):
+        """Return True if the user is an active member of this team."""
+        return userIsActiveTeamMember(self.context)
+
+    @property
+    def user_is_proposed_member(self):
+        """Return True if the user is a proposed member of this team."""
+        if self.user is None:
+            return False
+        return self.user in self.context.proposedmembers
+
+    @property
+    def user_can_request_to_leave(self):
+        """Return true if the user can request to leave this team.
+
+        A given user can leave a team only if he's an active member.
+        """
+        return self.user_is_active_member
+
+
+class PersonView(LaunchpadView, FeedsMixin, TeamJoinMixin):
     """A View class used in almost all Person's pages."""
 
     @cachedproperty
@@ -2619,42 +2683,6 @@
             raise AssertionError('Unknown subscription policy.')
         return description
 
-    @property
-    def user_can_subscribe_to_list(self):
-        """Can the user subscribe to this team's mailing list?
-
-        A user can subscribe to the list if the team has an active
-        mailing list, and if they do not already have a subscription.
-        """
-        if self.team_has_mailing_list:
-            # If we are already subscribed, then we can not subscribe again.
-            return not self.user_is_subscribed_to_list
-        else:
-            return False
-
-    @property
-    def user_is_subscribed_to_list(self):
-        """Is the user subscribed to the team's mailing list?
-
-        Subscriptions hang around even if the list is deactivated, etc.
-
-        It is an error to ask if the user is subscribed to a mailing list
-        that doesn't exist.
-        """
-        if self.user is None:
-            return False
-
-        mailing_list = self.context.mailing_list
-        assert mailing_list is not None, "This team has no mailing list."
-        has_subscription = bool(mailing_list.getSubscription(self.user))
-        return has_subscription
-
-    @property
-    def team_has_mailing_list(self):
-        """Is the team mailing list available for subscription?"""
-        mailing_list = self.context.mailing_list
-        return mailing_list is not None and mailing_list.is_usable
-
     def getURLToAssignedBugsInProgress(self):
         """Return an URL to a page which lists all bugs assigned to this
         person that are In Progress.
@@ -2789,23 +2817,6 @@
             return False
         return self.user.inTeam(self.context)
 
-    def userIsActiveMember(self):
-        """Return True if the user is an active member of this team."""
-        return userIsActiveTeamMember(self.context)
-
-    def userIsProposedMember(self):
-        """Return True if the user is a proposed member of this team."""
-        if self.user is None:
-            return False
-        return self.user in self.context.proposedmembers
-
-    def userCanRequestToLeave(self):
-        """Return true if the user can request to leave this team.
-
-        A given user can leave a team only if he's an active member.
-        """
-        return self.userIsActiveMember()
-
     @cachedproperty
     def email_address_visibility(self):
         """The EmailAddressVisibleState of this person or team.
@@ -3779,12 +3790,38 @@
     schema = IPerson
 
 
-class TeamJoinView(PersonView):
-
-    def initialize(self):
-        super(TeamJoinView, self).initialize()
-        if self.request.method == "POST":
-            self.processForm()
+class TeamJoinForm(Interface):
+    """Schema for team join."""
+    mailinglist_subscribe = Bool(
+        title=_("Subscribe me to this team's mailing list"),
+        required=True, default=True)
+
+
+class TeamJoinView(LaunchpadFormView, TeamJoinMixin):
+    """A view class for joining a team."""
+    schema = TeamJoinForm
+
+    def setUpWidgets(self):
+        super(TeamJoinView, self).setUpWidgets()
+        if 'mailinglist_subscribe' in self.field_names:
+            widget = self.widgets['mailinglist_subscribe']
+            widget.setRenderedValue(self.user_wants_list_subscriptions)
+
+    @property
+    def page_title(self):
+        return "Join %s" % self.context.displayname
+
+    @property
+    def field_names(self):
+        """See `LaunchpadFormView`.
+
+        If the user can subscribe to the mailing list then include the
+        mailinglist subscription checkbox otherwise remove it.
+        """
+        if self.user_can_subscribe_to_list:
+            return ['mailinglist_subscribe']
+        else:
+            return []
 
     @property
     def join_allowed(self):
@@ -3816,7 +3853,7 @@
         """
         if not self.join_allowed:
             return False
-        return not (self.userIsActiveMember() or self.userIsProposedMember())
+        return not (self.user_is_active_member or self.user_is_proposed_member)
 
     @property
     def user_wants_list_subscriptions(self):
@@ -3833,46 +3870,42 @@
         policy = self.context.subscriptionpolicy
         return policy == TeamSubscriptionPolicy.MODERATED
 
-    def processForm(self):
-        request = self.request
-        user = self.user
-        context = self.context
+    @property
+    def next_url(self):
+        return canonical_url(self.context)
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
+    @action(_("Join"), name="join")
+    def action_save(self, action, data):
         response = self.request.response
 
-        notification = None
-        if 'join' in request.form and self.user_can_request_to_join:
+        if self.user_can_request_to_join:
             # Shut off mailing list auto-subscription - we want direct
             # control over it.
-            user.join(context, may_subscribe_to_list=False)
+            self.user.join(self.context, may_subscribe_to_list=False)
 
             if self.team_is_moderated:
                 response.addInfoNotification(
                     _('Your request to join ${team} is awaiting '
                       'approval.',
-                      mapping={'team': context.displayname}))
+                      mapping={'team': self.context.displayname}))
             else:
                 response.addInfoNotification(
                     _('You have successfully joined ${team}.',
-                      mapping={'team': context.displayname}))
-
-            if 'mailinglist_subscribe' in request.form:
-                self._subscribeToList()
-
-        elif 'join' in request.form:
+                      mapping={'team': self.context.displayname}))
+            if data.get('mailinglist_subscribe', False):
+                self._subscribeToList(response)
+
+        else:
             response.addErrorNotification(
                 _('You cannot join ${team}.',
-                  mapping={'team': context.displayname}))
-        elif 'goback' in request.form:
-            # User clicked on the 'Go back' button, so we'll simply redirect.
-            pass
-        else:
-            raise UnexpectedFormData(
-                "Couldn't find any of the expected actions.")
-        self.request.response.redirect(canonical_url(context))
+                  mapping={'team': self.context.displayname}))
 
-    def _subscribeToList(self):
+    def _subscribeToList(self, response):
         """Subscribe the user to the team's mailing list."""
-        response = self.request.response
 
         if self.user_can_subscribe_to_list:
             # 'user_can_subscribe_to_list' should have dealt with
@@ -3979,18 +4012,26 @@
         self.request.response.addInfoNotification("%s %s" % (team_names, msg))
 
 
-class TeamLeaveView(PersonView):
-
-    def processForm(self):
-        if self.request.method != "POST" or not self.userCanRequestToLeave():
-            # Nothing to do
-            return
-
-        if self.request.form.get('leave'):
+class TeamLeaveView(LaunchpadFormView, TeamJoinMixin):
+    schema = Interface
+
+    @property
+    def page_title(self):
+        return "Leave %s" % self.context.displayname
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
+    next_url = cancel_url
+
+    @action(_("Leave"), name="leave")
+    def action_save(self, action, data):
+        response = self.request.response
+
+        if self.user_can_request_to_leave:
             self.user.leave(self.context)
 
-        self.request.response.redirect('./')
-
 
 class PersonEditEmailsView(LaunchpadFormView):
     """A view for editing a person's email settings.

=== modified file 'lib/lp/registry/browser/tests/team-join-views.txt'
--- lib/lp/registry/browser/tests/team-join-views.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/registry/browser/tests/team-join-views.txt	2009-09-03 17:20:42 +0000
@@ -11,7 +11,7 @@
     >>> from zope.component import getMultiAdapter
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> def join_team(team):
-    ...     form = {'join': '1', 'mailinglist_subscribe': '1'}
+    ...     form = {'field.actions.join': '1', 'field.mailinglist_subscribe': u'on'}
     ...     request = LaunchpadTestRequest(method='POST', form=form)
     ...     view = getMultiAdapter((team, request), name='+join')
     ...     view.initialize()
@@ -32,9 +32,9 @@
     >>> from canonical.launchpad.interfaces import IMailingListSet
     >>> subscribers = getUtility(IMailingListSet)
 
-Posting a mailing list subscription request to a team that has no list
-results in an error notification.  (This is probably the result of
-mangled form data.)
+Attempting to post a mailing list subscription request to a team that has no list
+is thwarted by the view because it strips the checkbox from the form.
+Therefore no error message is seen.
 
     >>> sample_person = personset.getByName('name12')
     >>> login_person(sample_person)
@@ -43,7 +43,6 @@
 
     >>> join_team(no_list_team)
     You have successfully joined open-team-no-list.
-    Mailing list subscription failed.
 
 Someone subscribing to a moderated team's list will be shown an
 informative message regarding the delayed subscription.

=== modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
--- lib/lp/registry/stories/mailinglists/subscriptions.txt	2009-08-29 03:14:48 +0000
+++ lib/lp/registry/stories/mailinglists/subscriptions.txt	2009-09-03 17:20:42 +0000
@@ -228,8 +228,8 @@
     >>> browser.url
     'http://launchpad.dev/~rosetta-admins/+join'
 
-    >>> browser.getControl(name='mailinglist_subscribe').value = ['checked']
-    >>> browser.getControl(name='join').click()
+    >>> browser.getControl(name='field.mailinglist_subscribe').value = ['checked']
+    >>> browser.getControl(name='field.actions.join').click()
     >>> browser.url
     'http://launchpad.dev/~rosetta-admins'
 
@@ -284,7 +284,7 @@
 list is not presented.
 
     >>> browser.open('http://launchpad.dev/~rosetta-admins/+leave')
-    >>> browser.getControl(name='leave').click()
+    >>> browser.getControl(name='field.actions.leave').click()
 
     >>> browser.open('http://launchpad.dev/~rosetta-admins')
     >>> browser.getLink('Join the team').click()
@@ -561,8 +561,8 @@
     >>> browser.url
     'http://launchpad.dev/~rosetta-admins/+join'
 
-    >>> print browser.getControl(name='mailinglist_subscribe').value
-    ['subscribe']
+    >>> print browser.getControl(name='field.mailinglist_subscribe').value
+    True
 
     # Change James' setting
     >>> browser.open('http://launchpad.dev/~jblack')
@@ -575,8 +575,8 @@
 
     >>> browser.open('http://launchpad.dev/~rosetta-admins')
     >>> browser.getLink('Join the team').click()
-    >>> print browser.getControl(name='mailinglist_subscribe').value
-    ['subscribe']
+    >>> print browser.getControl(name='field.mailinglist_subscribe').value
+    True
 
 Users who have chosen to never be auto-subscribed to mailing
 lists will not have the box checked.
@@ -592,8 +592,8 @@
 
     >>> browser.open('http://launchpad.dev/~rosetta-admins')
     >>> browser.getLink('Join the team').click()
-    >>> print browser.getControl(name='mailinglist_subscribe').value
-    []
+    >>> print browser.getControl(name='field.mailinglist_subscribe').value
+    False
 
     # Restore James' setting.
     >>> browser.open('http://launchpad.dev/~jblack')

=== modified file 'lib/lp/registry/templates/team-join.pt'
--- lib/lp/registry/templates/team-join.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/team-join.pt	2009-09-03 17:20:42 +0000
@@ -1,74 +1,47 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<html
+<team-join
   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="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-
-<body>
+  metal:use-macro="view/macro:page/main_only"
+  i18n:domain="launchpad">
 
 <div metal:fill-slot="main">
 
-  <tal:block tal:condition="view/user_can_request_to_join">
-    <h1>Joining <span tal:replace="context/displayname" /></h1>
-
-    <h2>Are you sure you want to join this team?</h2>
+  <h1>Joining <span tal:replace="context/displayname" /></h1>
+
+  <tal:can-join tal:condition="view/user_can_request_to_join">
+
+    <p>Are you sure you want to join this team?</p>
 
     <p tal:condition="view/team_is_moderated">
       Since this is a moderated team, one of its administrators will have to
       approve your membership before you actually become a member.
     </p>
 
-    <form class="actions" name="join" action="" method="post">
-      <p tal:condition="view/user_can_subscribe_to_list">
-	<input type="checkbox" name="mailinglist_subscribe"
-	       value="subscribe"
-	       tal:attributes="checked view/user_wants_list_subscriptions"/>
-	Subscribe me to this team's mailing list
-      </p>
-      <input type="submit" name="goback" value="Cancel" />
-      <input type="submit" name="join" value="Join" />
-    </form>
-  </tal:block>
+    <div metal:use-macro="context/@@launchpad_form/form" />
+  </tal:can-join>
 
-  <tal:block tal:condition="not: view/user_can_request_to_join">
-    <p tal:condition="view/join_allowed" class="warning message">
-      <tal:active-member condition="view/userIsActiveMember">
+  <tal:cannot-join tal:condition="not: view/user_can_request_to_join">
+    <p tal:condition="view/join_allowed" class="informational message">
+      <tal:active-member condition="view/user_is_active_member">
         You are an active member of this team already.
       </tal:active-member>
-      <tal:proposed-member condition="view/userIsProposedMember">
+      <tal:proposed-member condition="view/user_is_proposed_member">
         Your membership is awaiting approval from one of this team's
         administrators.
       </tal:proposed-member>
     </p>
 
-    <p tal:condition="not: view/join_allowed" class="warning message">
+    <p tal:condition="not: view/join_allowed" class="informational message">
       <span tal:replace="context/displayname" /> is a restricted team.
       Only a team administrator can add new members.
     </p>
 
-    <form name="join" action="" method="post">
-    <table width="100%">
-      <tr><td>
-        <input type="submit" name="goback" value="Back to team" />
-      </td></tr>
-    </table>
-    </form>
-  </tal:block>
+    <p>
+      <a tal:attributes="href view/cancel_url">Back</a>
+    </p>
+  </tal:cannot-join>
 
 </div>
-
-</body>
-</html>
-</tal:root>
+</team-join>

=== modified file 'lib/lp/registry/templates/team-leave.pt'
--- lib/lp/registry/templates/team-leave.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/team-leave.pt	2009-09-03 17:20:42 +0000
@@ -1,19 +1,9 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<tal:do-this-first tal:content="view/processForm" />
 <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="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
@@ -22,29 +12,23 @@
 <div metal:fill-slot="main">
 
   <h1>Leaving &#8220;<span tal:replace="context/displayname" />&#8221;</h1>
-  <tal:block tal:condition="view/userCanRequestToLeave">
-
-      <p>Are you sure you want to leave this team?</p>
-
-    <form class="actions" name="leave" action="" method="post">
-      <input type="submit" name="goback" value="Cancel" />
-      <input type="submit" name="leave" value="Leave" />
-    </form>
-  </tal:block>
-
-  <tal:block tal:condition="not: view/userCanRequestToLeave">
-    <p class="warning message">
+
+  <tal:can-leave tal:condition="view/user_can_request_to_leave">
+    <p>Are you sure you want to leave this team?</p>
+
+    <div metal:use-macro="context/@@launchpad_form/form" />
+  </tal:can-leave>
+
+  <tal:cannot-leave tal:condition="not: view/user_can_request_to_leave">
+    <p class="informational message">
       You are not an active member of this team. You don't need to leave it.
     </p>
     <p>
-      <a tal:attributes="href context/fmt:url">
-        Back to <span tal:replace="context/displayname" />
-      </a>
+      <a tal:attributes="href view/cancel_url">Back</a>
     </p>
-  </tal:block>
+  </tal:cannot-leave>
 
-</div> 
+</div>
 
 </body>
 </html>
-</tal:root>

=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
--- lib/lp/registry/templates/team-portlet-membership.pt	2009-08-28 00:57:32 +0000
+++ lib/lp/registry/templates/team-portlet-membership.pt	2009-09-03 17:20:42 +0000
@@ -60,18 +60,18 @@
           <tal:user condition="not: context/teamowner/is_team">
             You are the owner of this team.
           </tal:user>
-          <tal:absentee-owner condition="not: view/userIsActiveMember">
+          <tal:absentee-owner condition="not: view/user_is_active_member">
             You are not currently an active member.
           </tal:absentee-owner>
       </tal:is-owner>
 
       <tal:not-owner condition="not: view/userIsOwner">
-        <tal:active-member tal:condition="view/userIsActiveMember">
-          <tal:can-leave condition="view/userCanRequestToLeave">
+        <tal:active-member tal:condition="view/user_is_active_member">
+          <tal:can-leave condition="view/user_can_request_to_leave">
             You are a member of this team.
           </tal:can-leave>
         </tal:active-member>
-        <tal:not-active-member tal:condition="not: view/userIsActiveMember">
+        <tal:not-active-member tal:condition="not: view/user_is_active_member">
           <div condition="not: view/userIsParticipant"
                style="margin-top: 1.5em">
             <a tal:define="link context/menu:overview/join"

=== modified file 'lib/lp/registry/templates/teammembership-self-renewal.pt'
--- lib/lp/registry/templates/teammembership-self-renewal.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/teammembership-self-renewal.pt	2009-09-03 17:20:42 +0000
@@ -3,18 +3,11 @@
   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="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 <body>
 
-<metal:portlets fill-slot="portlets">
-  <div tal:replace="structure context/person/@@+portlet-details" />
-</metal:portlets>
-
 <div metal:fill-slot="main">
 
   <div tal:condition="context/canBeRenewedByMember">
@@ -29,7 +22,7 @@
           you must renew it.
         </tal:is-team>
         <tal:not-team condition="not: context/person/isTeam">
-          if you want to remain a member of 
+          if you want to remain a member of
           <span tal:replace="structure context/team/fmt:link" />,
           you must renew it.
         </tal:not-team>
@@ -39,7 +32,7 @@
 
   <p tal:condition="not: context/canBeRenewedByMember">
     This membership cannot be renewed because
-    <span tal:replace="structure view/getReasonForDeniedRenewal" />
+    <span tal:replace="structure view/get_reason_for_denied_renewal" />
   </p>
 
 </div>