Merge lp:~sinzui/launchpad/remove-sp-packaging-bug-272343 into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to remove the redundant and awkward source package
+packaging page. This branch also as a drive-by fix for answers.

    lp:~sinzui/launchpad/remove-sp-packaging-bug-272343
    Diff size: 462
    Launchpad bug: https://bugs.launchpad.net/bugs/272343
                   https://bugs.launchpad.net/bugs/491744
    Test command: ./bin/test -vv \
        -t "reg.*packaging"
        -t "answers.*question-overview"
    Pre-implementation: beuno
    Target release: 3.1.12

= Remove the redundant and awkward source package +packaging page =

Bug 272343 [Redundant "Upstream links" pages for each source package in each
    distribution series]
    Each series source package has a page that shows the package in other
    distributions. The page is irrelevant for the series, and each series
    has the same page. The page duplicates the information on the the
    project's +packages page, and overlaps the with distro source package
    +index page.

Bug 491744 [For: package link always rendered as "mozilla-firefox"]
    The hard-coded value in the template is always displayed. The tal:content
    instruction is missing.

== Rules ==

    * Remove the SP +packages URL, view, and template.
      * I do not think a redirect for the old URL is needed given how
        hidden and useless this page was.
    * Update stories to show where users really get this information.

    ADDENDUM
    * Add the missing tal:content instruction to the answers source package
      link.

== QA ==

    * Visit https://edge.launchpad.net/ubuntu/lucid/+packaging
    * Follow the link to
    * Verify you are seeing +index
    * Verify the Upstream associations portlet explains the value of linking
      to upstream
    * Follow the set the upstream project in Launchpad link
    * Verify that you are seeing the edit page

    * Visit https://edge.launchpad.net/ubuntu/lucid/+packaging
    * Follow the link to
    * Verify you are seeing +index
    * Follow the Show upstream links link.
    * Verify that you are seeing the project's +packages link.

== Lint ==

Linting changed files:
  lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt
  lib/lp/answers/templates/question-portlet-details.pt
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/sourcepackage.py
  lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt
  lib/lp/registry/templates/distroseries-packaging.pt
  lib/lp/registry/templates/sourcepackage-index.pt

== Test ==

    * lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt
      * Removed check for old URL
    * lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt
      * Rewrote the entire test. This test was a prefect example of what a
        story is *not*. The story was impossible; it employed crafted
        links that the user had to read source code to accomplish his task.
        The new story shows how the user gets to the pages and explains why he
        is doing it.

== Implementation ==

    * lib/lp/answers/templates/question-portlet-details.pt
      * A drive by fix for bug 491744. I replaced the real info in the
        template with impossible values to verify the...

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2009-11-20 15:02:39 +0000
+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2009-12-05 03:17:29 +0000
@@ -191,7 +191,6 @@
 ...                 host='translations.launchpad.dev')
 
 >>> check("/ubuntu/hoary/+source/evolution/+changelog")
->>> check("/ubuntu/hoary/+source/evolution/+packaging")
 >>> check("/ubuntu/hoary/+source/evolution/+edit-packaging", auth=True)
 >>> check("/ubuntu/hoary/+source/evolution/+gethelp")
 

=== modified file 'lib/lp/answers/templates/question-portlet-details.pt'
--- lib/lp/answers/templates/question-portlet-details.pt	2009-11-11 22:17:17 +0000
+++ lib/lp/answers/templates/question-portlet-details.pt	2009-12-05 03:17:29 +0000
@@ -31,13 +31,13 @@
       <dt>For:</dt>
       <dd>
         <a tal:condition="context/product"
-          tal:replace="structure context/product/fmt:link">Firefox</a>
+          tal:replace="structure context/product/fmt:link">UFOs</a>
         <a tal:condition="context/distribution"
-          tal:replace="structure context/distribution/fmt:link">ubuntu</a>
+          tal:replace="structure context/distribution/fmt:link">Illumanati</a>
         <a tal:condition="context/sourcepackagename"
           tal:attributes="href
-          string:${context/distribution/fmt:url}/+source/${context/sourcepackagename/name}">
-          mozilla-firefox</a>
+          string:${context/distribution/fmt:url}/+source/${context/sourcepackagename/name}"
+          tal:content="context/sourcepackagename/name">fnord</a>
         <a tal:replace="structure context/menu:answers/edit/fmt:icon" />
       </dd>
     </dl>

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-11-26 06:41:27 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-12-05 03:17:29 +0000
@@ -1934,13 +1934,6 @@
     <browser:page
         for="lp.registry.interfaces.sourcepackage.ISourcePackage"
         permission="zope.Public"
