Merge lp:~sinzui/launchpad/needs-packaging-bug-509848 into lp:launchpad/db-devel

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to add the view for +needs-packaging. It also fixes two
bread crumb bugs: do not link the last item and white space is underlined.

    lp:~sinzui/launchpad/needs-packaging-bug-509848
    Diff size: 340
    Launchpad bug: https://bugs.launchpad.net/bugs/509848
                   https://bugs.launchpad.net/bugs/83613
                   https://bugs.launchpad.net/bugs/480473
    Test command: ./bin/test -vv \
        -t hierarchical-menu \
        -t packaging-views \
        -t xx-show-distroseries-packaging
    Pre-implementation: bac, beuno
    Target release: 10.01

Add the view for +needs-packaging
---------------------------------

Add a view and template to list the packages that need packaging links.
The view should follow the example in the ubuntu-link-to-upstream blueprint.

Rules
-----

    * Create a view that shows the prioritised listing of packages that need
      packaging links
    * Each item must show information that encourages users to link the
      package to an upstream project.
    * ADDENDUM: Fix the trailing bread crumb, it should not be linked because
      it is the current page. Fix the white space too.

QA
--

Visit staging (This relies on a model that depends upon a schema change)

    * https://staging.launchpad.net/ubuntu/lucid/+needs-packaging
    * Verify it lists the source packages that are not linked to upstream
    * Verify the link link to Upstream links works
    * Verify the page lists 100 packages.
    * Verify that the packages appear to be listed in order of bugs with
      the highest heat and most translatable messages. Since this information
      is not visible, it is difficult to judge. The crucial issue is, does
      the ordering look sane?

Lint
----

Linting changed files:
  lib/canonical/launchpad/doc/hierarchical-menu.txt
  lib/canonical/launchpad/icing/style-3-0.css
  lib/lp/app/templates/launchpad-hierarchy.pt
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/distroseries.py
  lib/lp/registry/browser/tests/packaging-views.txt
  lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt
  lib/lp/registry/templates/distroseries-needs-packaging.pt

Test
----

    * lib/canonical/launchpad/doc/hierarchical-menu.txt
      * Updated test to verify that the last bread crumb is not linked.
    * lib/lp/registry/browser/tests/packaging-views.txt
      * Add a test for the new view to verify the page_title and label, as
        well as the BatchNavigator settings.
    * lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt
      * Add a simple story to demonstrate what any user can do with the
        page.
      * There is an XXX for a the portlet that will be added in my next
        branch.

Implementation
--------------

    * lib/canonical/launchpad/icing/style-3-0.css
      * Added a "narrow" class that uses the paragraph for content that
        is difficult to use when it fills the available space.
    * lib/lp/app/templates/launchpad-hierarchy.pt
      * Removed the access white space that cause the odd underlining in
        some browsers.
      * Added an omit-tag rule so that the last bread crumb is not linked.
  ...

[Curtis Hovey (sinzui)]

Hi Martin.

This branch adds the +needs-packaging page as proposed in
    https://blueprints.launchpad.net/launchpad-registry/+spec/ubuntu-link-to-upstream

It differs from the design in the proposal because the missing branch column will always be missing, as noted by Brad; it was not adding information. The content was difficult to read at full width so I contrained to to match the paragraph's width. Please note tha the odd numbers in the table are because sample data is bad.

    http://launchpadlibrarian.net/38198401/needs-packaging.png

You asked if the user could edit the information from this page. The answer is no. We are linking directly to the source package page because that page *will* ask the user to select the upstream project from a list of candidates, or choose by search.

[Eleanor Berger (intellectronica)]

