Merge lp:~salgado/launchpad/person-edit-pages into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

= Summary =

Convert form pages to add/edit members of a team.

== Proposed fix ==

JFD the mechanical conversion. Screenshots at
http://people.canonical.com/~salgado/members/
UI already reviewed by Martin A.

= 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/foaf/xx-team-add-my-teams.txt
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/templates/team-editproposed.pt
  lib/lp/registry/templates/team-add-my-teams.pt
  lib/lp/registry/browser/team.py
  lib/lp/registry/browser/person.py

== Pylint notices ==

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

[Gavin Panella (allenap)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-01 11:09:53 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-01 19:43:30 +0000
@@ -1177,12 +1177,6 @@
 
 standardshipitrequest_edit = 'Edit standard option'
 
-team_addmember = ContextBrowsername('Add members to %s')
-
-team_add_my_teams = 'Propose/add one of your teams to another one'
-
-team_editproposed = ContextBrowsername('Proposed members of %s')
-
 team_index = ContextBrowsername('%s in Launchpad')
 
 team_invitations = ContextBrowsername("Invitations sent to %s")
 
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-09-01 00:21:10 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-09-01 18:39:43 +0000
@@ -1152,7 +1152,7 @@
             for="lp.registry.interfaces.person.ITeam"
             class="canonical.launchpad.browser.TeamMemberAddView"
             permission="launchpad.Edit"
-            template="../templates/team-addmember.pt"/>
+            template="../../app/templates/generic-edit.pt"/>
         <browser:page
             name="+editproposedmembers"
             for="lp.registry.interfaces.person.ITeam"
 
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-08-31 22:11:14 +0000
+++ lib/lp/registry/browser/person.py	2009-09-01 19:43:30 +0000
@@ -3791,6 +3791,7 @@
 class TeamAddMyTeamsView(LaunchpadFormView):
     """Propose/add to this team any team that you're an administrator of."""
 
+    page_title = 'Propose/add one of your teams to another one'
     custom_widget('teams', LabeledMultiCheckBoxWidget)
 
     def initialize(self):
@@ -3838,11 +3839,10 @@
             candidates.append(team)
         return candidates
 
-    @action(_("Cancel"), name="cancel",
-            validator=LaunchpadFormView.validate_none)
-    def cancel_action(self, action, data):
-        """Simply redirect to the team's page."""
-        pass
+    @property
+    def cancel_url(self):
+        """The return URL."""
+        return canonical_url(self.context)
 
     def validate(self, data):
         if len(data.get('teams', [])) == 0:
 
=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2009-08-31 20:16:30 +0000
+++ lib/lp/registry/browser/team.py	2009-09-01 19:43:30 +0000
@@ -918,9 +918,15 @@
                 comment=self.request.form.get('comment'))
 
     @property
+    def page_title(self):
+        return 'Proposed members of %s' % self.context.displayname
+
+    @property
     def next_url(self):
         return '%s/+members' % canonical_url(self.context)
 
+    cancel_url = next_url
+
 
 class TeamBrandingView(BrandingChangeView):
 
@@ -943,6 +949,14 @@
     schema = ITeamMember
     label = "Select the new member"
 
+    @property
+    def page_title(self):
+        return 'Add members to %s' % self.context.displayname
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
     def validate(self, data):
         """Verify new member.
 
 
=== modified file 'lib/lp/registry/stories/foaf/xx-team-add-my-teams.txt'
--- lib/lp/registry/stories/foaf/xx-team-add-my-teams.txt	2009-06-16 20:17:00 +0000
+++ lib/lp/registry/stories/foaf/xx-team-add-my-teams.txt	2009-09-01 19:49:25 +0000
@@ -16,12 +16,14 @@
 The proposal will have to be reviewed by a team administrator.
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'maincontent'))
+    Ubuntu Team
     Propose these teams as members
     This is a moderated team, so one of its administrators will have
     to review any memberships you propose.
     Launchpad Administrators
     Mailing List Experts
     Rosetta Administrators
+    or Cancel
 
 We'll now propose Launchpad Administrators as a member of Ubuntu Team.
 
@@ -78,6 +80,7 @@
 
     >>> browser.open('http://launchpad.dev/~ubuntu-team/+add-my-teams')
     >>> print extract_text(find_tag_by_id(browser.contents, 'maincontent'))
+    Ubuntu Team
     This is a restricted team
     New members can not be proposed&mdash;they can only be added by one
     of the team's administrators.
@@ -122,5 +125,5 @@
 
     >>> browser.open('http://launchpad.dev/~ubuntu-team/+add-my-teams')
     >>> print extract_text(find_main_content(browser.contents))
+    Ubuntu Team
     None of the teams you administer can be added to this team.
-
 
=== modified file 'lib/lp/registry/templates/team-add-my-teams.pt'
--- lib/lp/registry/templates/team-add-my-teams.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/team-add-my-teams.pt	2009-09-01 19:43:30 +0000
@@ -3,15 +3,10 @@
   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 metal:fill-slot="main">
     <p tal:condition="not: view/candidate_teams">
       None of the teams you administer can be added to this team.
 
=== removed file 'lib/lp/registry/templates/team-addmember.pt'
--- lib/lp/registry/templates/team-addmember.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/team-addmember.pt	1970-01-01 00:00:00 +0000
@@ -1,20 +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="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-
-  <body>
-    <div metal:fill-slot="main">
-      <div metal:use-macro="context/@@launchpad_form/form" />
-    </div>
-  </body>
-
-</html>
-
 
=== modified file 'lib/lp/registry/templates/team-editproposed.pt'
--- lib/lp/registry/templates/team-editproposed.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/team-editproposed.pt	2009-09-01 19:43:30 +0000
@@ -1,18 +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="">
-
 <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"
 >
 
@@ -20,7 +11,7 @@
 
 <div metal:fill-slot="main">
 
-      <h1><span tal:replace="context/displayname" />: Proposed Members</h1>
+      <h1>Proposed members</h1>
 
       <tal:block tal:define="memberships context/getProposedMemberships">
 
@@ -38,7 +29,7 @@
                                    decline_id string:decline_${member/id};
                                    hold_id string:hold${member/id}">
 
-            <td style="text-align: right">
+            <td style="text-align: left">
               <span tal:replace="structure member/fmt:link" />
               <br />
               <span class="extra-discreet">
@@ -68,15 +59,17 @@
           </tr>
         </table>
 
+        <br />
         <p>
           Comment:
+          <textarea name="comment" id="comment"></textarea>
           <span class="formHelp">This comment will be sent together with the
             notification of this change to all the approved or declined
             users and all the team administrators.</span>
-          <textarea name="comment" id="comment"></textarea>
         </p>
 
         <input tal:replace="structure view/action_save/render" />
+        or&nbsp; <a tal:attributes="href view/cancel_url">Cancel</a>
       </form>
       </div>
 
@@ -99,4 +92,3 @@
 
 </body>
 </html>
-</tal:root>