Merge lp:~julian-edwards/launchpad/related-software-30 into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Convert ~person/+related-software and associated pages to 3.0

Curtis has already approved the UI, I just need a secondary UI review and a
code review please!

== Pre-implementation notes ==
Chatted to Curtis about what to do with the 2nd level nav menus. We decided
to replace them with an <ul class="horizontal"> set of links instead. The
result looks better than expected!

== Implementation details ==
There are five templates converted, which are the +related-software page
itself and the 4 related pages for uploaded, maintained and PPA packages, and
related projects.

I also did some test cleaning by moving a test from the PPA stories (what the
heck was it doing there!) into the xx-person-related-software doctest. I also
removed unnecessary testing from the stories/foaf equivalent test since it was
just duplicating the soyuz story.

== Tests ==
bin/test -cvvt xx-person-related-software

== Demo and Q/A ==
https://launchpad.dev/~mark/+related-software
Click on the 4 links at the top to see the other pages.

= 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/soyuz/templates/person-ppa-packages.pt
  lib/canonical/launchpad/pagetitles.py
  lib/lp/soyuz/templates/person-maintained-packages.pt
  lib/lp/soyuz/templates/person-uploaded-packages.pt
  lib/lp/soyuz/stories/soyuz/xx-person-packages.txt
  lib/lp/registry/templates/person-related-software.pt
  lib/lp/registry/templates/person-related-projects.pt
  lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt
  lib/lp/registry/stories/foaf/xx-person-packages.txt
  lib/lp/registry/browser/person.py

== Pylint notices ==

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

[Brad Crittenden (bac)]

Hi Julian,

Thanks for the nice fixes on this branch.

I have one big suggestion for the way the links are put on the page.

Other than that the branch looks good.

> === modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py 2009-09-05 07:03:47 +0000
> +++ lib/canonical/launchpad/pagetitles.py 2009-09-07 20:32:50 +0000
> @@ -747,8 +747,6 @@
>
> person_karma = ContextDisplayName(smartquote("%s's karma in Launchpad"))
>
> -person_maintained_packages = ContextDisplayName('Software maintained by %s')
> -
> person_mentoringoffers = ContextTitle('Mentoring offered by %s')
>
> def person_mergeproposals(context, view):
> @@ -765,12 +763,6 @@
>
> person_participation = ContextTitle("Team participation by %s")
>
> -person_ppa_packages = ContextDisplayName('PPA packages related to %s')
> -
> -person_related_projects = ContextDisplayName('Projects related to %s')
> -
> -person_related_software = ContextDisplayName('Software related to %s')
> -
> person_review = ContextDisplayName("Review %s")
>
> person_specfeedback = ContextDisplayName('Feature feedback requests for %s')
> @@ -786,8 +778,6 @@
>
> person_teamhierarchy = ContextDisplayName('Team hierarchy for %s')
>
> -person_uploaded_packages = ContextDisplayName('Software uploaded by %s')
> -
> pofile_filter = FilteredTranslationsTitle(
> smartquote('Translations by %(person)s in "%(title)s"'))
>

> === modified file 'lib/lp/registry/browser/person.py'
> --- lib/lp/registry/browser/person.py 2009-09-05 03:33:24 +0000
> +++ lib/lp/registry/browser/person.py 2009-09-07 20:32:50 +0000
> @@ -4834,6 +4834,10 @@
>
> max_results_to_display = config.launchpad.default_batch_size
>
> + @property
> + def page_title(self):
> + return "Software related to " + self.context.title

Minor since they are synonyms but I'd use displayname here as it is
more familiar for a person. Will apply to all.