(10:51:18) intellectronica: sinzui: unless it's necessary (because the extra whitespace creates formatting problems), i prefer closing html tags on a new line. can you change the anchor on line 19 of your diff?
(10:51:45) intellectronica: and in the template too, of course
(10:52:19) beuno is now known as beuno-lunch
(10:52:22) sinzui: oh, that is clumbs of me. I will fix both
(10:52:27) sinzui: clumbsy
(10:52:36) intellectronica: cool, thanks
(10:55:00) intellectronica: sinzui: 'packagings' reads quite funny to me. are you sure this is the best choice? i would have dropped the plural s (but i'm not a native speaker so be critical with my english advice)
(10:56:56) intellectronica: sinzui: everything else looks good to me, so r=me
(10:57:04) sinzui: thanks
(10:57:28) intellectronica: sinzui: note that i haven't done any ui reviewing at all. i'll leave that for beuno-lunch (or noodles)
(10:58:10) sinzui: intellectronica: understood

review: Approve (code)

[Martin Albisetti (beuno)]

Hi Curtis,

A few quick thoughts:

- I think that the table can be re-worked to something like this:

------------------------------------------------------
       Source Package | Bugs | Translations |
------------------------------------------------------
  [] pmount | _12 bugs_ | _12 strings_ |
  [] alsa-utils | _1 bug_ | _0 strings_ |
  [] cnews | No bugs | No strings |
------------------------------------------------------

What's the "Upstream links" option? I don't understand the difference between that one and the one we're on.

review: Needs Fixing (ui)

[Curtis Hovey (sinzui)]

Hi Martin.

I updated the format and content of the table.
http://people.canonical.com/~curtis/needs-packaging.png

[Martin Albisetti (beuno)]

Thanks for the fixes Curtis.
The only remaining confusion seems to be the "Needs upstream links" / "Upstream links" links.
How about "Needs upstream links" / "All upstream links"?

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/doc/hierarchical-menu.txt'
--- lib/canonical/launchpad/doc/hierarchical-menu.txt	2009-10-15 13:17:58 +0000
+++ lib/canonical/launchpad/doc/hierarchical-menu.txt	2010-01-30 22:41:18 +0000
@@ -233,9 +233,23 @@
     ...                 for step in hierarchy]
     ...     print 'Location:', ' > '.join(segments)
 
-    >>> print_hierarchy(hierarchy.render())
+    >>> markup = hierarchy.render()
+    >>> print_hierarchy(markup)
     Location: Joy of cooking > Spam
 
+The items in the breadcrumbs are linked, except for the last one which
+represents the current location.
+
+    >>> print markup
+    <ol class="breadcrumbs">
+      <li>
+        <a href="http://launchpad.dev/joy-of-cooking">Joy of cooking</a>
+      </li>
+      <li>
+          Spam
+      </li>
+    </ol>
+
 The Launchpad Homepage displays no items in its location bar.  We are
 considered to be on the home page if there are no breadcrumbs.
 

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2010-01-14 04:55:10 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2010-01-30 22:41:18 +0000
@@ -161,7 +161,7 @@
     width: auto;
     margin-bottom: 0.8em;
     }
