Merge lp:~edwin-grubbs/launchpad/bug-412519-team-page into lp:launchpad

Summary
-------

Convert the $team/+index page to LP3.0.

I've uploaded before and after screenshots here:
  https://dev.launchpad.net/TeamIndexPage

This branch does not address the following feedback items, which will be
taken care of in a followup branch:
 * List all members.
 * Show members' timezones.
 * Recently approved query shouldn't show users approved a long time ago
 * even if they are the most recent.
 * "Contact this team" link should be moved into the action menu.
 * Add portlet with info from the karmacache.

Implementation details
----------------------

Moved the contact-details and subteam-of portlets into macros
and moved the mailinglist and membership portlets into separate
templates to make reorganizing the portlets easier. I started off
making new templates, but then switched to macros which were quicker
to edit.
    lib/lp/registry/templates/person-macros.pt
    lib/lp/registry/templates/team-portlet-mailinglist.pt
    lib/lp/registry/templates/team-portlet-membership.pt
    lib/lp/registry/templates/team-index.pt

The map wouldn't load because the base layout wouldn't include the js
even when needs_gmap2 was set to True.
    lib/lp/app/templates/base-layout.pt

The $team/+index page now uses a subclass of PersonIndexView instead
of PersonIndexView directly, since that makes it possible to customize
the menu items in it. Also separated two portlets into their own files.
    lib/lp/registry/browser/configure.zcml

Moved a bunch of menu items up to CommonMenuLinks or TeamMenuMixin.
Added the 'team' attribute to the TeamMenuMixin, since some of the
menus have the view as the context object. Added TeamIndexView and
the TeamIndexMenu.
    lib/lp/registry/browser/person.py

Fixed tests.
    lib/lp/registry/browser/tests/team-views.txt
    lib/lp/registry/stories/foaf/xx-reassign-team.txt
    lib/lp/registry/stories/foaf/xx-team-claim.txt
    lib/lp/registry/stories/foaf/xx-team-home.txt
    lib/lp/registry/stories/teammembership/private-team.txt
    lib/lp/registry/stories/teammembership/xx-private-membership.txt
    lib/lp/soyuz/stories/ppa/xx-ppa-private-teams.txt

Removed the header for the map. I can't remember who wanted that.
    lib/lp/registry/templates/team-portlet-map.pt

Added info icon to link.
    lib/lp/registry/templates/person-portlet-related-projects.pt

Added maintained-packages link and reformatted.
    lib/lp/soyuz/templates/person-portlet-ppas.pt

Fixed font size of ppa names.
    lib/lp/soyuz/templates/person-ppas.pt

Tests
-----

./bin/test -vv -t 'team-views.txt|xx-reassign-team.txt|xx-team-claim.txt|xx-team-home.txt|private-team.txt|xx-private-membership.txt|xx-ppa-private-teams.txt'

Demo and Q/A
------------

SQL to insert test data for the ~guadalinux user on launchpad.dev:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    /* For homepage content and description at the top of the page. */
    UPDATE Person
    SET homepage_content = 'Homepage content. Testing.',
        teamdescription = 'Team description. Testing.'
    WHERE id = 32;

    /* For related projects portlet. */
    UPDATE Product SET owner = 32;

Q/A
~~~
* Open http://launchpad.dev/~guadamen
    * Verify al...

Hi Edwin,

This looks really nice and it's great to see team-index.pt shrinking. r=me with those few changes we discussed on IRC

Hi Edwin,

This looks great, and I'm looking forward to seeing this land.

I have a few comments which I'd like to see if we can address:

- I feel the "Team details" portlet should always be on the top right. The related projects portlet is pushing it down when it exists
- All the "show all *" links should be on the top-right of each portlet (I can spot "view all members" and view all X related packages)
- Maybe in the same spirit, you should move the "view map and time zones" to the top right as well
- If the team is not a sub-team, can we just not expose that information?
- How about not mentioning the projects' name again in the polls area and just say "No polls created"? And maybe not offer the show link if there aren't any?
- The "created on" date and by whom should be on the top-right, like in bugs and every other object (see with Curtis for this)
- If there aren't any packages, maybe we shouldn't offer the "Maintained packages" link?

One more comment, the "Join team" is probably the most important action, so maybe it could be on the top, with the same format as the downloads for projects?

I want to clarify a couple of the suggested changes.

On Mon, Aug 24, 2009 at 2:33 PM, Martin Albisetti<email address hidden> wrote:
> Review: Needs Fixing ui
> Hi Edwin,
>
> This looks great, and I'm looking forward to seeing this land.
>
> I have a few comments which I'd like to see if we can address:
>
> - I feel the "Team details" portlet should always be on the top right. The related projects portlet is pushing it down when it exists