> @cachedproperty
> def related_projects(self):
> """Return a list of project dicts owned or driven by this person.
> === modified file 'lib/lp/registry/stories/foaf/xx-person-packages.txt'
> --- lib/lp/registry/stories/foaf/xx-person-packages.txt 2009-08-13 15:12:16 +0000
> +++ lib/lp/registry/stories/foaf/xx-person-packages.txt 2009-09-08 10:49:20 +0000
> @@ -5,18 +5,10 @@
>
> >>> anon_browser.open('http://launchpad.dev/~mark')
> >>> anon_browser.getLink('Related Software').click()
> - >>> print_navigation_links(anon_browser.contents)
> - Profile: ...
> - Related Software
> - Karma: ...
>
> >>> print anon_browser.title
> Software related to Mark Shuttleworth
> >>> print anon_browser.url
> http://launchpad.dev/~mark/+related-software
>
> -That page displays a table, the with list of 'Maintained'packages as
> -well as the list of 'Uploaded' packages. The table also shows the
> -number of open bugs and questions filed against each package.

Spotting typos in deleted code probably isn't helpful, is it? :)

> Please see pagetests/soyuz/xx-person-packages.txt for details.

> === modified file 'lib/lp/registry/templates/person-related-projects.pt'
> --- lib/lp/registry...

review: Approve (code)

[Curtis Hovey (sinzui)]

> > + <div class="top-portlet" id="navlinks">
> > + <ul class="horizontal">
> > + <li>
> > + <a tal:replace="structure
> view/menu:navigation/summary/render"/></li>
> > + <li>
> > + <a tal:replace="structure
> view/menu:navigation/maintained/render"/></li>
> > + <li>
> > + <a tal:replace="structure
> view/menu:navigation/uploaded/render"/></li>
> > + <li>
> > + <a tal:replace="structure view/menu:navigation/ppa/render"/></li>
> > + </ul>
> > + </div>
>
>
> I'm a bit bothered by the way the horizontal links hop around and are
> inconsistently ordered as you page through them. If you used the
> following code (moved to a macro) for all pages then the link display
> would be fixed in the same order and the active page would have a
> disabled link, which is the way +global-action menus work.
>
> <div class="top-portlet" id="navlinks">
> <ul class="horizontal">
> <li>
> <a tal:replace="structure view/menu:navigation/summary/render"/></li>
> <li>
> <a tal:replace="structure
> view/menu:navigation/maintained/render"/></li>
> <li>
> <a tal:replace="structure view/menu:navigation/uploaded/render"/></li>
> <li>
> <a tal:replace="structure view/menu:navigation/ppa/render"/></li>
> <li>
> <a tal:replace="structure view/menu:navigation/projects/render"/></li>
> </ul>
> </div>

I agree with Brad, but I think we need another change. This approach creates empty <li> elements. Each <li> needs condition="view/menu:navigation/uploaded/enabled"

Since this is already a NavMenu, you could just iterate over the .enabled_links. I recall that the list needs to be gotten from the view, but it may be possible to make the menu do the work.

[Brad Crittenden (bac)]

On Sep 8, 2009, at 10:07 , Curtis Hovey wrote:

>>
>> I'm a bit bothered by the way the horizontal links hop around and are
>> inconsistently ordered as you page through them. If you used the
>> following code (moved to a macro) for all pages then the link display
>> would be fixed in the same order and the active page would have a
>> disabled link, which is the way +global-action menus work.
>>
>> <div class="top-portlet" id="navlinks">
>> <ul class="horizontal">
>> <li>
>> <a tal:replace="structure view/menu:navigation/summary/
>> render"/></li>
>> <li>
>> <a tal:replace="structure
>> view/menu:navigation/maintained/render"/></li>
>> <li>
>> <a tal:replace="structure view/menu:navigation/uploaded/
>> render"/></li>
>> <li>
>> <a tal:replace="structure view/menu:navigation/ppa/render"/
>> ></li>
>> <li>
>> <a tal:replace="structure view/menu:navigation/projects/
>> render"/></li>
>> </ul>
>> </div>
>
> I agree with Brad, but I think we need another change. This approach
> creates empty <li> elements. Each <li> needs condition="view/
> menu:navigation/uploaded/enabled"

The snipped I suggested does not produce empty <li>. Here is what it
produces for the +related-projects page:

   <div class="top-portlet" id="navlinks">
     <ul class="horizontal">
       <li>
         <a href="https://launchpad.dev/~mark/+related-software"
      class="menu-link-summary sprite info">Summary</a></li>
       <li>
         <a href="https://launchpad.dev/~mark/+maintained-packages"
      class="menu-link-maintained sprite info">Maintained Packages</
a></li>
       <li>
         <a href="https://launchpad.dev/~mark/+uploaded-packages"
      class="menu-link-uploaded sprite info">Uploaded Packages</a></li>
       <li>
         <a href="https://launchpad.dev/~mark/+ppa-packages"
      class="menu-link-ppa sprite info">PPA Packages</a></li>
       <li>
         <span class="menu-link-projects nolink
               sprite info">Related Projects</span></li>
     </ul>
   </div>

>
> Since this is already a NavMenu, you could just iterate over
> the .enabled_links. I recall that the list needs to be gotten from
> the view, but it may be possible to make the menu do the work.

Leaving out the enabled links will cause the horizontal menu to leave
out the page we're on. What I have renders it as text, not a link,
which is what we do for +global-actions. Leaving it out may be your
preference.

[Michael Nelson (michael.nelson)]

Great to see a general solution for these problem pages!

The horizontal list solves the problem, and doesn't look too out-of-character (it would have been nice if we could have floated a standard 'related pages' menu portlet to the right, but I'm assuming you've discussed all those options with Curtis.

The only thing I'd watch out for is the use of the page_title view property. See the irc paste here:

https://code.edge.launchpad.net/~adeuring/launchpad/bug-426241-bugnomination-edit.pt-3.0-layout/+merge/11364

but basically, I'd remove the page_title view properties and either JDI or wait for barry's branch to land that will calculate the <title> page titles automatically.

review: Approve (ui)

[Julian Edwards (julian-edwards)]

Thanks for the review Michael!

On Tuesday 08 September 2009 16:21:12 Michael Nelson wrote:
> but basically, I'd remove the page_title view properties and either JDI or
> wait for barry's branch to land that will calculate the <title> page
> titles automatically.

The plan is to fix all our templates in one fell swoop when Barry's branch
lands. I don't think we should be blocking on that right now. I've attempted
to make it as easy as possible in all my branches to convert once it does
land, so in this case I just remove the heading slot in the template and it's
sorted. That's why I added page_title here and am using it manually. :)

Cheers
J

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-05 07:03:47 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-07 20:32:50 +0000
@@ -747,8 +747,6 @@
 
 person_karma = ContextDisplayName(smartquote("%s's karma in Launchpad"))
 
-person_maintained_packages = ContextDisplayName('Software maintained by %s')
-
 person_mentoringoffers = ContextTitle('Mentoring offered by %s')
 
 def person_mergeproposals(context, view):
@@ -765,12 +763,6 @@
 
 person_participation = ContextTitle("Team participation by %s")
 
-person_ppa_packages = ContextDisplayName('PPA packages related to %s')
-
-person_related_projects = ContextDisplayName('Projects related to %s')
-
-person_related_software = ContextDisplayName('Software related to %s')
-
 person_review = ContextDisplayName("Review %s")
 
 person_specfeedback = ContextDisplayName('Feature feedback requests for %s')
@@ -786,8 +778,6 @@
 
 person_teamhierarchy = ContextDisplayName('Team hierarchy for %s')
 
-person_uploaded_packages = ContextDisplayName('Software uploaded by %s')
-
 pofile_filter = FilteredTranslationsTitle(
     smartquote('Translations by %(person)s in "%(title)s"'))
 

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-09-05 03:33:24 +0000
+++ lib/lp/registry/browser/person.py	2009-09-07 20:32:50 +0000
@@ -870,7 +870,7 @@
     def summary(self):
         target = '+related-software'
         text = 'Summary'
-        return Link(target, text)
+        return Link(target, text, icon='info')
 
     def maintained(self):
         target = '+maintained-packages'
@@ -881,17 +881,17 @@
     def uploaded(self):
         target = '+uploaded-packages'
         text = 'Uploaded Packages'
-        return Link(target, text)
+        return Link(target, text, icon='info')
 
     def ppa(self):
         target = '+ppa-packages'
         text = 'PPA Packages'
-        return Link(target, text)
+        return Link(target, text, icon='info')
 
     def projects(self):
         target = '+related-projects'
         text = 'Related Projects'
-        return Link(target, text)
+        return Link(target, text, icon='info')
 
 
 class PersonOverviewMenu(ApplicationMenu, CommonMenuLinks):
@@ -4834,6 +4834,10 @@
 
     max_results_to_display = config.launchpad.default_batch_size
 
+    @property
+    def page_title(self):
+        return "Software related to " + self.context.title
+
     @cachedproperty
     def related_projects(self):
         """Return a list of project dicts owned or driven by this person.