-p, li, dt, dd, blockquote {
+p, li, dt, dd, blockquote, .narrow {
     max-width: 45em; /* Wrap the text before the eye gets lost. */
     }
 pre, code, samp, tt, .console {

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2009-10-02 21:00:37 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2010-01-30 22:41:18 +0000
@@ -94,7 +94,7 @@
               <div class="yui-b" dir="ltr">
                 <div>
                   <h2>Heading</h2>
-                  <ol class="breadcrumbs" xmlns="http://www.w3.org/1999/xhtml">
+                  <ol class="breadcrumbs">
     ...
 
 Top portlet.
@@ -190,7 +190,7 @@
               <div class="yui-b" dir="ltr">
                 <div>
     <BLANKLINE>
-                  <ol class="breadcrumbs" xmlns="http://www.w3.org/1999/xhtml">
+                  <ol class="breadcrumbs">
     <BLANKLINE>
     </ol>
     <BLANKLINE>
@@ -310,7 +310,7 @@
               <div class="yui-b" dir="ltr">
                 <div>
     <BLANKLINE>
-                  <ol class="breadcrumbs" xmlns="http://www.w3.org/1999/xhtml">
+                  <ol class="breadcrumbs">
     <BLANKLINE>
     </ol>
     ...

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-01-22 15:47:53 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-01-30 22:41:18 +0000
@@ -391,4 +391,21 @@
   </div>
 </metal:site-message>
 
+<metal:plural-msg define-macro="plural-message">
+  <tal:comment condition="nothing">
+    Expected variables to be defined in a containing tag or global:
+    count - value to check to determine plural form
+    singluar - string to use when count == 1
+    plural - string to use when count > 1.  If no plural is given it defaults
+    to the singular value + 's'.
+  </tal:comment>
+  <tal:singular
+    condition="python: count == 1"
+    replace="singular" />
+  <tal:plural
+     define="l_default string:s;
+             l_plural plural | string:$singular$l_default;"
+    condition="python: count != 1"
+    replace="l_plural" />
+</metal:plural-msg>
 </macros>

=== modified file 'lib/lp/app/templates/launchpad-hierarchy.pt'
--- lib/lp/app/templates/launchpad-hierarchy.pt	2009-09-18 17:38:50 +0000
+++ lib/lp/app/templates/launchpad-hierarchy.pt	2010-01-30 22:41:18 +0000
@@ -1,6 +1,5 @@
 <ol
   class="breadcrumbs"
-  xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
@@ -9,16 +8,14 @@
 <tal:breadcrumbs repeat="breadcrumb view/items"
                  condition="view/display_breadcrumbs">
   <li>
-    <a tal:attributes="href breadcrumb/url">
-      <tal:text condition="not: repeat/breadcrumb/end"
-                replace="breadcrumb/text">
-        Bugs on redfish
-      </tal:text>
-      <tal:text condition="repeat/breadcrumb/end"
-                replace="breadcrumb/text/fmt:shorten/40">
-        Bugs on redfish
-      </tal:text>
-    </a>
+    <a tal:attributes="href breadcrumb/url"
+      tal:omit-tag="repeat/breadcrumb/end"><tal:text 
+        condition="not: repeat/breadcrumb/end"
+        replace="breadcrumb/text">
+          Bugs on redfish</tal:text><tal:text
+        condition="repeat/breadcrumb/end"
+        replace="breadcrumb/text/fmt:shorten/40">
+          Bugs on redfish</tal:text></a>
   </li>
 </tal:breadcrumbs>
 </ol>

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-01-21 23:46:24 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-01-30 22:41:18 +0000
@@ -101,6 +101,13 @@
         template="../templates/distroseries-packaging.pt"/>
     <browser:page
         for="lp.registry.interfaces.distroseries.IDistroSeries"
+        class="lp.registry.browser.distroseries.DistroSeriesNeedsPackagesView"
+        permission="zope.Public"
+        name="+needs-packaging"
+        facet="overview"
+        template="../templates/distroseries-needs-packaging.pt"/>
+    <browser:page
+        for="lp.registry.interfaces.distroseries.IDistroSeries"
         permission="launchpad.Admin"
         facet="overview"
         class="canonical.launchpad.browser.ObjectReassignmentView"
@@ -1937,6 +1944,13 @@
     <browser:page
         for="lp.registry.interfaces.sourcepackage.ISourcePackage"
         permission="zope.Public"
+        name="+portlet-associations"
+        facet="overview"
+        class="lp.registry.browser.sourcepackage.SourcePackageAssociationPortletView"
+        template="../templates/sourcepackage-portlet-associations.pt"/>
+    <browser:page
+        for="lp.registry.interfaces.sourcepackage.ISourcePackage"
+        permission="zope.Public"
         class="lp.registry.browser.sourcepackage.SourcePackageHelpView"
         name="+gethelp"
         facet="answers"

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2010-01-05 16:19:13 +0000
+++ lib/lp/registry/browser/distroseries.py	2010-01-30 22:41:18 +0000
@@ -150,9 +150,9 @@
 
     usedfor = IDistroSeries
     facet = 'overview'
-    links = ['edit', 'reassign', 'driver', 'answers', 'packaging',
-             'add_port', 'create_milestone', 'admin', 'builds', 'queue',
-             'subscribe']
+    links = ['edit', 'reassign', 'driver', 'answers',
+             'packaging', 'needs_packaging', 'builds', 'queue',
+             'add_port', 'create_milestone', 'subscribe', 'admin']
 
     @enabled_with_permission('launchpad.Admin')
     def edit(self):
@@ -177,8 +177,14 @@
         return Link('+addmilestone', text, summary, icon='add')
 
     def packaging(self):
-        text = 'Upstream links'
-        return Link('+packaging', text, icon='info')
+        text = 'All upstream links'
+        summary = 'A listing of source pakages and their upstream projects'
+        return Link('+packaging', text, summary=summary, icon='info')
+
+    def needs_packaging(self):
+        text = 'Needs upstream links'
+        summary = 'A listing of source pakages without upstream projects'
+        return Link('+needs-packaging', text, summary=summary, icon='info')
 
     # A search link isn't needed because the distro series overview
     # has a search form.
@@ -463,7 +469,7 @@
     """A View to show series package to upstream package relationships."""
 
     label = 'Mapping series packages to upstream project series'
-    page_title = 'Upstream packaging links'
+    page_title = 'All upstream links'
 
     @cachedproperty
     def unlinked_translatables(self):
@@ -486,4 +492,21 @@
     def cached_packagings(self):
         """The batched upstream packaging links."""
         packagings = self.context.packagings
-        return BatchNavigator(packagings, self.request, size=200)
+        navigator = BatchNavigator(packagings, self.request, size=200)
+        navigator.setHeadings('packaging', 'packagings')
+        return navigator
+
+
+class DistroSeriesNeedsPackagesView(DistroSeriesView):
+    """A View to show series package to upstream package relationships."""
+
+    label = 'Packages that need upstream packaging links'
+    page_title = 'Needs upstream links'
+
+    @cachedproperty
+    def cached_unlinked_packages(self):
+        """The batched `ISourcePackage`s that needs packaging links."""
+        packages = self.context.getPriorizedUnlinkedSourcePackages()
+        navigator = BatchNavigator(packages, self.request, size=100)
+        navigator.setHeadings('package', 'packages')
+        return navigator

=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2009-12-18 13:25:19 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2010-01-30 22:41:18 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
+    'SourcePackageAssociationPortletView',
     'SourcePackageBreadcrumb',
     'SourcePackageChangeUpstreamView',
     'SourcePackageFacets',
@@ -16,12 +17,20 @@
     ]
 
 from apt_pkg import ParseSrcDepends
+from cgi import escape
 from zope.component import getUtility, getMultiAdapter
 from zope.app.form.interfaces import IInputWidget
-from zope.formlib.form import FormFields
+from zope.formlib.form import Fields, FormFields
+from zope.interface import Interface
+from zope.schema import Choice
+from zope.schema.vocabulary import (
+    getVocabularyRegistry, SimpleVocabulary, SimpleTerm)
 
 from lazr.restful.interface import copy_field
 
+from canonical.cachedproperty import cachedproperty
+from canonical.widgets import LaunchpadRadioWidget
+
 from canonical.launchpad import helpers
 from lp.bugs.browser.bugtask import BugTargetTraversalMixin
 from canonical.launchpad.browser.packagerelationship import (
@@ -35,8 +44,9 @@
 from lp.translations.interfaces.potemplate import IPOTemplateSet
 from canonical.launchpad import _
 from canonical.launchpad.webapp import (
-    action, ApplicationMenu, GetitemNavigation, LaunchpadEditFormView, Link,
-    redirection, StandardLaunchpadFacets, stepto)
+    action, ApplicationMenu, custom_widget, GetitemNavigation,
+    LaunchpadEditFormView, LaunchpadFormView, Link, redirection,
+    StandardLaunchpadFacets, stepto)
 from canonical.launchpad.webapp import canonical_url
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
@@ -294,3 +304,48 @@
     """A View to show Answers help."""
 
     page_title = 'Help and support options'
+
+
+class SourcePackageAssociationPortletView(LaunchpadFormView):
+    """A view for linking to an upstream package."""
+
+    schema = Interface
+    custom_widget(
+        'upstream', LaunchpadRadioWidget, orientation='vertical')
+    product_suggestions = None
+
+    def setUpFields(self):
+        """See `LaunchpadFormView`."""
+        super(SourcePackageAssociationPortletView, self).setUpFields()
+        # Find registered products that are similarly named to the source
+        # package.
+        product_vocab = getVocabularyRegistry().get(None, 'Product')
+        matches = product_vocab.searchForTerms(self.context.name)
+        # Based upon the matching products, create a new vocabulary with
+        # term descriptions that include a link to the product.
+        self.product_suggestions = []
+        vocab_terms = []
+        for item in matches:
+            product = item.value
+            self.product_suggestions.append(product)
+            item_url = canonical_url(product)
+            description = """<a href="%s">%s</a>""" % (
+                item_url, escape(product.displayname))
+            vocab_terms.append(SimpleTerm(product, product.name, description))
+        upstream_vocabulary = SimpleVocabulary(vocab_terms)
+
+        self.form_fields = Fields(
+            Choice(__name__='upstream',
+                   title=_('Registered upstream project'),
+                   default=None,
+                   vocabulary=upstream_vocabulary,
+                   required=True))
+
+    @action('Link to Upstream Project', name='link')
+    def link(self, action, data):
+        upstream = data.get('upstream')
+        self.context.setPackaging(upstream.development_focus, self.user)
+        self.request.response.addInfoNotification(
+            'The project %s was linked to this source package.' %
+            upstream.displayname)
+        self.next_url = self.request.getURL()

=== modified file 'lib/lp/registry/browser/tests/packaging-views.txt'
--- lib/lp/registry/browser/tests/packaging-views.txt	2010-01-22 16:52:37 +0000
+++ lib/lp/registry/browser/tests/packaging-views.txt	2010-01-30 22:41:18 +0000
@@ -353,7 +353,7 @@
     Mapping series packages to upstream project series
 
     >>> print view.page_title
-    Upstream packaging links
+    All upstream links
 
 The view provides a property to get the source packages that have
 translations, but are not linked to an upstream project. The view filters
@@ -376,6 +376,9 @@
     >>> batch_navigator.default_size
     200
 
+    >>> print batch_navigator.heading
+    packagings
+
     >>> for packaging in batch_navigator.batch:
     ...     print packaging.sourcepackagename.name
     evolution
@@ -389,3 +392,37 @@
     ...     hoary, name='+packaging', query_string='start=2')
     >>> view.show_unlinked_translatables
     False