I think I will move the Related Projects portlet to the top on the
left side, since there was a bug to make sure this is very prominent.

> - All the "show all *" links should be on the top-right of each portlet (I can spot "view all members" and view all X related packages)

I'm confused, since we discussed Martin Pool's complaint about the
"Show all" links being black and not being in the body with the other
links. Should it be blue in the top right corner or still black?

> - Maybe in the same spirit, you should move the "view map and time zones" to the top right as well
> - If the team is not a sub-team, can we just not expose that information?
> - How about not mentioning the projects' name again in the polls area and just say "No polls created"?  And maybe not offer the show link if there aren't any?
> - The "created on" date and by whom should be on the top-right, like in bugs and every other object (see with Curtis for this)
> - If there aren't any packages, maybe we shouldn't offer the "Maintained packages" link?
> --
> https://code.edge.launchpad.net/~edwin-grubbs/launchpad/bug-412519-team-page/+merge/10536
> You are the owner of lp:~edwin-grubbs/launchpad/bug-412519-team-page.
>

On Mon, Aug 24, 2009 at 4:57 PM, Edwin Grubbs<email address hidden> wrote:
> I think I will move the Related Projects portlet to the top on the
> left side, since there was a bug to make sure this is very prominent.

I think the team's information is more important.

> I'm confused, since we discussed Martin Pool's complaint about the
> "Show all" links being black and not being in the body with the other
> links. Should it be blue in the top right corner or still black?

Blue and on the top right, without the arrow, I'd say.

--
Martin

New screenshots are available at https://dev.launchpad.net/TeamIndexPage#preview
One important comment below.

> Hi Edwin,
>
> This looks great, and I'm looking forward to seeing this land.
>
> I have a few comments which I'd like to see if we can address:
>
> - I feel the "Team details" portlet should always be on the top right. The
> related projects portlet is pushing it down when it exists

Fixed.

> - All the "show all *" links should be on the top-right of each portlet (I can
> spot "view all members" and view all X related packages)

Fixed.

> - Maybe in the same spirit, you should move the "view map and time zones" to
> the top right as well

Fixed.

> - If the team is not a sub-team, can we just not expose that information?

Fixed.

> - How about not mentioning the projects' name again in the polls area and just
> say "No polls created"? And maybe not offer the show link if there aren't
> any?

Fixed.

> - The "created on" date and by whom should be on the top-right, like in bugs
> and every other object (see with Curtis for this)

Curtis will work on this bug regarding the base template.

> - If there aren't any packages, maybe we shouldn't offer the "Maintained
> packages" link?

Fixed.

Thank you for your changes, the page is looking much better. Great job.

Fixing the major problems it had has, however, brought some of the "polish" issues to my attention I would like to solve on this page, so, if you can still invest a bit of time on this page, please try and address them.

- I'd drop mentoring from that page. The feature is broken.
- How about s/Recently applied/Pending approval?
- If there's no email set, we should probably say "set contact email" instead of edit
- If there is an email set, just have an edit icon next to it, no text
- The "join team" should be placed before the actions portlet, just like downloads
- If there's no mailing list, it should say "create a mailing list", with an add icon
- I'd move the "show members photos" link into +members, uncluttering that section
- "You are not a member of this team" should probably be preceded by "(+) Join it". I'd also add some spacing between this text and the rest (0.5-1em, see what feels right)
- s/Mailing list archive/View archive
- s/Mailing list subscribers/View subscribers
- s/You are not subscribed to the team mailing list. (Subscribe)/(+) Subscribe to mailing list

Hi Martin,

Screenshots for revision 3 are available at
https://dev.launchpad.net/TeamIndexPage

-Edwin

Also, be sure to look at the screenshot of the project page whose black portlet links changed to blue because that change was done in the stylesheet.

> Hi Martin,
>
> Screenshots for revision 3 are available at
> https://dev.launchpad.net/TeamIndexPage
>
> -Edwin

Perfect.
Thank you :)

Hi Salgado,

Can you do a followup review on the changes I made for Martin? BTW, it is understood that the changes to the see-all css also affect the project page and any other portlets.

-Edwin

