Merge lp:~michael.nelson/launchpad/missing-distro-ppas-heading into lp:launchpad

[Michael Nelson]

[Michael Nelson (michael.nelson)]

= Summary =

This branch fixes the distribution ppas view, which was updated to 3-0
before the requirement of view.label for the main heading.

You can see the missing heading at:

https://edge.launchpad.net/ubuntu/+ppas

I also updated the page_title to something shorter now that it's used as
the leaf of the breadcrumbs (and first part of the page-title).

== Tests ==

bin/test -vv -t distribution-views.txt -t xx-ubuntu-ppas.txt -t
stories/soyuz -t stories/ppa

== Demo and Q/A ==

Screenshot:
http://people.canonical.com/~michaeln/tmp/distro-ppa-heading.png

Demo:
https://launchpad.dev/ubuntu/+ppas

QA:
https://edge.launchpad.net/ubuntu/+ppas

= 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/stories/ppa/xx-ubuntu-ppas.txt
  lib/lp/soyuz/templates/distribution-ppa-list.pt
  lib/lp/registry/browser/tests/distribution-views.txt
  lib/lp/registry/browser/distribution.py

--
Michael

[Graham Binns (gmb)]

review: Approve

[Brad Crittenden (bac)]

review: Approve (release-critical)

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2009-09-16 00:40:53 +0000
+++ lib/lp/registry/browser/distribution.py	2009-09-22 10:05:26 +0000
@@ -659,13 +659,15 @@
 class DistributionPPASearchView(LaunchpadView):
     """Search PPAs belonging to the Distribution in question."""
 
+    page_title = "Personal Package Archives"
+
     def initialize(self):
         self.name_filter = self.request.get('name_filter')
         self.show_inactive = self.request.get('show_inactive')
 
     @property
-    def page_title(self):
-        return '%s Personal Package Archives' % self.context.title
+    def label(self):
+        return 'Personal Package Archives for %s' % self.context.title
 
     @property
     def search_results(self):

=== modified file 'lib/lp/registry/browser/tests/distribution-views.txt'
--- lib/lp/registry/browser/tests/distribution-views.txt	2009-09-15 16:26:15 +0000
+++ lib/lp/registry/browser/tests/distribution-views.txt	2009-09-22 10:05:26 +0000
@@ -304,3 +304,18 @@
     grumpy unhighlighted
     hoary highlighted
     warty unhighlighted
+
+
+Distribution +ppas
+------------------
+
+The +ppas view provides a page title and label, some statistics helpers
+and search results.
+
+    >>> view = create_view(ubuntu, name='+ppas')
+    >>> print view.label
+    Personal Package Archives for Ubuntu Linux
+
+    # The leaf of the breadcrumbs, also used in the page-title.
+    >>> print view.page_title
+    Personal Package Archives

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2009-09-19 08:30:29 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2009-09-22 10:05:26 +0000
@@ -4,8 +4,16 @@
 
     >>> anon_browser.open("http://launchpad.dev/ubuntu")
     >>> anon_browser.getLink("Personal Package Archives").click()
-    >>> print anon_browser.title
-    Ubuntu Linux Personal Package Archives...
+    >>> print_location(anon_browser.contents)
+    Hierarchy: Ubuntu > Personal Package Archives
+    Tabs:
+    * Overview (selected) - http://launchpad.dev/ubuntu
+    * Code - http://code.launchpad.dev/ubuntu
+    * Bugs - http://bugs.launchpad.dev/ubuntu
+    * Blueprints - http://blueprints.launchpad.dev/ubuntu
+    * Translations - http://translations.launchpad.dev/ubuntu
+    * Answers - http://answers.launchpad.dev/ubuntu
+    Main heading: Personal Package Archives for Ubuntu Linux
 
 
 == Distribution PPA main page ==
@@ -77,7 +85,7 @@
     >>> anon_browser.open("http://launchpad.dev/debian")
     >>> anon_browser.getLink("Personal Package Archives").click()
     >>> print anon_browser.title
-    Debian GNU/Linux Personal Package Archives...
+    Personal Package Archives : Debian
 
 Those pages present coherent data for a distribution with no PPAs.
 
@@ -594,7 +602,7 @@
     >>> anon_browser.open("http://launchpad.dev/ubuntutest")
     >>> anon_browser.getLink("Personal Package Archives").click()
     >>> print anon_browser.title
-    Ubuntu Test Personal Package Archives...
+    Personal Package Archives : ubuntutest
 
     >>> len(find_tags_by_class(anon_browser.contents, 'ppa_batch_row'))
     0

=== modified file 'lib/lp/soyuz/templates/distribution-ppa-list.pt'
--- lib/lp/soyuz/templates/distribution-ppa-list.pt	2009-09-02 05:37:54 +0000
+++ lib/lp/soyuz/templates/distribution-ppa-list.pt	2009-09-22 10:05:26 +0000
@@ -16,8 +16,6 @@
 
     <div id="ppa_search" class="top-portlet">
 
-      <h2>Personal Package Archives</h2>
-
       <p>Personal Package Archives (PPA) allow you to upload
          Ubuntu source packages to be built and published as an
          apt repository by Launchpad. You can find out more about