@@ -5057,6 +5061,10 @@
         packages = self.context.getLatestMaintainedPackages()
         self.setUpBatch(packages)
 
+    @property
+    def page_title(self):
+        return "Software maintained by " + self.context.title
+
 
 class PersonUploadedPackagesView(PersonRelatedSoftwareView):
     """View for +uploaded-packages."""
@@ -5066,6 +5074,10 @@
         packages = self.context.getLatestUploadedButNotMaintainedPackages()
         self.setUpBatch(packages)
 
+    @property
+    def page_title(self):
+        return "Software uploaded by " + self.context.title
+
 
 class PersonPPAPackagesView(PersonRelatedSoftwareView):
     """View for +ppa-packages."""
@@ -5082,6 +5094,10 @@
         packages_batch = self.filterPPAPackageList(packages_batch)
         self.batch = self._addStatsToPackages(packages_batch)
 
+    @property
+    def page_title(self):
+        return "PPA packages related to " + self.context.title
+
 
 class PersonRelatedProjectsView(PersonRelatedSoftwareView):
     """View for +related-projects."""
@@ -5092,6 +5108,10 @@
             self.related_projects, self.request)
         self.batch = list(self.batchnav.currentBatch())
 
+    @property
+    def page_title(self):
+        return "Projects related to " + self.context.title
+
 
 class PersonOAuthTokensView(LaunchpadView):
     """Where users can see/revoke their non-expired access tokens."""

