Merge lp:~barry/launchpad/421974-newpersonteam into lp:launchpad

[Barry Warsaw]

[Barry Warsaw (barry)]

= Summary =

This branch converts /people/+newteam and /people/+newperson to UI 3.0.

== Proposed fix ==

Update the templates to 3.0 format.

== Pre-implementation notes ==

None.

== Implementation details ==

The changes were pretty mechanical, except that I had to fix the way the views
specified the page label and page title, and I had to remove the pagetitles.py
cruft. These pages were inconsistent in the way it defined they label and
title, so I updated them to the current understanding of how they should be
defined (though this may or may not change in the future -- that's outside the
scope of this branch).

I also reformatted the TAL to be consistently indented.

== Tests ==

bin/test -vv -t launchpadlib.txt -t front-pages.txt -t standalone -t private-team-creation-views.txt -t stories/teammembership -t create-lists.txt -t recover.txt -t modify-lists.txt

== Demo and Q/A ==

http://launchpad.dev/people/+newperson
http://launchpad.dev/people/+newteam

= Launchpad lint =

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

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/browser/team.py
  lib/lp/registry/templates/people-newteam.pt
  lib/lp/registry/browser/person.py
  lib/lp/registry/templates/people-newperson.pt

== Pylint notices ==

lib/lp/registry/browser/person.py
    229: [F0401] Unable to import 'lazr.uri' (No module named uri)

^^ false positive

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 merge approved

Looks good.

Barry Warsaw wrote:
> Barry Warsaw has proposed merging lp:~barry/launchpad/421974-newpersonteam into lp:launchpad/devel.
>
> Requested reviews:
> Canonical Launchpad Engineering (launchpad)
>
> = Summary =
>
> This branch converts /people/+newteam and /people/+newperson to UI 3.0.
>
> == Proposed fix ==
>
> Update the templates to 3.0 format.
>
> == Pre-implementation notes ==
>
> None.
>
> == Implementation details ==
>
> The changes were pretty mechanical, except that I had to fix the way the views
> specified the page label and page title, and I had to remove the pagetitles.py
> cruft. These pages were inconsistent in the way it defined they label and
> title, so I updated them to the current understanding of how they should be
> defined (though this may or may not change in the future -- that's outside the
> scope of this branch).
>
> I also reformatted the TAL to be consistently indented.
>
> == Tests ==
>
> bin/test -vv -t launchpadlib.txt -t front-pages.txt -t standalone -t private-team-creation-views.txt -t stories/teammembership -t create-lists.txt -t recover.txt -t modify-lists.txt
>
> == Demo and Q/A ==
>
> http://launchpad.dev/people/+newperson
> http://launchpad.dev/people/+newteam
>
> = Launchpad lint =
>
> Checking for conflicts. and issues in doctests and templates.
> Running jslint, xmllint, pyflakes, and pylint.
> Using normal rules.
>
> Linting changed files:
> lib/canonical/launchpad/pagetitles.py
> lib/lp/registry/browser/team.py
> lib/lp/registry/templates/people-newteam.pt
> lib/lp/registry/browser/person.py
> lib/lp/registry/templates/people-newperson.pt
>
>
> == Pylint notices ==
>
> lib/lp/registry/browser/person.py
> 229: [F0401] Unable to import 'lazr.uri' (No module named uri)
>
> ^^ false positive
>
>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkqcJ8UACgkQ0F+nu1YWqI0/EQCcDer/MIGaHdWpAJLPZGRc2QUT
C7UAnjwD5cwRlbuj4wtnoqCAfNsA25lK
=JIp6
-----END PGP SIGNATURE-----

review: Approve

[Edwin Grubbs (edwin-grubbs)]

ui=me*

review: Approve (ui)

[Curtis Hovey (sinzui)]

This looks good. We discussed change the team action to read [Create Team] if the test changes were not overwhelming

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-08-29 03:38:28 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-08-31 18:52:04 +0000
@@ -767,10 +767,6 @@
 
 people_mergerequest_sent = 'Merge request sent'
 