+
+
+Distro series +needs-packaging view
+-----------------------------------
+
+The +needs-packaging view lists the source packages that needs packaging
+links to an upstream project.
+
+    >>> view = create_initialized_view(hoary, name='+needs-packaging')
+    >>> print view.label
+    Packages that need upstream packaging links
+
+    >>> print view.page_title
+    Needs upstream links
+
+The view provides the cached_unlinked_packages property to access a
+`BatchNavigator` of `ISourcePackages`.
+
+    >>> batch_navigator = view.cached_unlinked_packages
+    >>> batch_navigator.default_size
+    100
+
+    >>> print batch_navigator.heading
+    packages
+
+    >>> for summary in batch_navigator.batch:
+    ...     print summary['package'].name
+    pmount
+    alsa-utils
+    cnews
+    libstdc++
+    linux-source-2.6.15
+    thunderbird
+    hot

=== modified file 'lib/lp/registry/browser/tests/sourcepackage-views.txt'
--- lib/lp/registry/browser/tests/sourcepackage-views.txt	2009-10-27 04:04:55 +0000
+++ lib/lp/registry/browser/tests/sourcepackage-views.txt	2010-01-30 22:41:18 +0000
@@ -1,6 +1,8 @@
 SourcePackage views
 ===================
 
+Edit packaging view
+-------------------
 
     >>> product = factory.makeProduct(name='bonkers', displayname='Bonkers')
     >>> productseries = factory.makeProductSeries(
@@ -96,3 +98,65 @@
 
     >>> print view.request.response.notifications
     []
+
+Upstream associations portlet
+-----------------------------
+
+The upstreams associations portlet either displays the upstream
+information if it is already set or gives the user the opportunity to
+suggest the association.  The suggestion is based on a
+ProductVocabulary query using the source package name.
+
+Since the bonkers source project was associated previously with the
+bonkers project, the portlet will display that information.
+
+    >>> view = create_initialized_view(package, name='+portlet-associations')
+    >>> for product in view.product_suggestions:
+    ...     print product.name
+    bonkers
+
+    >>> from canonical.launchpad.testing.pages import (
+    ...     extract_text, find_tag_by_id)
+    >>> content = extract_text(find_tag_by_id(view.render(), 'upstreams'))
+    >>> print content
+    Project:...Bonkers...
+    Series:...crazy...
+
+A new source project that is not linked to an upstream will result in
+the portlet showing the suggested project.
+
+    >>> product = factory.makeProduct(name='lernid', displayname='Lernid')
+    >>> sourcepackagename = factory.makeSourcePackageName(name='lernid')
+    >>> package = factory.makeSourcePackage(
+    ...     sourcepackagename=sourcepackagename, distroseries=distroseries)
+
+    >>> view = create_initialized_view(package, name='+portlet-associations')
+    >>> for product in view.product_suggestions:
+    ...     print product.name
+    lernid
+
+    >>> content = extract_text(find_tag_by_id(view.render(), 'no-upstreams'))
+    >>> print content
+    Launchpad doesn&#8217;t know which project and series this
+    package belongs to. ...
+    Is the following project the upstream for this source package?
+    Registered upstream project:
+    Lernid...
+
+If there are multiple potential matches they are all shown.
+
+    >>> product = factory.makeProduct(name='lernid-dev', displayname='Lernid Dev')
+    >>> view = create_initialized_view(package, name='+portlet-associations')
+    >>> for product in view.product_suggestions:
+    ...     print product.name
+    lernid
+    lernid-dev
+
+    >>> content = extract_text(find_tag_by_id(view.render(), 'no-upstreams'))
+    >>> print content
+    Launchpad doesn&#8217;t know which project and series this
+    package belongs to. ...
+    Is one of these projects the upstream for this source package?
+    Registered upstream project:
+    Lernid...
+    Lernid Dev...

=== modified file 'lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt'
--- lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt	2009-12-10 19:58:31 +0000
+++ lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt	2010-01-30 22:41:18 +0000
@@ -5,9 +5,9 @@
 series +index page.
 
     >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary')
-    >>> anon_browser.getLink('Upstream links').click()
+    >>> anon_browser.getLink('All upstream links').click()
     >>> print anon_browser.title
-    Upstream packaging links : ...
+    All upstream links : ...
 
 The page lists the the source packages that have translations, but are
 not linked to an upstream project to sync them to.
@@ -46,3 +46,61 @@
 
     >>> print find_tag_by_id(content, 'unlinked_translatables')
     None
+
+
+Source packages that need packaging links
+-----------------------------------------
+
+The "Packages that need upstream packaging links" lists the source packages
+that need upstream packaging links. The list is prioritized so that the
+packages with the greatest need are listed first.
+
+    >>> # XXX sinzui 2010-01-21 bug=487793: Enable this when the portlet
+    >>> # is added.
+    >>> #anon_browser.open('http://launchpad.dev/ubuntu/hoary')
+    >>> #anon_browser.getLink('Needs upstream links').click()
+    >>> anon_browser.open(
+    ...     'http://launchpad.dev/ubuntu/hoary/+needs-packaging')
+    >>> print anon_browser.title
+    Needs upstream links : ...
+
+    >>> content = find_main_content(anon_browser.contents)
+    >>> print extract_text(find_tag_by_id(content, 'packages'))
+    Source Package       Bugs     Translations
+    pmount               No bugs  64 strings
+    alsa-utils           No bugs  No strings
+    cnews                No bugs  No strings
+    libstdc++            No bugs  No strings
+    linux-source-2.6.15  1 bug    No strings
+
+The counts in the listing link to their respect bugs and translations
+pages.
+
+    >>> anon_browser.getLink('64 strings')
+    <Link text='64 strings'
+      url='http://translations.launchpad.dev/ubuntu/hoary/+source/pmount'>
+
+    >>> anon_browser.getLink('1 bug')
+    <Link text='1 bug'
+      url='http://bugs.launchpad.dev/ubuntu/+source/linux-source-2.6.15'>
+
+
+The listing is batched so that the user can visit the next page listings.
+
+    >>> print extract_text(find_tag_by_id(content, 'listing-navigation'))
+    1 ... 5 of 5 packages	First ... Previous ... Next ... Last
+
+Any use can see that this page is related to the packaging report. It is
+linked, but the link to this page is not enabled.
+
+    >>> print extract_text(find_tag_by_id(content, 'related-pages'))
+    Needs upstream links     All upstream links
+
+    >>> anon_browser.getLink('All upstream links')
+    <Link text='All upstream links'
+      url='http://launchpad.dev/ubuntu/hoary/+packaging'>
+
+    >>> anon_browser.getLink('Needs upstream links')
+    Traceback (most recent call last):
+     ...
+    LinkNotFoundError

=== modified file 'lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt'
--- lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2009-12-08 05:02:32 +0000
+++ lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2010-01-30 22:41:18 +0000
@@ -15,13 +15,14 @@
     >>> user_browser.getLink('pmount').click()
     >>> print extract_text(find_tag_by_id(
     ...     user_browser.contents, 'no-upstreams'))
-    Launchpad doesn&#8217;t know which project and series this package
-    belongs to. ... Can you set the upstream project in Launchpad?
+    There are no projects registered in Launchpad that are a potential
+    match for this source package. Can you help us find one?
+    Set upstream link
 
 No Privileges Person knows that the pmount package comes from the thunderbird
 project. He sets the upstream packaging link and sees that it is set.
 
-    >>> user_browser.getLink('set the upstream project in Launchpad').click()
+    >>> user_browser.getLink('Set upstream link').click()
     >>> user_browser.getControl(
     ...     name="field.productseries").value = 'thunderbird/trunk'
     >>> user_browser.getControl("Change").click()

=== modified file 'lib/lp/registry/stories/person/xx-admin-person-review.txt'
--- lib/lp/registry/stories/person/xx-admin-person-review.txt	2010-01-04 23:07:32 +0000
+++ lib/lp/registry/stories/person/xx-admin-person-review.txt	2010-01-30 22:41:18 +0000
@@ -47,7 +47,7 @@
 
 The page also contains a link back to the +review page.
 
-    >>> link = admin_browser.getLink(url='+review', index=1)
+    >>> link = admin_browser.getLink(url='+review')
     >>> print link.text
     edit[IMG] Review the user's Launchpad information
 

=== added file 'lib/lp/registry/templates/distroseries-needs-packaging.pt'
--- lib/lp/registry/templates/distroseries-needs-packaging.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/distroseries-needs-packaging.pt	2010-01-30 22:41:18 +0000
@@ -0,0 +1,91 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_only"
+  i18n:domain="launchpad">
+  <body>
+    <div metal:fill-slot="main">
+      <div class="top-portlet">
+        <p>
+          Links from distribution packages to upstream project series let
+          distribution and upstream maintainers share bugs, patches, and
+          translations efficiently.
+        </p>
+
+        <p>
+          The packages are listed by priority. Packages that greatest need to
+          forward bugs, sync translations, or need the latest development
+          branch are listed first. Can you help link these packages to
+          registered Launchpad projects?
+        </p>
+
+        <ul id="related-pages" class="horizontal">
+          <li>
+            <a tal:replace="structure context/menu:overview/needs_packaging/fmt:link" />
+          </li>
+          <li>
+            <a tal:replace="structure context/menu:overview/packaging/fmt:link" />
+          </li>
+        </ul>
+      </div>
+
+      <div class="narrow"
+        tal:define="summaries view/cached_unlinked_packages;"
+        tal:condition="summaries/batch">
+        <div id="listing-navigation"
+          tal:content="structure summaries/@@+navigation-links-upper" />
+
+        <table id="packages" class="listing">
+          <thead>
+            <tr>
+              <th>Source Package</th>
+              <th>Bugs</th>
+              <th>Translations</th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr tal:repeat="summary summaries/batch">
+              <td>
+                <a class="sprite package-source"
+                  tal:attributes="href summary/package/fmt:url"
+                  tal:content="summary/package/name">evolution</a>
+              </td>
+              <td tal:define="count summary/total_bugs;
+                              singular string:bug;
+                              plural string:bugs;">
+                <tal:no-bugs condition="not: count">
+                  No bugs
+                </tal:no-bugs>
+                <tal:has-bugs condition="count">
+                  <a tal:attributes="href summary/package/distribution_sourcepackage/fmt:url:bugs"
+                    ><tal:total-bugs replace="count" />
+                    <tal:plural
+                      metal:use-macro="context/@@+base-layout-macros/plural-message"/></a>
+                </tal:has-bugs>
+              </td>
+              <td tal:define="count summary/total_messages;
+                              singular string:string;
+                              plural string:strings;">
+                <tal:no-translations condition="not:count">
+                  No strings
+                </tal:no-translations>
+                <tal:has-translations condition="count">
+                  <a tal:attributes="href summary/package/fmt:url:translations"
+                    ><tal:total-messages replace="count" />
+                    <tal:plural
+                      metal:use-macro="context/@@+base-layout-macros/plural-message"/></a>
+                </tal:has-translations>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+
+        <div class="results"
+          tal:content="structure summaries/@@+navigation-links-lower" />
+      </div>
+    </div>
+  </body>
+</html>

=== modified file 'lib/lp/registry/templates/distroseries-packaging.pt'
--- lib/lp/registry/templates/distroseries-packaging.pt	2009-12-04 00:24:03 +0000
+++ lib/lp/registry/templates/distroseries-packaging.pt	2010-01-30 22:41:18 +0000
@@ -40,7 +40,7 @@
       </div>
 
       <tal:known_links condition="packagings/batch">
-        <h2>Upstream links</h2>
+        <h2>All upstream links</h2>
 
         <div class="results"
           tal:content="structure packagings/@@+navigation-links-upper" />

=== modified file 'lib/lp/registry/templates/sourcepackage-index.pt'
--- lib/lp/registry/templates/sourcepackage-index.pt	2009-12-03 16:54:29 +0000
+++ lib/lp/registry/templates/sourcepackage-index.pt	2010-01-30 22:41:18 +0000
@@ -55,61 +55,7 @@
         </div>
 
         <div class="yui-u">
-          <div class="portlet"
-            tal:define="series context/productseries">
-            <h2>Upstream associations</h2>
-
-            <tal:has_series condition="series">
-              <div id="upstreams" class="two-column-list">
-                <dl
-                  tal:define="project series/product/project"
-                  tal:condition="project">
-                  <dt>Project Group:</dt>
-                  <dd>
-                    <a tal:replace="structure project/fmt:link" />
-                  </dd>
-                </dl>
-
-                <dl>
-                  <dt>Project:</dt>
-                  <dd>
-                    <a tal:replace="structure series/product/fmt:link" />
-                  </dd>
-                </dl>
-
-                <dl>
-                  <dt>Series:</dt>
-                  <dd>
-                    <a
-                      tal:content="series/name"
-                      tal:attributes="href series/fmt:url">Series</a>
-                    <a tal:replace="structure context/menu:overview/edit_packaging/fmt:icon" />
-                  </dd>
-                </dl>
-              </div>
-
-              <ul class="horizontal">
-                <li>
-                  <a
-                    tal:attributes="href series/product/menu:overview/packages/fmt:url"
-                    >Show upstream links</a>
-                </li>
-              </ul>
-            </tal:has_series>
-
-            <tal:has_no_series condition="not: series">
-               <p id="no-upstreams">
-                 Launchpad doesn&#8217;t know which project and series this
-                 package belongs to. Links from distribution packages to
-                 upstream project let distribution and upstream
-                 maintainers share bugs, patches, and translations
-                 efficiently. Can you 
-                 <a tal:attributes="
-                   href context/menu:overview/edit_packaging/url">set
-                   the upstream project in Launchpad</a>?
-               </p>
-            </tal:has_no_series>
-          </div>
+          <div class="portlet" tal:content="structure context/@@+portlet-associations" />
         </div>
       </div>
 

=== added file 'lib/lp/registry/templates/sourcepackage-portlet-associations.pt'
--- lib/lp/registry/templates/sourcepackage-portlet-associations.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/sourcepackage-portlet-associations.pt	2010-01-30 22:41:18 +0000
@@ -0,0 +1,97 @@
+<tal:root
+   xmlns:tal="http://xml.zope.org/namespaces/tal"
+   xmlns:metal="http://xml.zope.org/namespaces/metal"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+   omit-tag="">
+
+  <div id="portlet-associations">
+    <h2>Upstream associations</h2>
+
+    <div class="portletBody portletContent"
+         tal:define="series context/productseries">
+      <tal:has_series condition="series">
+        <div id="upstreams" class="two-column-list">
+          <dl
+             tal:define="project series/product/project"
+             tal:condition="project">
+            <dt>Project Group:</dt>
+            <dd>
+              <a tal:replace="structure project/fmt:link" />
+            </dd>
+          </dl>
+
+          <dl>
+            <dt>Project:</dt>
+            <dd>
+              <a tal:replace="structure series/product/fmt:link" />
+            </dd>
+          </dl>
+
+          <dl>
+            <dt>Series:</dt>
+            <dd>
+              <a
+                 tal:content="series/name"
+                 tal:attributes="href series/fmt:url">Series</a>
+              <a tal:replace="structure context/menu:overview/edit_packaging/fmt:icon" />
+            </dd>
+          </dl>
+        </div>
+
+        <ul class="horizontal">
+          <li>
+            <a
+               tal:attributes="href series/product/menu:overview/packages/fmt:url"
+               >Show upstream links</a>
+          </li>
+        </ul>
+      </tal:has_series>
+
+      <tal:has_no_series condition="not: series">
+        <div id="no-upstreams" tal:condition="view/product_suggestions">
+          <p>
+            Launchpad doesn&#8217;t know which project and series this
+            package belongs to. Links from distribution packages to
+            upstream project let distribution and upstream
+            maintainers share bugs, patches, and translations
+            efficiently.
+          </p>
+
+          <tal:message
+             define="count python:len(view.product_suggestions);
+                     singular string:Is the following project the upstream for this source package?;
+                     plural string:Is one of these projects the upstream for this source package?"
+             >
+            <b>
+            <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
+            </b>
+          </tal:message>
+
+          <div tal:condition="python: len(view.product_suggestions) > 1">
+            <b>Is one of these projects the upstream for this source
+            package?</b>
+          </div>
+          <div tal:condition="python: len(view.product_suggestions) == 1">
+            <b>Is the following project the upstream for this source package?</b>
+          </div>
+          <div metal:use-macro="context/@@launchpad_form/form">
+            <div class="actions" metal:fill-slot="buttons">
+              <input tal:replace="structure view/link/render"/>
+              &nbsp;or&nbsp;
+              <a tal:replace="structure
+                              context/menu:overview/set_upstream/fmt:link" />
+            </div>
+          </div>
+        </div>
+        <div id="no-upstreams" tal:condition="not: view/product_suggestions">
+          <p>
+          There are no projects registered in Launchpad that are a potential
+          match for this source package.  Can you help us find one?
+          </p>
+          <a tal:replace="structure
+                          context/menu:overview/set_upstream/fmt:link" />
+        </div>
+      </tal:has_no_series>
+    </div>
+  </div>
+</tal:root>