=== modified file 'lib/lp/registry/stories/foaf/xx-person-packages.txt'
--- lib/lp/registry/stories/foaf/xx-person-packages.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/registry/stories/foaf/xx-person-packages.txt	2009-09-08 10:49:20 +0000
@@ -5,18 +5,10 @@
 
     >>> anon_browser.open('http://launchpad.dev/~mark')
     >>> anon_browser.getLink('Related Software').click()
-    >>> print_navigation_links(anon_browser.contents)
-    Profile: ...
-    Related Software
-    Karma: ...
 
     >>> print anon_browser.title
     Software related to Mark Shuttleworth
     >>> print anon_browser.url
     http://launchpad.dev/~mark/+related-software
 
-That page displays a table, the with list of 'Maintained'packages as
-well as the list of 'Uploaded' packages. The table also shows the
-number of open bugs and questions filed against each package.
-
 Please see pagetests/soyuz/xx-person-packages.txt for details.

=== modified file 'lib/lp/registry/templates/person-related-projects.pt'
--- lib/lp/registry/templates/person-related-projects.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-related-projects.pt	2009-09-08 11:49:02 +0000
@@ -3,20 +3,33 @@
   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="view/macro:page/onecolumn"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
+<div metal:fill-slot="heading">
+  <h1 tal:content="view/page_title"/>
+</div>
+
 <div metal:fill-slot="main">