-        class="lp.registry.browser.sourcepackage.SourcePackagePackaging"
-        name="+packaging"
-        facet="overview"
-        template="../templates/sourcepackage-packaging.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/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2009-10-28 02:43:36 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2009-12-05 03:17:29 +0000
@@ -93,7 +93,7 @@
     usedfor = ISourcePackage
     facet = 'overview'
     links = [
-        'distribution_source_package', 'packaging', 'edit_packaging',
+        'distribution_source_package', 'edit_packaging',
         'changelog', 'builds', 'set_upstream',
         ]
 
@@ -106,9 +106,6 @@
     def changelog(self):
         return Link('+changelog', 'View changelog', icon='list')
 
-    def packaging(self):
-        return Link('+packaging', 'Show upstream links', icon='info')
-
     def edit_packaging(self):
         return Link('+edit-packaging', 'Change upstream link', icon='edit')
 
@@ -292,16 +289,6 @@
         return list(self.context.getCurrentTranslationTemplates())
 
 
-class SourcePackagePackaging(SourcePackageView):
-    """A View to show where the package is packged."""
-
-    page_title = 'Upstream links'
-
-    @property
-    def label(self):
-        return "Upstream links for %s" % self.context.title
-
-
 class SourcePackageHelpView:
     """A View to show Answers help."""
 

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2009-09-08 12:30:13 +0000
+++ lib/lp/registry/interfaces/person.py	2009-12-05 03:17:29 +0000
@@ -333,7 +333,7 @@
     MODERATED = DBItem(1, """
         Moderated Team
 
-        All subscriptions for this team are subject to approval by one of
+        All subscriptions for this team are subject to approval by one of 
         the team's administrators.
         """)
 
@@ -366,17 +366,17 @@
     PRIVATE_MEMBERSHIP = DBItem(20, """
         Private Membership
 
-        Only Launchpad admins and team members can view the
-        membership list for this team.  The team is severely restricted in the
+        Only Launchpad admins and team members can view the 
+        membership list for this team. The team is severely restricted in the 
         roles it can assume.
         """)
 
     PRIVATE = DBItem(30, """
         Private
 
-        Only Launchpad admins and team members can view the membership list
-        for this team or its name.  The team roles are restricted to
-        subscribing to bugs, being bug supervisor, owning code branches, and
+        Only Launchpad admins and team members can view the membership list 
+        for this team or its name.  The team roles are restricted to 
+        subscribing to bugs, being bug supervisor, owning code branches, and 
         having a PPA.
         """)
 

=== modified file 'lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt'
--- lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2009-11-09 17:08:21 +0000
+++ lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2009-12-05 03:17:29 +0000
@@ -1,129 +1,52 @@
 = Packaging =
 