{{{
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css 2009-08-23 01:55:48 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css 2009-08-28 02:04:01 +0000
@@ -369,9 +369,8 @@
     }
 .see-all a {
     padding-left: 8px;
- background: url(/@@/link-grey-arrow.png) left center no-repeat;
+ background: inherit;
     font-size: 72%;
- color: #484848;
     text-decoration: underline;
     }
 .rss-right {
@@ -576,6 +575,30 @@
     text-align: right;
     }

+ul.super-add-action {
+ margin: 0 auto 1em;
+}
+
+ul.super-add-action li {
+ padding: 0;
+}
+
+ul.super-add-action li a {
+ display: block;
+ border: 1px solid black;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ background: #4f843c url(/@@/bg-action-add) center left no-repeat;
+ border-radius: 3px;
+ padding: 6%;
+ padding-left: 45px;
+ color: #fff;
+ font-size: 108%;
+ font-weight: bold;
+ text-decoration: underline;
+ }
+
 .involvement ul {
     border-top: 1px solid #d0d0d0;
     }

=== added file 'lib/canonical/launchpad/images/bg-action-add.png'
Binary files lib/canonical/launchpad/images/bg-action-add.png 1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/bg-action-add.png 2009-08-26 19:07:10 +0000 differ
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2009-08-24 19:14:38 +0000
+++ lib/lp/registry/browser/person.py 2009-08-27 22:12:31 +0000
@@ -877,7 +877,8 @@
     def maintained(self):
         target = '+maintained-packages'
         text = 'Maintained Packages'
- return Link(target, text, icon='info')
+ enabled = bool(self.team.getLatestMaintainedPackages())
+ return Link(target, text, enabled=enabled, icon='info')

     def uploaded(self):
         target = '+uploaded-packages'
@@ -1078,7 +1079,7 @@
         return Link(target, text)

-class PersonRelatedSoftwareNavigationMenu(NavigationMenu):
+class PersonRelatedSoftwareNavigationMenu(NavigationMenu, CommonMenuLinks):

     usedfor = IPersonRelatedSoftwareMenu
     facet = 'overview'
@@ -1226,7 +1227,7 @@
     @enabled_with_permission('launchpad.Edit')
     def editemail(self):
         target = '+contactaddress'
- text = 'Change contact address'
+ text = 'Set contact address'
         summary = (
             'The address Launchpad uses to contact %s' %
             self.team.displayname)
@@ -1235,10 +1236,16 @@
     @enabled_with_permission('launchpad.MailingListManager')
     def configure_mailing_list(self):
         target = '+mailinglist'
- text = 'Configure mailing list'
+ mailing_list = self.team.mailing_list
+ if mailing_list is not None and mailing_list.is_usable:
+ text = 'Configure mailing list'
+ icon = 'edit'
+ else:
+ text = 'Create a mailing list'
+ icon = 'add'
         summary = (
             'The mail...

Hi Salgado,

Here are the tests that you asked me to add. I will add another comment with a diff of all the boring test fixes needed for the changing names of links.

-Edwin

{{{
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2009-08-31 12:01:46 +0000
+++ lib/lp/registry/browser/person.py 2009-09-01 00:11:08 +0000
@@ -3126,6 +3126,21 @@
     """

     @property
+ def can_show_subteam_portlet(self):
+ """Only show the subteam portlet if there is info to display.
+
+ Either the team is a member of another team, or there are
+ invitations to join a team, and the owner needs to see the
+ link so that the invitation can be accepted.
+ """
+ try:
+ return (self.context.super_teams.count() > 0
+ or (self.context.open_membership_invitations
+ and check_permission('launchpad.Edit', self.context)))
+ except AttributeError, e:
+ raise AssertionError(e)
+
+ @property
     def visibility(self):
         return self.context.visibility.title + ' Team'

=== modified file 'lib/lp/registry/stories/foaf/xx-team-home.txt'
--- lib/lp/registry/stories/foaf/xx-team-home.txt 2009-08-29 03:14:48 +0000
+++ lib/lp/registry/stories/foaf/xx-team-home.txt 2009-09-01 00:48:09 +0000
@@ -51,11 +51,41 @@
     English
     Set preferred languages

+The polls portlet only shows a link to view all polls if current
+polls exist.
+
+ >>> print extract_text(find_tag_by_id(browser.contents, 'polls'))
+ Polls
+ A random poll that never closes...
+ Show polls
+
+ >>> browser.open('http://launchpad.dev/~launchpad')
+ >>> print extract_text(find_tag_by_id(browser.contents, 'polls'))
+ Polls
+ No polls created.
+
+The subteam-of portlet is not shown if the team is not a subteam.
+
+ >>> browser.open('http://launchpad.dev/~ubuntu-team')
     >>> print extract_text(
     ... find_tag_by_id(browser.contents, 'subteam-of'))
     Subteam of
     &#8220;Ubuntu Team&#8221; is a member of these teams: GuadaMen...

+ >>> browser.open('http://launchpad.dev/~launchpad')
+ >>> print find_tag_by_id(browser.contents, 'subteam-of')
+ None
+
+Unless the user is the owner of the team and there are invitations to
+join a team.
+
+ >>> admin_browser.open('http://launchpad.dev/~launchpad')
+ >>> print extract_text(
+ ... find_tag_by_id(admin_browser.contents, 'subteam-of'))
+ Subteam of...
+ itself is not a member of any other team.
+ Show received invitations
+
 If the team does not have any recently approved or proposed members,
 the recent members sections are not displayed:

=== modified file 'lib/lp/registry/templates/person-macros.pt'
--- lib/lp/registry/templates/person-macros.pt 2009-08-28 00:57:32 +0000
+++ lib/lp/registry/templates/person-macros.pt 2009-09-01 00:06:13 +0000
@@ -79,8 +79,8 @@
 <metal:macro define-macro="subteam-of">
   <div class="portlet"
        id="subteam-of"
- tal:condition="
- python: context.super_teams or context.open_membership_invitations">
+ tal:condition="view/can_show_subteam_portlet"
+ >
     <h2>Subteam of</h2>

     <...

Incremental diff of boring test fixes.

{{{
=== modified file 'lib/lp/registry/browser/tests/person-views.txt'
--- lib/lp/registry/browser/tests/person-views.txt 2009-08-13 19:03:36 +0000
+++ lib/lp/registry/browser/tests/person-views.txt 2009-08-29 03:14:48 +0000
@@ -587,7 +587,7 @@
     >>> login('<email address hidden>')
     >>> view = create_initialized_view(landscape_developers, '+index')
     >>> print view.contact_link_title
- Send an email to your team through Launchpad
+ Send an email to your team's members through Launchpad

 The EmailToPersonView can be used by members to contact their team.

=== modified file 'lib/lp/registry/stories/foaf/xx-person-projects.txt'
--- lib/lp/registry/stories/foaf/xx-person-projects.txt 2009-08-13 15:12:16 +0000
+++ lib/lp/registry/stories/foaf/xx-person-projects.txt 2009-08-29 03:14:48 +0000
@@ -11,7 +11,6 @@
     Ubuntu Linux
     Ubuntu Test
     Tomcat
- &raquo; Show related projects

 The +related-software page displays a table with links to open bugs,
 unimplemented specs and open questions.

=== 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-08-29 03:14:48 +0000
@@ -33,7 +33,7 @@
     [u'Launchpad Administrators has been proposed to this team.']
     >>> print extract_text(
     ... find_tag_by_id(browser.contents, 'recently-applied'))
- Recently applied
+ Pending approval
     Launchpad Administrators
     ...

=== modified file 'lib/lp/registry/stories/foaf/xx-team-contactemail.txt'
--- lib/lp/registry/stories/foaf/xx-team-contactemail.txt 2009-05-12 01:39:29 +0000
+++ lib/lp/registry/stories/foaf/xx-team-contactemail.txt 2009-08-29 03:14:48 +0000
@@ -17,7 +17,7 @@

     >>> browser = setupBrowser(auth='Basic <email address hidden>:test')
     >>> browser.open('http://launchpad.dev/~landscape-developers')
- >>> browser.getLink('Change contact address').click()
+ >>> browser.getLink(url='+contactaddress').click()
     >>> browser.title
     'Landscape Developers contact address'

@@ -73,7 +73,7 @@
     ... print msg
     Email address successfully confirmed.

- >>> browser.getLink('Change contact address').click()
+ >>> browser.getLink(url='+contactaddress').click()
     >>> browser.title
     'Landscape Developers contact address'
     >>> control = browser.getControl(name='field.contact_method')

=== modified file 'lib/lp/registry/stories/foaf/xx-team-edit.txt'
--- lib/lp/registry/stories/foaf/xx-team-edit.txt 2009-08-13 19:03:36 +0000
+++ lib/lp/registry/stories/foaf/xx-team-edit.txt 2009-08-29 03:14:48 +0000
@@ -88,7 +88,7 @@
 such team pages read-only.

     >>> browser.open('http://launchpad.dev/~landscape-developers')
- >>> browser.getLink('Configure mailing list').click()
+ >>> browser.getLink(url='+mailinglist').click()
     >>> browser.getControl('Apply for Mailing List').click()

     # Approval of mailing lists is not yet exposed through the web.

=== modified file 'lib/lp/registry/stories/foaf/xx-team-home.txt'
--- lib/lp/registry/stories/foaf/xx-team-home.txt 2009-08-...