-people_newperson = 'Create a new Launchpad profile'
-
-people_newteam = 'Register a new team in Launchpad'
-
 people_requestmerge = 'Merge Launchpad accounts'
 
 people_requestmerge_multiple = 'Merge Launchpad accounts'

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-08-29 03:38:28 +0000
+++ lib/lp/registry/browser/person.py	2009-08-31 18:52:04 +0000
@@ -1379,8 +1379,10 @@
 class PersonAddView(LaunchpadFormView):
     """The page where users can create new Launchpad profiles."""
 
-    label = "Create a new Launchpad profile"
+    page_title = "Create a new Launchpad profile"
+    label = page_title
     schema = INewPerson
+
     custom_widget('creation_comment', TextAreaWidget, height=5, width=60)
 
     @action(_("Create Profile"), name="create")

=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2009-08-26 16:34:38 +0000
+++ lib/lp/registry/browser/team.py	2009-08-31 18:52:04 +0000
@@ -831,8 +831,10 @@
 
 class TeamAddView(TeamFormMixin, HasRenewalPolicyMixin, LaunchpadFormView):
     """View for adding a new team."""
+
+    page_title = 'Register a new team in Launchpad'
+    label = page_title
     schema = ITeamCreation
-    label = ''
 
     custom_widget('teamowner', HiddenUserWidget)
     custom_widget(

=== modified file 'lib/lp/registry/templates/people-newperson.pt'
--- lib/lp/registry/templates/people-newperson.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/people-newperson.pt	2009-08-31 17:46:33 +0000
@@ -3,37 +3,27 @@
   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:leftportlets fill-slot="portlets_one">
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-</metal:rightportlets>
-
-<div metal:fill-slot="main">
-
-  <div metal:use-macro="context/@@launchpad_form/form">
-
-    <p metal:fill-slot="extra_top">
-      We will send an email to the provided email address explaining that
-      you created a Launchpad profile for the email address' owner. This
-      email will include your name and email address, so that the user can
-      contact you if (s)he wants. It won't be possible to login with this
-      new profile and we will not send any other emails to it before its
-      email address is confirmed and the registration process finished by
-      the person represented by that profile.
-    </p>
-
-  </div>
-</div>
-    
-</body>
+  >
+  <body>
+    <div metal:fill-slot="main">
+      <div metal:use-macro="context/@@launchpad_form/form">
+        <div metal:fill-slot="extra_info" class="application-summary">
+        <p>
+          Launchpad will send a message to the email address you provide
+          below.  This message explains that you created a Launchpad profile
+          for the email address's owner, and it will include your name and
+          email address so that the user can contact you if they want to.
+        </p>
+        <p>
+          It will not be possible to log in with this new profile, and
+          Launchpad will not send any other messages to it before its email
+          address is confirmed.  The registration process must be finished by
+          the person represented by the new profile.
+        </p>
+        </div>
+      </div>
+    </div>
+  </body>
 </html>

=== modified file 'lib/lp/registry/templates/people-newteam.pt'
--- lib/lp/registry/templates/people-newteam.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/people-newteam.pt	2009-08-31 17:46:33 +0000
@@ -3,31 +3,20 @@
   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>
-
-  <div metal:fill-slot="main">
-
-   <h1>Register a new team</h1>
-
-   <div metal:use-macro="context/@@launchpad_form/form">
-
-        <p metal:fill-slot="extra_info">
+  >
+  <body>
+    <div metal:fill-slot="main">
+      <div metal:use-macro="context/@@launchpad_form/form">
+        <p metal:fill-slot="extra_info" class="application-summary">
           Use a team to group people involved in a common task.
           For example, a team can be the maintainer of a project,
-          the assignee of a bug,
-          or the editor of a package for a particular language.
+          the assignee of a bug, or the editor of a package for a particular
+          language.
         </p>
-
+      </div>
+    <metal:js use-macro="context/@@+person-macros/private-team-js" />
     </div>
-
-    <metal:js use-macro="context/@@+person-macros/private-team-js" />
-
-  </div>
-</body>
+  </body>
 </html>