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

[Barry Warsaw]

[Barry Warsaw (barry)]

= Summary =

This branch converts three more pages to UI 3.0, the ~person/+codesofconduct
page, the ~person/+participation page, and the ~person/+teamhierarchy page.

I suck for letting this branch get over 800 lines.

== Proposed fix ==

Implement mostly mechanical changes to convert the relevant templates to UI
3.0.

== Pre-implementation notes ==

None really needed.

== Implementation details ==

In addition to the template changes, which were mostly mechanical and thus not
requiring a formal ui review, I cleaned up a lot of code and added some new
tests.

 * Removed some obsolete pagetitles.py entries.
 * Made CodeOfConductView inherit from LaunchpadView so that it could be
   simplified. I also added a page_title attribute to this view since it has
   no breadcrumbs (nor should it; it isn't actually traversable from a core
   content object).
 * Split off the view code for the above templates into separate view
   classes. The monolithic PersonView really sucks so it's better to have
   smaller, more focused views. Added PersonParticipationView and
   TeamHierarchyView.
 * Rewrote PersonParticipationView.indirect_teams_via to make it a property
   and to make the implementation more readable.
 * Fixed the crufty way signature records are updated in
   PersonCodeOfConductEditView. Previously, the changes were made by
   performCoCChanges() method called by placeholder TAL in the template.
   LaunchpadView supports an `initialize()` method, which makes much more
   sense for performing this work.
 * Added a bunch of convenience properties to TeamHierarchyView
 * Cleaned up 02-signcoc.txt doctest, but unfortunately did not convert this
   to an xx- random test.

== Tests ==

The new view tests:

  % bin/test -vv -t team-hierarchy-views -t xx-coc-views

Regression testing the code of conduct signing stories:

  % bin/test -vv -t gpg-coc

Regression testing the other template changes:

  % bin/test -vv -m lp.registry -t stories

== Demo and Q/A ==

To view the new team hierarchy pages with various combinations of sub- and
super- team structure:

 * http://launchpad.dev/~warty-gnome/+teamhierarchy
 * http://launchpad.dev/~ubuntu-team/+teamhierarchy
 * http://launchpad.dev/~guadamen/+teamhierarchy

To view the changes to the participation pages:

 * http://launchpad.dev/~name12/+participation
 * http://launchpad.dev/~name16/+participation

To view the new code of conduct pages:

 * http://launchpad.dev/~name12/+codesofconduct
 * http://launchpad.dev/~no-priv/+codesofconduct
 * http://launchpad.dev/codeofconduct
 * http://launchpad.dev/codeofconduct/1.0/+sign
 * http://launchpad.dev/codeofconduct/1.0.1

= 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/doc/team-hierarchy-views.txt
  lib/lp/registry/doc/xx-coc-views.txt
  lib/lp/registry/templates/person-teamhierarchy.pt
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/browser/team.py
  lib/lp/registry/browser/codeofconduct.py
  lib/lp/registry/templates/person-codesofconduct.pt
  lib/lp/registry/t...

[Curtis Hovey (sinzui)]

Thanks for doing the extra clean up. This branch is fine to land as is.

> === modified file 'lib/lp/registry/stories/gpg-coc/02-signcoc.txt'
> --- lib/lp/registry/stories/gpg-coc/02-signcoc.txt 2009-08-18 17:25:41 +0000
> +++ lib/lp/registry/stories/gpg-coc/02-signcoc.txt 2009-09-15 20:20:20 +0000

...

> +Code of Conduct registration problems
> +=====================================
> +
> +Sample Person tries unsuccessfully to register a truncated code of conduct.
> +
> + >>> truncated_coc = read_file('truncated_coc.asc')
> + >>> browser.open('http://launchpad.dev/codeofconduct/1.0.1/+sign')
> + >>> browser.getControl('Signed Code').value = truncated_coc
> + >>> browser.getControl('Continue').click()
> + >>> print_errors(browser.contents)
> + There is 1 error.
> + The signed text does not match the Code of Conduct. Make sure that you
> + signed the correct text (white space differences are acceptable).
> +
> +Sample Person tries unsuccessfully to register an old version of the code.
> +
> + >>> coc_version_1_0 = read_file('10_coc.asc')
> + >>> browser.getControl('Signed Code').value = coc_version_1_0
> + >>> browser.getControl('Continue').click()
> + >>> print_errors(browser.contents)
> + There is 1 error.
> + The signed text does not match the Code of Conduct. Make sure that you
> + signed the correct text (white space differences are acceptable).