-
-  <div id="projects">
+  <div class="top-portlet" id="navlinks">
+    <ul class="horizontal">
+      <li>
+        <a tal:replace="structure view/menu:navigation/summary/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/maintained/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/uploaded/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/ppa/render"/></li>
+    </ul>
+  </div>
+
+
+  <div id="projects" class="top-portlet">
     <a name="projects" />
-    <h1>Related projects</h1>
 
     <tal:navigation_top
          replace="structure view/batchnav/@@+navigation-links-upper" />

=== modified file 'lib/lp/registry/templates/person-related-software.pt'
--- lib/lp/registry/templates/person-related-software.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-related-software.pt	2009-09-08 11:49:02 +0000
@@ -3,23 +3,39 @@
   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="view/macro:page/onecolumn"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
+<div metal:fill-slot="heading">
+  <h1 tal:content="view/page_title"/>
+</div>
+
 <div metal:fill-slot="main">
+  <div class="top-portlet" id="navlinks">
+    <ul class="horizontal">
+      Full listings:
+      <li>
+        <a tal:replace="structure view/menu:navigation/maintained/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/uploaded/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/ppa/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/projects/render"/></li>
+    </ul>
+  </div>
+
   <div id="packages">
 
   <tal:maintained-packages
     define="sourcepackagereleases view/get_latest_maintained_packages_with_stats"
     condition="sourcepackagereleases">
 
-  <h1>Maintained packages</h1>
+  <div class="top-portlet">
+  <h2>Maintained packages</h2>
 
   <tal:message replace="view/maintained_packages_header_message"/>
   <table class="listing">
@@ -38,13 +54,15 @@
     <div metal:use-macro="context/@@+person-macros/sourcepackagerelease-rows" />
     </tbody>
   </table>
+  </div>
   </tal:maintained-packages>
 
   <tal:uploaded-packages
     define="sourcepackagereleases view/get_latest_uploaded_but_not_maintained_packages_with_stats"
     condition="sourcepackagereleases">
 
-  <h1>Uploaded packages</h1>
+  <div class="top-portlet">
+  <h2>Uploaded packages</h2>
 
   <tal:message replace="view/uploaded_packages_header_message"/>
   <table class="listing">
@@ -62,13 +80,15 @@
 
     <div metal:use-macro="context/@@+person-macros/sourcepackagerelease-rows" />
   </table>
+  </div>
   </tal:uploaded-packages>
 
   <tal:ppa-packages
     define="sourcepackagereleases view/get_latest_uploaded_ppa_packages_with_stats"
     condition="sourcepackagereleases">
 
-  <h1>PPA packages</h1>
+  <div class="top-portlet">
+  <h2>PPA packages</h2>
 
   <tal:message replace="view/ppa_packages_header_message"/>
   <table class="listing">
@@ -86,13 +106,14 @@
 
     <div metal:use-macro="template/macros/sourcepackagerelease-ppa-rows" />
   </table>
+  </div>
   </tal:ppa-packages>
 
-  </div>
+  </div><!--id packages-->
 
-  <div id="projects">
+  <div id="projects" class="top-portlet">
     <a name="projects" />
-    <h1>Related projects</h1>
+    <h2>Related projects</h2>
 
     <span id="limit-encountered"
           tal:content="view/projects_header_message" />

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt	2009-08-31 23:45:11 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt	2009-09-08 11:39:16 +0000
@@ -185,31 +185,3 @@
     >>> anon_browser.getLink('Previous').url
     'http://launchpad.dev/%7Ecprov/+archive/ppa/+index?start=1&batch=1'
 
