Merge lp:~edwin-grubbs/launchpad/bug-426899-ppa-links into lp:launchpad

[Edwin Grubbs]

Made the links to software and packages related to a person clearer and hid links when the page is empty.

[Edwin Grubbs (edwin-grubbs)]

Summary
-------

Instead of having multiple links for "Related projects", "PPA Packages", and
"Uploaded packages" on the person/team index page, there is now one "Related
software and packages" link that takes you to the +related-software page where
you can navigate to all the other pages.

The links on the +related-software page are now only displayed when there
are entries for "Uploaded packages", etc.

Tests
-----

./bin/test -vv -t xx-person-packages.txt

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

* Open http://launchpad.dev/~mark
    * Should have a "Related software and packages" link underneath the branding.
* Open http://launchpad.dev/~mark/+related-software
    * There should be five links at the top of this page, and the link for
      the page you are on should be delinkified to show which page you are on.
        * Related software
        * Maintained packages
        * Uploaded packages
        * PPA packages
        * Related projects
* Open http://launchpad.dev/~guadamen/
    * Should have a "Related software and packages" link underneath the branding.
* Open http://launchpad.dev/~guadamen/+related-software
    * Should just show the "Related software" link which is delinkified (plain
      text) since guadamen doesn't have any packages.

[Eleanor Berger (intellectronica)]

Nice branch, everything looks good to me. Don't forget to close bug #426900 if it is no longer relevant.

review: Approve (code)

[Edwin Grubbs (edwin-grubbs)]

Here are some screenshots for the UI review.

The person page with the "Related software and packages" link. The team index page will look the same, although there won't be an "Authorized applications" link nearby.
  https://chinstrap.canonical.com/~egrubbs/person_index_page.png

The +related-software page with four links to the right of "Related software", which is not a link to indicate that you are on that page.
  https://chinstrap.canonical.com/~egrubbs/person_related_software_page.png

A team with no links to the right of "Related software" since it has none.
  https://chinstrap.canonical.com/~egrubbs/team_with_no_related_software.png

[Curtis Hovey (sinzui)]

Hi Edwin.

Thanks for making these screencaps.
    * I like the profile page change.
    * I really think that the link to "PPA packages related to Curtis Hovey" should be
      (i) Related PPA packages
      Because the link implies my PPA when the page title says it is about packages in related PPAs.
    * I am pleased that we are not making links to useless pages.

review: Approve (ui)

[Paul Hummer (rockstar)]

Looks good.

review: Approve (ui)

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-10-13 14:25:20 +0000
+++ lib/lp/registry/browser/person.py	2009-10-20 02:28:14 +0000
@@ -842,7 +842,7 @@
 
     def related_software_summary(self):
         target = '+related-software'
-        text = 'Summary'
+        text = 'Related software'
         return Link(target, text, icon='info')
 
     def maintained(self):
@@ -854,21 +854,21 @@
     def uploaded(self):
         target = '+uploaded-packages'
         text = 'Uploaded packages'
-        return Link(target, text, icon='info')
+        enabled = bool(
+            self.person.getLatestUploadedButNotMaintainedPackages())
+        return Link(target, text, enabled=enabled, icon='info')
 
     def ppa(self):
-        # XXX: salgado, 2009-09-09, bug=426899: Need to conditionally disable
-        # this link.
         target = '+ppa-packages'
-        text = 'PPA packages'
-        return Link(target, text, icon='info')
+        text = 'Related PPA packages'
+        enabled = bool(self.person.getLatestUploadedPPAPackages())
+        return Link(target, text, enabled=enabled, icon='info')
 
     def projects(self):
-        # XXX: salgado, 2009-09-09, bug=426900: Need to conditionally disable
-        # this link.
         target = '+related-projects'
         text = 'Related projects'
-        return Link(target, text, icon='info')
+        enabled = bool(self.person.getOwnedOrDrivenPillars())
+        return Link(target, text, enabled=enabled, icon='info')
 
 
 class PersonMenuMixin(CommonMenuLinks):
@@ -1253,7 +1253,8 @@
              'editemail', 'configure_mailing_list', 'moderate_mailing_list',
              'editlanguages', 'map', 'polls',
              'add_poll', 'join', 'leave', 'add_my_teams',
-             'reassign', 'projects', 'activate_ppa', 'maintained', 'ppa']
+             'reassign', 'projects', 'activate_ppa', 'maintained', 'ppa',
+             'related_software_summary']
 
 
 class TeamOverviewNavigationMenu(NavigationMenu, TeamMenuMixin):

=== modified file 'lib/lp/registry/templates/person-index.pt'
--- lib/lp/registry/templates/person-index.pt	2009-09-18 21:25:39 +0000
+++ lib/lp/registry/templates/person-index.pt	2009-10-20 02:28:14 +0000
@@ -88,22 +88,17 @@
       tal:content="structure context/homepage_content/fmt:text-to-html"
     />
     <ul class="horizontal">