-The Packaging records of a source package can be via the source
-package's +packaging page:
-
-  >>> user_browser.open(
-  ...     "http://launchpad.dev/ubuntu/warty/+source/mozilla/+packaging")
-
-  >>> print_location(user_browser.contents)
-  Hierarchy: Ubuntu > Warty (4.10) >
-    ...mozilla... source package > Upstream links
-  Tabs:
-  * Overview (selected) - http://launchpad.dev/ubuntu/warty/+source/mozilla
-  * Branches - http://code.launchpad.dev/ubuntu/warty/+source/mozilla
-  * Bugs - http://bugs.launchpad.dev/ubuntu/warty/+source/mozilla
-  * Blueprints - not linked
-  * Translations - http://translations.launchpad.dev/ubuntu/warty/+source/mozilla
-  * Answers - http://answers.launchpad.dev/ubuntu/warty/+source/mozilla
-  Main heading: Upstream links for ...mozilla... source package in Warty
-
-  >>> print extract_text(
-  ...     find_tags_by_class(user_browser.contents, 'informational')[0])
-  Launchpad doesn&#8217;t know which project and series this package
-  belongs to.
-  If you can, please let us know.
-
-As we could see 'mozilla' sourcepackage has no established Packaging
-records. We can add or edit the Packaging information for a specific
-distroseries context. Let's try it for "grumpy":
-
-  >>> user_browser.open(
-  ...     "http://launchpad.dev/ubuntu/grumpy/+source/mozilla/+edit-packaging")
-  >>> user_browser.getControl(name="field.productseries").value = 'firefox/trunk'
-  >>> user_browser.getControl("Change").click()
-
-
-Now we can check if the Packaging record for "grumpy" is annotated:
-
-  >>> user_browser.open(
-  ...     "http://launchpad.dev/ubuntu/grumpy/+source/mozilla/+packaging")
-  >>> print extract_text(
-  ...     find_tag_by_id(user_browser.contents, 'packaging-table'))
-  Upstream links for all source packages called
-  "mozilla"
-  Distribution
-  Version
-  Upstream Project Series
-  Ubuntu
-  Grumpy
-  Mozilla Firefox trunk series
-
-
-The same Packaging record is also presented in "warty", because the
-list of Packaging records depends only on the source package name:
-
-  >>> user_browser.open(
-  ...     "http://launchpad.dev/ubuntu/warty/+source/mozilla/+packaging")
-  >>> print extract_text(
-  ...     find_tag_by_id(user_browser.contents, 'packaging-table'))
-  Upstream links for all source packages called
-  "mozilla"
-  Distribution
-  Version
-  Upstream Project Series
-  Ubuntu
-  Grumpy
-  Mozilla Firefox trunk series
-
-
-Now, let's add a Packaging record to the warty context:
-
-  >>> user_browser.open(
-  ...     "http://launchpad.dev/ubuntu/warty/+source/mozilla/+edit-packaging")
-  >>> user_browser.getControl(name="field.productseries").value = 'firefox/1.0'
-  >>> user_browser.getControl("Change").click()
-
-
-Now in the "warty" context both Packaging records are presented:
-
-  >>> user_browser.open(
-  ...     "http://launchpad.dev/ubuntu/warty/+source/mozilla/+packaging")
-  >>> print extract_text(
-  ...     find_tag_by_id(user_browser.contents, 'packaging-table'))
-  Upstream links for all source packages called
-  "mozilla"
-  Distribution
-  Version
-  Upstream Project Series
-  Ubuntu
-  Grumpy
-  Mozilla Firefox trunk series
-  Ubuntu
-  Warty
-  Mozilla Firefox 1.0 series
-
-And the Packaging record for "warty" context is highlighted:
-
-  >>> print extract_text(
-  ...    find_tags_by_class(user_browser.contents, 'highlight')[0])
-  Ubuntu
-  Warty
-  Mozilla Firefox 1.0 series
-
-In the same way when we are back to the "grumpy" context the both
-stored Packaging records are presented but now, the "grumpy" Packaging
-record is highlighted.
-
-  >>> user_browser.open(
-  ...     "http://launchpad.dev/ubuntu/grumpy/+source/mozilla/+packaging")
-
-  >>> print extract_text(
-  ...     find_tag_by_id(user_browser.contents, 'packaging-table'))
-  Upstream links for all source packages called
-  "mozilla"
-  Distribution
-  Version
-  Upstream Project Series
-  Ubuntu
-  Grumpy
-  Mozilla Firefox trunk series
-  Ubuntu
-  Warty
-  Mozilla Firefox 1.0 series
-
-  >>> print extract_text(
-  ...     find_tags_by_class(user_browser.contents, 'highlight')[0])
-  Ubuntu
-  Grumpy
-  Mozilla Firefox trunk series
+No Privileges Person visit the distroseries upstream linkes page for Hoary
+and sees that pmount is not linked.
+
+    >>> user_browser.open('http://launchpad.dev/ubuntu/hoary/+packaging')
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'unlinked-translatables'))
+    Unlinked translatable packages
+    pmount  mozilla
+
+He looks at the pmount source package page in Hoary and reads that the
+upstream project is not set.
+
+    >>> 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?
+
+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.getControl(
+    ...     name="field.productseries").value = 'thunderbird/trunk'
+    >>> user_browser.getControl("Change").click()
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'upstreams'))
+    Project Group: the Mozilla Project
+    Project: Mozilla Thunderbird  ...
+    Series: trunk ...
+
+He see the "Show upstream links" link and takes a look at the project's
+packaging in distributions.
+
+    >>> user_browser.getLink('Show upstream links').click()
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'distribution-series'))
+    Distribution series  Source package  Version  Project series
+    Hoary (5.04)         pmount          0.1-2    Mozilla Thunderbird trunk...
+
+No Privileges Person returns to the pmount source package page, sees the
+link to all versions and follows it to the distro source package page.
+
+    >>> user_browser.getLink('pmount').click()
+    >>> user_browser.getLink(
+    ...     'All versions of pmount source in Ubuntu').click()
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'packages_list'))
+    The Hoary Hedgehog Release (active development) ...
+      0.1-2  release (main) ... weeks ago