-== Maintained Packages link ==
-
-The Maintained Packages link only appears if the person or team has
-maintained packages to show. No-priv does not maintain packages.
-
-    >>> anon_browser.open("http://launchpad.dev/~no-priv")
-    >>> print_tag_with_id(anon_browser.contents, 'ppas')
-    Personal package archives
-    PPA for No Privileges Person
-    >>> anon_browser.open(
-    ...     "http://launchpad.dev/~no-priv/+maintained-packages")
-    >>> print extract_text(
-    ...     find_tag_by_id(anon_browser.contents, 'packages'))
-    Maintained packages...
-    No Privileges Person does not maintain any packages.
-
-Mark has packages that he maintains.
-
-    >>> anon_browser.open("http://launchpad.dev/~mark")
-    >>> print_tag_with_id(anon_browser.contents, 'ppas')
-    Personal package archives
-    PPA for Mark Shuttleworth
-    Maintained Packages
-    >>> anon_browser.getLink(url="+maintained-packages").click()
-    >>> print extract_text(
-    ...     find_tag_by_id(anon_browser.contents, 'packages'))
-    Maintained packages...
-    alsa-utils  ... 1.0.9a-4...

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-person-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2009-09-08 11:39:16 +0000
@@ -10,19 +10,24 @@
 
 This page is just a summary of the user's packages and will only
 display up to the most recent 30 items in each category.  However, it
-has a navigation sub-menu that takes the user to batched listings in
-each category where all items can be perused.
-
-    >>> print_navigation_links(browser.contents)
-    Profile: http://launchpad.dev/~name16
-    Related Software
-    Karma: http://launchpad.dev/~name16/+karma
-    Personal Package Archives: http://launchpad.dev/~name16#ppas
-      Summary
-      Maintained Packages: http://launchpad.dev/~name16/+maintained-packages
-      Uploaded Packages: http://launchpad.dev/~name16/+uploaded-packages
-      PPA Packages: http://launchpad.dev/~name16/+ppa-packages
-      Related Projects: http://launchpad.dev/~name16/+related-projects
+has more links that take the user to batched listings in each category
+where all items can be perused.
+
+    >>> print extract_text(find_tag_by_id(browser.contents, 'navlinks'))
+    Full listings:
+    Maintained Packages
+    Uploaded Packages
+    PPA Packages
+    Related Projects
+
+    >>> print browser.getLink("Maintained Packages").url
+    http://launchpad.dev/~name16/+maintained-packages
+    >>> print browser.getLink("Uploaded Packages").url
+    http://launchpad.dev/~name16/+uploaded-packages
+    >>> print browser.getLink("PPA Packages").url
+    http://launchpad.dev/~name16/+ppa-packages
+    >>> print browser.getLink("Related Projects").url
+    http://launchpad.dev/~name16/+related-projects
 
 Each category on the summary page has a heading that shows how many
 packages are being displayed.
@@ -87,19 +92,31 @@
     >>> browser.open("http://launchpad.dev/~mark/+related-software")
     >>> browser.getLink("Maintained Packages").click()
     >>> print extract_text(find_tag_by_id(browser.contents, 'packages'))
-    Maintained packages
     1...5 of 7 results
     ...
     Name        Uploaded to  Version   When        Failures   Bugs  Questions
     alsa-utils  Debian Sid   1.0.9a-4  2005-07-01  None       0     0
     ...
 
+The Maintained Packages page only has data if the person or team has
+maintained packages to show. No-priv does not maintain packages.
+
+    >>> anon_browser.open("http://launchpad.dev/~no-priv")
+    >>> print_tag_with_id(anon_browser.contents, 'ppas')
+    Personal package archives
+    PPA for No Privileges Person
+    >>> anon_browser.open(
+    ...     "http://launchpad.dev/~no-priv/+maintained-packages")
+    >>> print extract_text(
+    ...     find_tag_by_id(anon_browser.contents, 'packages'))
+    Name...
+    No Privileges Person does not maintain any packages.
+
 The navigation link to "Uploaded Packages" takes the user to the
 page that lists uploaded packages in batches.
 
     >>> browser.getLink("Uploaded Packages").click()
     >>> print extract_text(find_tag_by_id(browser.contents, 'packages'))