These two tests should be view tests, but I think we can do that when we
add support for launchpad and U1 hacking.
...

review: Approve (code and ui)

[Barry Warsaw (barry)]

On Sep 16, 2009, at 03:47 PM, Curtis Hovey wrote:

>Review: Approve code and ui
>Thanks for doing the extra clean up. This branch is fine to land as is.

Thanks!

>> +Code of Conduct registration problems
>> +=====================================
>> +
>> +Sample Person tries unsuccessfully to register a truncated code of conduct.
>> +
>> + >>> truncated_coc = read_file('truncated_coc.asc')
>> + >>> browser.open('http://launchpad.dev/codeofconduct/1.0.1/+sign')
>> + >>> browser.getControl('Signed Code').value = truncated_coc
>> + >>> browser.getControl('Continue').click()
>> + >>> print_errors(browser.contents)
>> + There is 1 error.
>> + The signed text does not match the Code of Conduct. Make sure that you
>> + signed the correct text (white space differences are acceptable).
>> +
>> +Sample Person tries unsuccessfully to register an old version of the code.
>> +
>> + >>> coc_version_1_0 = read_file('10_coc.asc')
>> + >>> browser.getControl('Signed Code').value = coc_version_1_0
>> + >>> browser.getControl('Continue').click()
>> + >>> print_errors(browser.contents)
>> + There is 1 error.
>> + The signed text does not match the Code of Conduct. Make sure that you
>> + signed the correct text (white space differences are acceptable).
>
>These two tests should be view tests, but I think we can do that when we
>add support for launchpad and U1 hacking.

Agreed.
-Barry

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-15 10:05:14 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-15 23:18:27 +0000
@@ -314,8 +314,6 @@
 
 codeofconduct_admin = 'Administer Codes of Conduct'
 
-codeofconduct_index = ContextTitle('%s')
-
 codeofconduct_list = 'Ubuntu Codes of Conduct'
 
 def contact_user(context, view):
@@ -704,8 +702,6 @@
 
 person_packagebugs_search = person_packagebugs
 
-person_participation = ContextTitle("Team participation by %s")
-
 person_review = ContextDisplayName("Review %s")
 
 person_specfeedback = ContextDisplayName('Feature feedback requests for %s')
@@ -715,8 +711,6 @@
 person_translations_to_review = ContextDisplayName(
     'Translations for review by %s')
 
-person_teamhierarchy = ContextDisplayName('Team hierarchy for %s')
-
 pofile_index = ContextTitle(smartquote('Translation overview for "%s"'))
 
 def pofile_translate(context, view):

=== modified file 'lib/lp/registry/browser/codeofconduct.py'
--- lib/lp/registry/browser/codeofconduct.py	2009-08-18 17:15:10 +0000
+++ lib/lp/registry/browser/codeofconduct.py	2009-09-15 20:20:20 +0000
@@ -110,12 +110,14 @@
         return Link('../', text, icon='info')
 
 
-class CodeOfConductView:
+class CodeOfConductView(LaunchpadView):
     """Simple view class for CoC page."""
 
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
+    @property
+    def page_title(self):
+        """See `LaunchpadView`."""
+        # This page has no breadcrumbs, nor should it.
+        return self.context.title
 
 
 class CodeOfConductDownloadView:

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-09-15 16:26:15 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-09-15 22:55:30 +0000
@@ -848,14 +848,18 @@
                 name="+karma"
                 template="../templates/person-karma.pt"/>
         </browser:pages>
+        <browser:page
+            for="lp.registry.interfaces.person.IPerson"
+            permission="zope.Public"
+            name="+participation"
+            class="lp.registry.browser.person.PersonParticipationView"
+            template="../templates/person-participation.pt"
+            />
         <browser:pages
             for="lp.registry.interfaces.person.IPerson"
             permission="zope.Public"
             class="lp.registry.browser.person.PersonView">
             <browser:page
-                name="+participation"
-                template="../templates/person-participation.pt"/>
-            <browser:page
                 name="+sshkeys"
                 attribute="showSSHKeys"/>
             <browser:page
@@ -1032,7 +1036,7 @@
         <browser:page
             for="lp.registry.interfaces.person.IPerson"
             permission="zope.Public"