=== modified file 'lib/lp/registry/templates/distroseries-index.pt'
--- lib/lp/registry/templates/distroseries-index.pt	2009-09-15 22:12:44 +0000
+++ lib/lp/registry/templates/distroseries-index.pt	2009-12-05 03:17:29 +0000
@@ -58,9 +58,7 @@
         </div>
 
         <div class="yui-u">
-          <div
-            tal:condition="context/getLatestUploads"
-            tal:replace="structure context/@@+portlet-latestuploads" />
+          <div tal:replace="structure context/@@+portlet-latestuploads" />
         </div>
       </div>
 

=== modified file 'lib/lp/registry/templates/distroseries-packaging.pt'
--- lib/lp/registry/templates/distroseries-packaging.pt	2009-09-15 01:17:46 +0000
+++ lib/lp/registry/templates/distroseries-packaging.pt	2009-12-05 03:17:29 +0000
@@ -7,35 +7,42 @@
   i18n:domain="launchpad">
   <body>
     <div metal:fill-slot="main"
-         tal:define="packagings view/cached_packagings;
-                     unlinked_translatables view/unlinked_translatables">
-      <p>Links from distribution packages to upstream project series let
-        distribution and upstream maintainers share bugs, patches, and translations
-        efficiently.</p>
-
-      <p tal:condition="not: packagings" class="informational message">
-        There are no links between packages in <span
-        tal:replace="context/displayname">Hoary</span> and upstream. By adding
-        information for specific packages, you can help the distribution developers
-        collaborate with upstream.
-      </p>
-
-      <tal:unlinked_translatables condition="unlinked_translatables">
-        <h2>Unlinked translatable packages</h2>
-
-          <a tal:repeat="sp unlinked_translatables"
-                tal:content="sp/sourcepackagename/name"
-                tal:attributes="href string:${sp/fmt:url}/+packaging">evolution</a>
-
-      </tal:unlinked_translatables>
+      tal:define="packagings view/cached_packagings;">
+      <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 class="informational message"
+          tal:condition="not: packagings">
+          There are no links between packages in <span
+          tal:replace="context/displayname">Hoary</span> and upstream. By
+          adding information for specific packages, you can help the
+          distribution developers collaborate with upstream.
+        </p>
+
+        <tal:unlinked_translatables
+          condition="view/unlinked_translatables">
+          <div id="unlinked-translatables">
+            <h2>Unlinked translatable packages</h2>
+
+            <ul class="horizontal">
+              <li tal:repeat="sp view/unlinked_translatables">
+                <a class="sprite package-source"
+                  tal:attributes="href sp/fmt:url"
+                  tal:content="sp/sourcepackagename/name">evolution</a>
+              </li>
+            </ul>
+          </div>
+        </tal:unlinked_translatables>
+      </div>
 
       <tal:known_links condition="packagings">
         <h2>Upstream links</h2>
+
         <table class="listing">
-          <caption>
-            Upstream links for all source packages in
-            <span tal:replace="context/title">Ubuntu Hoary</span>
-          </caption>
           <thead>
             <tr>
               <th>Source Package</th>
@@ -45,20 +52,18 @@
 
           <tbody>
             <tr tal:repeat="packaging packagings">
-              <td><a tal:attributes="href
-                         string:${packaging/sourcepackage/fmt:url}/+packaging"
-                     tal:content="packaging/sourcepackagename/name">
-                evolution</a>
+              <td>
+                <a class="sprite package-source"
+                  tal:attributes="href packaging/sourcepackage/fmt:url"
+                  tal:content="packaging/sourcepackagename/name">evolution</a>
               </td>
               <td>
                 <a tal:replace="structure packaging/productseries/fmt:link" />
               </td>
             </tr>
           </tbody>
-
         </table>
       </tal:known_links>
-
     </div>
   </body>
 </html>

=== modified file 'lib/lp/registry/templates/sourcepackage-index.pt'
--- lib/lp/registry/templates/sourcepackage-index.pt	2009-10-27 03:23:05 +0000
+++ lib/lp/registry/templates/sourcepackage-index.pt	2009-12-05 03:17:29 +0000
@@ -55,12 +55,12 @@
         </div>
 
         <div class="yui-u">
-          <div class="portlet">
+          <div class="portlet"
+            tal:define="series context/productseries">
             <h2>Upstream associations</h2>
 