-    Uploaded packages
     1...5 of 6 results
     ...
     Name    Uploaded to          Version When        Failures   Bugs  Questions
@@ -111,7 +128,6 @@
 
     >>> browser.getLink("PPA Packages").click()
     >>> print extract_text(find_tag_by_id(browser.contents, 'packages'))
-    PPA packages
     1...1 of 1 result
     ...
     Name      Uploaded to           Version  When        Failures
@@ -122,7 +138,6 @@
 
     >>> browser.getLink("Related Projects").click()
     >>> print extract_text(find_tag_by_id(browser.contents, 'projects'))
-    Related projects
     1...5 of 5 results
     ...
     Name           Bugs  Blueprints  Questions

=== modified file 'lib/lp/soyuz/templates/person-maintained-packages.pt'
--- lib/lp/soyuz/templates/person-maintained-packages.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/person-maintained-packages.pt	2009-09-08 11:49:02 +0000
@@ -4,19 +4,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="view/macro:page/onecolumn"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
+<div metal:fill-slot="heading">
+  <h1 tal:content="view/page_title"/>
+</div>
+
 <div metal:fill-slot="main">
-  <div id="packages">
+  <div class="top-portlet" id="navlinks">
+    <ul class="horizontal">
+      <li><a tal:replace="structure view/menu:navigation/summary/render"/></li>
+      <li><a tal:replace="structure view/menu:navigation/uploaded/render"/></li>
+      <li><a tal:replace="structure view/menu:navigation/ppa/render"/></li>
+      <li><a tal:replace="structure view/menu:navigation/projects/render"/></li>
+    </ul>
+  </div>
 
-  <h1>Maintained packages</h1>
+  <div id="packages" class="top-portlet">
 
   <tal:navigation_top
        replace="structure view/batchnav/@@+navigation-links-upper" />

=== modified file 'lib/lp/soyuz/templates/person-ppa-packages.pt'
--- lib/lp/soyuz/templates/person-ppa-packages.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/person-ppa-packages.pt	2009-09-08 11:49:02 +0000
@@ -4,19 +4,31 @@
   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="view/macro:page/onecolumn"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
+<div metal:fill-slot="heading">
+  <h1 tal:content="view/page_title"/>
+</div>
+
 <div metal:fill-slot="main">
-  <div id="packages">
+  <div class="top-portlet" id="navlinks">
+    <ul class="horizontal">
+      <li>
+        <a tal:replace="structure view/menu:navigation/summary/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/uploaded/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/maintained/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/projects/render"/></li>
+    </ul>
+  </div>
 
-  <h1>PPA packages</h1>
+  <div id="packages" class="top-portlet">
 
   <tal:navigation_top
        replace="structure view/batchnav/@@+navigation-links-upper" />

=== modified file 'lib/lp/soyuz/templates/person-uploaded-packages.pt'
--- lib/lp/soyuz/templates/person-uploaded-packages.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/person-uploaded-packages.pt	2009-09-08 11:49:02 +0000
@@ -4,19 +4,31 @@
   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="view/macro:page/onecolumn"
+  metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad"
 >
 
 <body>
 
+<div metal:fill-slot="heading">
+  <h1 tal:content="view/page_title"/>
+</div>
+
 <div metal:fill-slot="main">
-  <div id="packages">
+  <div class="top-portlet" id="navlinks">
+    <ul class="horizontal">
+      <li>
+        <a tal:replace="structure view/menu:navigation/summary/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/maintained/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/ppa/render"/></li>
+      <li>
+        <a tal:replace="structure view/menu:navigation/projects/render"/></li>
+    </ul>
+  </div>
 
-  <h1>Uploaded packages</h1>
+  <div id="packages" class="top-portlet">
 
   <tal:navigation_top
        replace="structure view/batchnav/@@+navigation-links-upper" />