-            class="lp.registry.browser.person.PersonView"
+            class="lp.registry.browser.team.TeamHierarchyView"
             name="+teamhierarchy"
             template="../templates/person-teamhierarchy.pt"/>
         <browser:page

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-09-15 19:28:54 +0000
+++ lib/lp/registry/browser/person.py	2009-09-15 21:19:06 +0000
@@ -6,8 +6,6 @@
 """Person-related view classes."""
 
 __metaclass__ = type
-
-
 __all__ = [
     'BeginTeamClaimView',
     'BugSubscriberPackageBugsSearchListingView',
@@ -86,6 +84,7 @@
     'archive_to_person',
     ]
 
+
 import cgi
 import copy
 import itertools
@@ -239,6 +238,8 @@
 from lp.answers.interfaces.questioncollection import IQuestionSet
 from lp.answers.interfaces.questionsperson import IQuestionsPerson
 
+COMMASPACE = ', '
+
 
 class RestrictedMembershipsPersonView(LaunchpadView):
     """Secure access to team membership information for a person.
@@ -2831,17 +2832,6 @@
         assert self.user is not None
         return self.user.findPathToTeam(self.context)
 
-    def indirect_teams_via(self):
-        """Return a list of dictionaries, where each dictionary has a team
-        in which the person is an indirect member, and a path to membership
-        in that team.
-        """
-        return [{'team': team,
-                 'via': ', '.join(
-                    [viateam.displayname for viateam in
-                        self.context.findPathToTeam(team)[:-1]])}
-                for team in self.context.teams_indirectly_participated_in]
-
     def userIsParticipant(self):
         """Return true if the user is a participant of this team.
 
@@ -2975,6 +2965,31 @@
         return False
 
 