-            <div id="upstreams" class="two-column-list"
-              tal:define="series context/productseries">
-              <tal:has_series condition="series">
+            <tal:has_series condition="series">
+              <div id="upstreams" class="two-column-list">
                 <dl
                   tal:define="project series/product/project"
                   tal:condition="project">
@@ -86,23 +86,29 @@
                     <a tal:replace="structure context/menu:overview/edit_packaging/fmt:icon" />
                   </dd>
                 </dl>
-              </tal:has_series>
-
-              <tal:has_no_series condition="not: context/productseries">
-                 <dl>
-                   <dt>Related project:</dt>
-                   <dd>
-                     <em>No project associated with this sourcepackage</em>
-                   </dd>
-                 </dl>
-              </tal:has_no_series>
-            </div>
-
-            <ul class="horizontal">
-              <li>
-                <a tal:replace="structure context/menu:overview/packaging/fmt:link" />
-              </li>
-            </ul>
+              </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>
       </div>

=== removed file 'lib/lp/registry/templates/sourcepackage-packaging.pt'
--- lib/lp/registry/templates/sourcepackage-packaging.pt	2009-09-22 13:10:45 +0000
+++ lib/lp/registry/templates/sourcepackage-packaging.pt	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-<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">
-
-  <p>
-    Linking distribution packages to upstream series allows
-    distribution and upstream developers share bugs, patches, and translations
-    efficiently.
-  </p>
-
-  <p class="informational message" tal:condition="not: context/productseries">
-    Launchpad doesn&#8217;t know which project and series this package
-    belongs to.
-    If you can, please <a href="+edit-packaging">let us know</a>.
-  </p>
-
-  <table id="packaging-table" class="listing"
-         tal:condition="context/sourcepackagename/packagings">
-    <caption>Upstream links for all source packages called
-      "<span tal:replace="context/name">apache</span>"
-    </caption>
-
-    <thead>
-      <tr>
-        <th>Distribution</th>
-        <th>Version</th>
-        <th>Upstream Project Series</th>
-      </tr>
-    </thead>
-
-    <tbody>
-      <tal:block repeat="packaging context/sourcepackagename/packagings">
-	<tr tal:attributes="
-          class python: packaging == context.packaging and 'highlight' or None">
-
-          <td>
-            <a tal:replace="structure packaging/distroseries/distribution/fmt:link" />
-          </td>
-          <td>
-            <a tal:replace="structure packaging/distroseries/fmt:link" />
-          </td>
-          <td>
-            <a tal:replace="structure packaging/productseries/fmt:link" />
-          </td>
-
-        </tr>
-      </tal:block>
-    </tbody>
-  </table>
-
-</div>
-</body>
-</html>

=== renamed file 'lib/lp/registry/stories/person/xx-resetpassword-of-sso-account.txt' => 'lib/lp/services/openid/stories/xx-resetpassword-of-sso-account.txt'
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distroseries-index.txt	2009-09-09 17:02:43 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distroseries-index.txt	2009-12-05 03:17:29 +0000
@@ -52,5 +52,5 @@
   >>> anon_browser.open(
   ...     "http://launchpad.dev/ubuntutest/breezy-autotest/"
   ...     "+portlet-latestuploads")
-  >>> "<ul" in anon_browser.contents
-  False
+  >>> find_tag_by_id(anon_browser.contents, 'no-latest-uploads') is not None
+  True

=== modified file 'lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt'
--- lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt	2009-09-09 03:44:13 +0000
+++ lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt	2009-12-05 03:17:29 +0000
@@ -3,7 +3,7 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   class="portlet"
-  tal:condition="context/getLatestUploads">
+  tal:define="latest_uploads context/getLatestUploads">
   <h2>
     <span class="see-all"><a
       tal:attributes="href context/menu:overview/queue/fmt:url">All
@@ -11,7 +11,8 @@
     Latest uploads
   </h2>
 
-  <ul id="latest-uploads" class="binary package">
+  <ul id="latest-uploads" class="binary package"
+    tal:condition="latest_uploads">
     <li tal:repeat="source context/getLatestUploads">
       <a
        tal:attributes="href source/fmt:url"
@@ -23,6 +24,10 @@
     </li>
   </ul>
 
+  <p id="no-latest-uploads" tal:condition="not: latest_uploads">
+    There are no recent source package uploads.
+  </p>
+
   <ul class="horizontal">
     <li>
       <a tal:replace="structure context/menu:overview/queue/fmt:link" />