+      <tal:comment condition="nothing">
+        This link name is different from the menu, since it refers
+        to several pages that are all accessible when you click on this link.
+      </tal:comment>
       <li
         tal:define="link context/menu:overview/related_software_summary"
-        tal:condition="link/enabled"
-        tal:content="structure link/fmt:link" />
-      <li
-        tal:define="link context/menu:overview/projects"
-        tal:condition="link/enabled"
-        tal:content="structure link/fmt:link" />
-      <li
-        tal:define="link context/menu:overview/maintained"
-        tal:condition="link/enabled"
-        tal:content="structure link/fmt:link" />
-      <li
-        tal:define="link context/menu:overview/ppa"
-        tal:condition="link/enabled"
-        tal:content="structure link/fmt:link" />
+        tal:condition="link/enabled">
+        <a class="sprite info" tal:attributes="href link/fmt:url">
+          Related software and packages
+        </a>
+      </li>
       <li
         tal:define="link context/menu:overview/oauth_tokens"
         tal:condition="link/enabled"

=== modified file 'lib/lp/registry/templates/person-related-software-navlinks.pt'
--- lib/lp/registry/templates/person-related-software-navlinks.pt	2009-09-09 18:50:13 +0000
+++ lib/lp/registry/templates/person-related-software-navlinks.pt	2009-10-20 02:28:14 +0000
@@ -5,17 +5,26 @@
   omit-tag="">
 
     <ul id="navlinks" class="horizontal">
-      <li>
-        <a tal:replace="structure
-          view/menu:navigation/related_software_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>
+      <li
+        tal:define="link view/menu:navigation/related_software_summary"
+        tal:condition="link/enabled"
+        tal:content="structure link/fmt:link" />
+      <li
+        tal:define="link view/menu:navigation/maintained"
+        tal:condition="link/enabled"
+        tal:content="structure link/fmt:link" />
+      <li
+        tal:define="link view/menu:navigation/uploaded"
+        tal:condition="link/enabled"
+        tal:content="structure link/fmt:link" />
+      <li
+        tal:define="link view/menu:navigation/ppa"
+        tal:condition="link/enabled"
+        tal:content="structure link/fmt:link" />
+      <li
+        tal:define="link view/menu:navigation/projects"
+        tal:condition="link/enabled"
+        tal:content="structure link/fmt:link" />
     </ul>
 
 </tal:root>

=== modified file 'lib/lp/registry/templates/team-index.pt'
--- lib/lp/registry/templates/team-index.pt	2009-09-18 21:25:39 +0000
+++ lib/lp/registry/templates/team-index.pt	2009-10-20 02:28:14 +0000
@@ -59,18 +59,17 @@
     tal:content="structure context/teamdescription/fmt:text-to-html"
   />
   <ul class="horizontal">
-    <li
-      tal:define="link context/menu:overview/projects"
-      tal:condition="link/enabled"
-      tal:content="structure link/fmt:link" />
-    <li
-      tal:define="link context/menu:overview/maintained"
-      tal:condition="link/enabled"
-      tal:content="structure link/fmt:link" />
-    <li
-      tal:define="link context/menu:overview/ppa"
-      tal:condition="link/enabled"
-      tal:content="structure link/fmt:link" />
+    <tal:comment condition="nothing">
+      This link name is different from the menu, since it refers
+      to several pages that are all accessible when you click on this link.
+    </tal:comment>
+    <li
+      tal:define="link context/menu:overview/related_software_summary"
+      tal:condition="link/enabled">
+      <a class="sprite info" tal:attributes="href link/fmt:url">
+        Related software and packages
+      </a>
+    </li>
   </ul>
 
   <div class="yui-g">

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-person-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2009-10-20 02:28:14 +0000
@@ -4,9 +4,9 @@
 that person's +related-software page, which is linked to from the
 person's home page.
 
-    >>> browser.open("http://launchpad.dev/~name16/+related-software")
+    >>> browser.open("http://launchpad.dev/~mark/+related-software")
     >>> print browser.title
-    Software related to Foo Bar...
+    Software related to Mark Shuttleworth...
 
 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
@@ -14,20 +14,20 @@
 where all items can be perused.
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'navlinks'))
-    Summary
+    Related software
     Maintained packages
     Uploaded packages
-    PPA packages
+    Related PPA packages
     Related projects
 
     >>> print browser.getLink("Maintained packages").url
-    http://launchpad.dev/~name16/+maintained-packages
+    http://launchpad.dev/~mark/+maintained-packages
     >>> print browser.getLink("Uploaded packages").url
-    http://launchpad.dev/~name16/+uploaded-packages
+    http://launchpad.dev/~mark/+uploaded-packages
     >>> print browser.getLink("PPA packages").url
-    http://launchpad.dev/~name16/+ppa-packages
+    http://launchpad.dev/~mark/+ppa-packages
     >>> print browser.getLink("Related projects").url
-    http://launchpad.dev/~name16/+related-projects
+    http://launchpad.dev/~mark/+related-projects
 
 Each category on the summary page has a heading that shows how many
 packages are being displayed.