+class PersonParticipationView(LaunchpadView):
+    """View for the ~person/+participation page."""
+
+    @property
+    def label(self):
+        return 'Team participation for ' + self.context.displayname
+
+    @property
+    def indirect_teams_via(self):
+        """Information about indirect membership.
+
+        :return: A list of dictionaries, where each dictionary has a team in
+          which the person is an indirect member, and a path to membership in
+          that team.
+        :rtype: a list of dictionaries
+        """
+        indirect_teams = []
+        for team in self.context.teams_indirectly_participated_in:
+            via = COMMASPACE.join(viateam.displayname
+                                  for viateam
+                                  in self.context.findPathToTeam(team)[:-1])
+            indirect_teams.append(dict(team=team, via=via))
+        return indirect_teams
+
+
 class EmailAddressVisibleState:
     """The state of a person's email addresses w.r.t. the logged in user.
 
@@ -3183,28 +3198,29 @@
 
 
 class PersonCodeOfConductEditView(LaunchpadView):
-
-    def performCoCChanges(self):
-        """Make changes to code-of-conduct signature records for this
-        person.
-        """
+    """View for the ~person/+codesofconduct pages."""
+
+    @property
+    def label(self):
+        """See `LaunchpadView`."""
+        return 'Codes of Conduct for ' + self.context.displayname
+
+    def initialize(self):
+        """See `LaunchpadView`."""
+        # Make changes to code-of-conduct signature records for this person.
         sig_ids = self.request.form.get("DEACTIVATE_SIGNATURE")
 
         if sig_ids is not None:
             sCoC_util = getUtility(ISignedCodeOfConductSet)
-
-            # verify if we have multiple entries to deactive
+            # Verify that we have multiple entries to deactive.
             if not isinstance(sig_ids, list):
                 sig_ids = [sig_ids]
-
             for sig_id in sig_ids:
                 sig_id = int(sig_id)
-                # Deactivating signature
+                # Deactivating signature.
                 comment = 'Deactivated by Owner'
                 sCoC_util.modifySignature(sig_id, self.user, comment, False)
 
-            return True
-
 
 class PersonEditWikiNamesView(LaunchpadView):
 

=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2009-09-15 10:05:14 +0000
+++ lib/lp/registry/browser/team.py	2009-09-15 22:55:30 +0000
@@ -10,15 +10,17 @@
     'TeamBrandingView',
     'TeamContactAddressView',
     'TeamEditView',
+    'TeamHierarchyView',
     'TeamMailingListConfigurationView',
     'TeamMailingListModerationView',
     'TeamMailingListSubscribersView',
+    'TeamMapData',
     'TeamMapView',
-    'TeamMapData',
     'TeamMemberAddView',
     'TeamPrivacyAdapter',
     ]
 
+
 from urllib import quote
 from datetime import datetime
 import math
@@ -1106,3 +1108,31 @@
             'content-type', 'application/xml;charset=utf-8')
         body = LaunchpadView.render(self)
         return body.encode('utf-8')
+
+
+class TeamHierarchyView(LaunchpadView):
+    """View for ~team/+teamhierarchy page."""
+
+    @property
+    def label(self):
+        return 'Team relationships for ' + self.context.displayname
+
+    @property
+    def has_sub_teams(self):
+        return self.context.sub_teams.count() > 0
+
+    @property
+    def has_super_teams(self):
+        return self.context.super_teams.count() > 0
+
+    @property
+    def has_only_super_teams(self):
+        return self.has_super_teams and not self.has_sub_teams
+
+    @property
+    def has_only_sub_teams(self):
+        return not self.has_super_teams and self.has_sub_teams
+
+    @property
+    def has_relationships(self):
+        return self.has_sub_teams or self.has_super_teams

=== added file 'lib/lp/registry/doc/team-hierarchy-views.txt'
--- lib/lp/registry/doc/team-hierarchy-views.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/doc/team-hierarchy-views.txt	2009-09-15 22:55:30 +0000
@@ -0,0 +1,100 @@
+====================
+Team hierarchy views
+====================
+
+Team hierarchies are displayed via the ~team/+teamhierarchy page.  By default,
+brand new teams have no relationships at all.
+
+    >>> team = factory.makeTeam(displayname='Brand New Team')
+    >>> view = create_initialized_view(team, '+teamhierarchy')
+    >>> print view.label
+    Team relationships for Brand New Team
+
+    >>> view.has_relationships
+    False
+    >>> view.has_sub_teams
+    False
+    >>> view.has_super_teams
+    False
+    >>> view.has_only_sub_teams
+    False
+    >>> view.has_only_super_teams
+    False
+
+
+Only sub-teams
+==============
+
+Guadamen is related to some other teams.
+
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> person_set = getUtility(IPersonSet)
+
+    >>> guadamen = person_set.getByName('guadamen')
+    >>> view = create_initialized_view(guadamen, '+teamhierarchy')
+    >>> print view.label
+    Team relationships for GuadaMen
+    >>> view.has_relationships
+    True
+
+Guadamen has sub-teams...
+
+    >>> view.has_sub_teams
+    True
+
+...but no super teams.
+
+    >>> view.has_super_teams
+    False
+
+In other words, Guadamen has only sub-teams.
+
+    >>> view.has_only_super_teams
+    False
+
+    >>> view.has_only_sub_teams
+    True
+
+
+Only super-teams
+================
+
+The Warty Gnome Team has only super-teams.
+
+    >>> warty = person_set.getByName('warty-gnome')
+    >>> view = create_initialized_view(warty, '+teamhierarchy')
+    >>> print view.label
+    Team relationships for Warty Gnome Team
+
+    >>> view.has_super_teams
+    True
+    >>> view.has_sub_teams
+    False
+    >>> view.has_only_super_teams
+    True
+    >>> view.has_only_sub_teams
+    False
+    >>> view.has_relationships
+    True
+
+
+Both super-teams and sub-teams
+==============================
+
+The Ubuntu Team has both sub-teams and super-teams.
+
+    >>> ubuntu = person_set.getByName('ubuntu-team')
+    >>> view = create_initialized_view(ubuntu, '+teamhierarchy')
+    >>> print view.label
+    Team relationships for Ubuntu Team
+
+    >>> view.has_super_teams
+    True
+    >>> view.has_sub_teams
+    True
+    >>> view.has_only_super_teams
+    False
+    >>> view.has_only_sub_teams
+    False
+    >>> view.has_relationships
+    True

=== added file 'lib/lp/registry/doc/xx-coc-views.txt'
--- lib/lp/registry/doc/xx-coc-views.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/doc/xx-coc-views.txt	2009-09-15 20:20:20 +0000
@@ -0,0 +1,12 @@
+======================
+Codes of conduct views
+======================
+
+The PersonCodeOfConductEditView controls ~person/+codesofconduct.  It displays
+the person's name in the page label.
+
+    >>> login('[e-mail]')
+    >>> geddy = factory.makePerson(displayname='Geddy Lee')
+    >>> view = create_initialized_view(geddy, '+codesofconduct')
+    >>> print view.label
+    Codes of Conduct for Geddy Lee

=== modified file 'lib/lp/registry/stories/gpg-coc/02-signcoc.txt'
--- lib/lp/registry/stories/gpg-coc/02-signcoc.txt	2009-08-18 17:25:41 +0000
+++ lib/lp/registry/stories/gpg-coc/02-signcoc.txt	2009-09-15 20:20:20 +0000
@@ -1,72 +1,95 @@
-  First we check that Sample Person never signed a code of conduct.
-
-  >>> browser.addHeader("Authorization", "Basic [e-mail]:test")
-  >>> browser.open("http://launchpad.dev/~name12/+codesofconduct")
-
-  >>> "Sample Person has never signed" in browser.contents
-  True
-
-
-  First we define a helper function
-
-  >>> import os.path
-  >>> def filename_path(filename):
-  ...   return os.path.join(os.path.dirname(__file__), filename)
-  ...
-
-  Then we try to register a code of conduct with a truncated CoC:
-
-  >>> filename = filename_path("truncated_coc.asc")
-  >>> truncated_coc = open(filename).read()
-
-  >>> browser.open("http://launchpad.dev/codeofconduct/1.0.1/+sign")
-  >>> browser.getControl("Signed Code").value = truncated_coc
-  >>> browser.getControl("Continue").click()
-
-  >>> message = (
-  ... "The signed text does not match the Code of Conduct. Make sure that "
-  ... "you signed the correct text (white space differences are acceptable")
-  >>> message in browser.contents
-  True
-
-  We try to register an old version of the code (version 1.0)
-
-  >>> filename = filename_path("10_coc.asc")
-  >>> old_coc = open(filename).read()
-  >>> browser.getControl("Signed Code").value = old_coc
-  >>> browser.getControl("Continue").click()
-
-  >>> message in browser.contents
-  True
-
-  If we try to access the old version page to sign it
-  >>> browser.open("http://launchpad.dev/codeofconduct/1.0/+sign")
-
-  We're presented with a link to the current code page
-  >>> current_coc_link = browser.getLink("the current version")
-  >>> current_coc_link.url
-  'http://launchpad.dev/codeofconduct/1.0.1'
-
-  We navigate to the current Code page
-  >>> current_coc_link.click()
-  >>> browser.getLink("Sign it").click()
-  >>> browser.url
-  'http://launchpad.dev/codeofconduct/1.0.1/+sign'
-
-
-  Now we try to register the code of conduct, using an reformatted copy
-  (leading spaces removed).
-
-  >>> filename = filename_path("reformatted_101_coc.asc")
-  >>> reformatted_coc = open(filename).read()
-  >>> browser.getControl("Signed Code").value = reformatted_coc
-  >>> browser.getControl("Continue").click()
-
-  This succeeds because the words are the same and in the same order.
-
-  >>> browser.url
-  'http://launchpad.dev/~name12/+codesofconduct'
-
-  >>> browser.open("http://launchpad.dev/~name12/+codesofconduct")
-  >>> "1024D/DFD20543" in browser.contents
-  True
+=========================
+Signing a Code of Conduct
+=========================
+
+Sample person has never signed a code of conduct.
+
+    >>> browser = setupBrowser(auth='Basic [e-mail]:test')
+    >>> browser.open('http://launchpad.dev/~name12/+codesofconduct')
+    >>> print extract_text(find_main_content(browser.contents))
+    Codes of Conduct for Sample Person
+    Sample Person +codesofconduct
+    Launchpad records codes of conduct you sign as commitments to the
+    principles of collaboration, tolerance and open communication that
+    drive the open source community.
+    Sample Person has never signed a code
+    of conduct.
+    See or sign new code of conduct releases
+
+    # A helper function for reading a code-of-conduct file.
+    >>> import os
+    >>> def read_file(filename):
+    ...     path = os.path.join(os.path.dirname(__file__), filename)
+    ...     file_object = open(path)
+    ...     # Change this to a with-statement when we switch to Python 2.5.
+    ...     try:
+    ...         return file_object.read()
+    ...     finally:
+    ...         file_object.close()
+
+
+Code of Conduct registration problems
+=====================================
+
+Sample Person tries unsuccessfully to register a truncated code of conduct.
+
+    >>> truncated_coc = read_file('truncated_coc.asc')
+    >>> browser.open('http://launchpad.dev/codeofconduct/1.0.1/+sign')
+    >>> browser.getControl('Signed Code').value = truncated_coc
+    >>> browser.getControl('Continue').click()
+    >>> print_errors(browser.contents)
+    There is 1 error.
+    The signed text does not match the Code of Conduct. Make sure that you
+    signed the correct text (white space differences are acceptable).
+
+Sample Person tries unsuccessfully to register an old version of the code.
+
+    >>> coc_version_1_0 = read_file('10_coc.asc')
+    >>> browser.getControl('Signed Code').value = coc_version_1_0
+    >>> browser.getControl('Continue').click()
+    >>> print_errors(browser.contents)
+    There is 1 error.
+    The signed text does not match the Code of Conduct. Make sure that you
+    signed the correct text (white space differences are acceptable).
+
+
+Sample Person tries to access the old version page to sign it, and is informed
+that there is a new version available.
+
+    >>> browser.open('http://launchpad.dev/codeofconduct/1.0/+sign')
+    >>> browser.getLink('the current version').click()
+    >>> print browser.url
+    http://launchpad.dev/codeofconduct/1.0.1
+
+    >>> browser.getLink('Sign it').click()
+    >>> print browser.url
+    http://launchpad.dev/codeofconduct/1.0.1/+sign
+
+
+Code of Conduct registration
+============================
+
+Sample Person registers the code of conduct, using a reformatted copy which
+has leading spaces removed.  This succeeds because the words the same and
+appear in the same order.
+
+    >>> reformatted_coc = read_file('reformatted_101_coc.asc')
+    >>> browser.getControl('Signed Code').value = reformatted_coc
+    >>> browser.getControl('Continue').click()
+    >>> print browser.url
+    http://launchpad.dev/~name12/+codesofconduct
+
+And now Sample Person's Codes of Conduct page shows that he's signed it.
+
+    >>> browser.open('http://launchpad.dev/~name12/+codesofconduct')
+    >>> print extract_text(find_main_content(browser.contents))
+    Codes of Conduct for Sample Person
+    Sample Person +codesofconduct
+    Launchpad records codes of conduct you sign as commitments to the
+    principles of collaboration, tolerance and open communication that
+    drive the open source community.
+    Active signatures
+    If you change your mind about agreeing to a code of conduct,
+    you can deactivate your signature.
+    2009-09-15: digitally signed by Sample Person (1024D/DFD20543)
+    ...

=== modified file 'lib/lp/registry/templates/person-codesofconduct.pt'
--- lib/lp/registry/templates/person-codesofconduct.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-codesofconduct.pt	2009-09-15 20:20:20 +0000
@@ -3,81 +3,68 @@
   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>Code of conduct signatures</h1>
-
-  <tal:changes condition="view/performCoCChanges" />
-
-  <p>Launchpad records codes of conduct you sign as commitments to the
-  principles of collaboration, tolerance and open communication that
-  drive the open source community.</p>
-
-  <p tal:condition="not: context/signedcocs">
-    <tal:name replace="context/fmt:displayname"/> has never signed a code
-    of conduct.
-  </p>
-
-  <div tal:condition="context/activesignatures">
-    <form name="coc" action="" method="post">
-
-      <h2>Active signatures</h2>
+  >
+  <body>
+  <div metal:fill-slot="main">
+    <p>Launchpad records codes of conduct you
+    sign as commitments to the principles of collaboration, tolerance and
+    open communication that drive the open source community.</p>
+
+    <p tal:condition="not: context/signedcocs">
+      <tal:name replace="context/fmt:displayname"/> has never signed a code
+      of conduct.
+    </p>
+
+    <div tal:condition="context/activesignatures">
+      <form name="coc" action="" method="post">
+        <h2>Active signatures</h2>
         <p>If you change your mind about agreeing to a code of conduct,
         you can deactivate your signature.</p>
-          <table>
-            <tbody>
-              <tr tal:repeat="sig context/activesignatures">
-                <td class="icon left">
-                  <input
-                    type="checkbox"
-                    name="DEACTIVATE_SIGNATURE"
-                    tal:attributes="value sig/id; id string:code${sig/id}"
-                  />
-                </td>
-                <td>
-                  <div>
-                    <label
-                      class="signature"
-                      tal:attributes="for string:code${sig/id}"
-                      tal:content="sig/displayname"
-                    >blah</label>
-                  </div>
-                  <pre
-                    class="discreet"
-                    tal:content="sig/signedcode"
-                  >SIGNATURE</pre>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <input type="submit" value="Deactivate"/>
-        </form>
-      </div>
-
-
-  <div tal:condition="context/inactivesignatures">
-
-    <h2>Inactive signatures</h2>
-
-        <p>
-          Once <dfn>Inactive</dfn>, a signature can only be reactivated by a
-          <a href="/~admins">Launchpad Administrator</a>.
-        </p>
+        <table>
+          <tbody>
+            <tr tal:repeat="sig context/activesignatures">
+              <td class="icon left">
+                <input
+                  type="checkbox"
+                  name="DEACTIVATE_SIGNATURE"
+                  tal:attributes="value sig/id; id string:code${sig/id}"
+                />
+              </td>
+              <td>
+                <div>
+                  <label
+                    class="signature"
+                    tal:attributes="for string:code${sig/id}"
+                    tal:content="sig/displayname"
+                  >blah</label>
+                </div>
+                <pre
+                  class="discreet"
+                  tal:content="sig/signedcode"
+                >SIGNATURE</pre>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <input type="submit" value="Deactivate"/>
+      </form>
+    </div>
+
+    <div tal:condition="context/inactivesignatures">
+      <h2>Inactive signatures</h2>
+      <p>
+        Once <dfn>Inactive</dfn>, a signature can only be reactivated by a
+        <a href="/~admins">Launchpad Administrator</a>.
+      </p>
       <ul>
          <li tal:repeat="sig context/inactivesignatures"
              tal:content="sig/displayname"/>
       </ul>
+    </div>
+
+  <p><a href="/codeofconduct">See or sign new code of conduct releases</a></p>
   </div>
-
-  <p><a href="/codeofconduct">See or sign new code of conduct releases</a></p>
-
-</div>
-</body>
+  </body>
 </html>

=== modified file 'lib/lp/registry/templates/person-participation.pt'
--- lib/lp/registry/templates/person-participation.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-participation.pt	2009-09-15 21:16:37 +0000
@@ -3,83 +3,60 @@
   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="help">
-  <p>
-    Launchpad has a sophisticated system for managing teams, including the
-    ability to create teams-of-teams. This page shows the teams that
-    <span tal:replace="context/title">Foo Bar</span> is a member of. You can
-    see the teams in which they are directly a member, and also the teams in
-    which they have indirect membership.
-  </p>
-  <p>
-    Indirect membership describes the case where a person is a member of a
-    team, which is in turn a member of another team. The person will then be
-    an indirect member of the other team.
-  </p>
-</div>
-
-<metal:heading fill-slot="pageheading">
-  <h1>Team participation</h1>
-</metal:heading>
-
-<div metal:fill-slot="main" tal:define="
-    direct context/myactivememberships;
-    indirect context/teams_indirectly_participated_in">
-
-  <p tal:condition="direct/count">
-    <span tal:replace="context/title">Foo Bar</span>
-    is a member of the following teams:
-  </p>
-  <p tal:condition="not: direct/count">
-    <span tal:replace="context/title">Foo Bar</span>
-    has not yet joined any teams.
-  </p>
-
-  <div class="left" tal:condition="direct/count">
-    <div class="portlet">
-      <h2>Direct membership</h2>
-      <table id="participation">
-        <tal:loop repeat="membership context/myactivememberships">
-          <tr tal:replace="structure membership/@@+listing-simple"
-              tal:condition="membership/team/@@+restricted-membership/userCanViewMembership"
-              />
-        </tal:loop>
-      </table>
-    </div>
-  </div>
-
-  <div class="right" tal:condition="indirect/count">
-    <div class="portlet">
-      <h2>Indirect membership</h2>
-      <table id="indirect participation">
-        <tal:loop repeat="team_via view/indirect_teams_via">
-          <tr tal:condition="team_via/team/@@+restricted-membership/userCanViewMembership">
-            <td><img tal:replace="structure team_via/team/image:icon" />
-            </td>
-            <td>
-              <div>
-                <a tal:replace="structure team_via/team/fmt:link">Team name</a>
-              </div>
-              <div>
-                Via
-                <span tal:replace="team_via/via">guadamen</span>.
-              </div>
-            </td>
-          </tr>
-        </tal:loop>
-      </table>
-    </div>
-  </div>
-
-</div>
+  <div metal:fill-slot="main"
+       tal:define="direct context/myactivememberships;
+                   indirect context/teams_indirectly_participated_in">
+
+    <p tal:condition="direct/count">
+      <span tal:replace="context/title">Foo Bar</span>
+      is a member of the following teams:
+    </p>
+    <p tal:condition="not: direct/count">
+      <span tal:replace="context/title">Foo Bar</span>
+       has not yet joined any teams.
+    </p>
+
+    <div class="left" tal:condition="direct/count">
+      <div class="portlet">
+        <h2>Direct membership</h2>
+        <table id="participation">
+          <tal:loop repeat="membership context/myactivememberships">
+            <tr tal:replace="structure membership/@@+listing-simple"
+                tal:condition="membership/team/@@+restricted-membership/userCanViewMembership"
+                />
+          </tal:loop>
+        </table>
+      </div>
+    </div>
+
+    <div class="right" tal:condition="indirect/count">
+      <div class="portlet">
+        <h2>Indirect membership</h2>
+        <table id="indirect participation">
+          <tal:loop repeat="team_via view/indirect_teams_via">
+            <tr tal:condition="team_via/team/@@+restricted-membership/userCanViewMembership">
+              <td><img tal:replace="structure team_via/team/image:icon" />
+              </td>
+              <td>
+                <div>
+                  <a tal:replace="structure team_via/team/fmt:link"
+                    >Team name</a>
+                </div>
+                <div>
+                  Via
+                  <span tal:replace="team_via/via">guadamen</span>.
+                </div>
+              </td>
+            </tr>
+          </tal:loop>
+        </table>
+      </div>
+    </div>
+  </div>
 </body>
 </html>

=== modified file 'lib/lp/registry/templates/person-teamhierarchy.pt'
--- lib/lp/registry/templates/person-teamhierarchy.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-teamhierarchy.pt	2009-09-15 22:55:30 +0000
@@ -3,67 +3,54 @@
   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>
-    &#8220;<span tal:replace="context/displayname">
-    Foo</span>&#8221; team
-  </h1>
-  <h2>Relationship to other teams</h2>
-  <tal:block define="
-    subteams context/sub_teams;
-    superteams context/super_teams
-  ">
-    <p tal:condition="python: not subteams and not superteams">
+  <div metal:fill-slot="main">
+    <p tal:condition="not: view/has_relationships">
       None of the members of
       &#8220;<span tal:replace="context/displayname"/>&#8221;
-      are teams,
-      and nor is it a member of any other team.
+      are teams, nor is it a member of any other team.
     </p>
-    <p tal:condition="python: superteams and not subteams">
+    <p tal:condition="view/has_only_super_teams">
       None of the members of
       &#8220;<span tal:replace="context/displayname"/>&#8221;
       are teams.
     </p>
-    <tal:block condition="subteams">
+    <tal:block condition="view/has_sub_teams">
       <p>
         These teams are members of
         &#8220;<span tal:replace="context/displayname"/>&#8221;:
       </p>
       <ul id="subteams">
-        <tal:subteams repeat="team subteams">
-          <li tal:condition="team/@@+restricted-membership/userCanViewMembership">
+        <tal:subteams repeat="team context/sub_teams">
+          <li
+            tal:condition="team/@@+restricted-membership/userCanViewMembership">
             <tal:link replace="structure team/fmt:link" />
           </li>
         </tal:subteams>
-      </ul>
+    </ul>
     </tal:block>
-    <p tal:condition="python: subteams and not superteams">
+    <p tal:condition="view/has_only_sub_teams">
       &#8220;<span tal:replace="context/displayname"/>&#8221;
       is not a member of any other team.
     </p>
-    <tal:block condition="superteams">
+    <tal:block condition="view/has_super_teams">
       <p>
         &#8220;<span tal:replace="context/displayname"/>&#8221;
         is a member of these teams:
       </p>
       <ul id="superteams">
-        <tal:superteams repeat="team superteams">
-          <li tal:condition="team/@@+restricted-membership/userCanViewMembership">
+        <tal:superteams repeat="team context/super_teams">
+          <li
+            tal:condition="team/@@+restricted-membership/userCanViewMembership">
             <tal:link replace="structure team/fmt:link" />
           </li>
         </tal:superteams>
       </ul>
     </tal:block>
-  </tal:block>
-</div>
+  </div>
 </body>
 </html>