Merge lp:~julian-edwards/launchpad/dsp-redesign into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
DistributionSourcePackage 3.0

I already have ui=beuno.

== Proposed fix ==
Many changes! 3.0 goodness. View and see.
e.g. https://dogfood.launchpad.net/ubuntu/+source/amarok

== Implementation details ==
The old page was tough to render, this one is no different. The hard part is
the table of the versions in each series.

Most of the logic is done in the view class, which pumps out rows of
dictionaries that the template then throws on the page. It uses 3 different
types of row:
 * a distro series header
 * package details
 * blank row

The type of row is determined by boolean dictionary properties in each row
returned by view/version_table. I couldn't think of a better way of doing
this since all the knowledge of how to render stuff is in the view.

The package detail rows also have a JS expander that does an XHR call to get
more data. This is the same XHR call that the PPA page does to open rows
there. I had to tweak the JS a little to make it work outside of an archive
context. It does this by coding the archive url in the template as a <script>
element - not pleasant but having discussed this at length with Michael and
Celso we could not think of any other way of doing it.

== Tests ==
bin/test -vvt xx-distribution-packages.txt -t xx-distributionsourcepackage-
packaging.txt -t xx-distrorelease-sources.txt -t xx-package-diff.txt

== Demo and Q/A ==
I set this up on dogfood since the .dev data is rubbish.
See:
https://dogfood.launchpad.net/ubuntu/+source/amarok
https://dogfood.launchpad.net/ubuntu/+source/firefox-3.5
etc.

= Launchpad lint =
Once again I have been foiled by lint being at the bottom of the email
template instead of at the top. I'm not re-writing this email, so please
consider the lint fixing done as I will be doing it right after sending this.

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/sourcepackage.py
  lib/lp/registry/templates/distributionsourcepackage-index.pt
  lib/lp/soyuz/stories/soyuz/xx-distrorelease-sources.txt
  lib/lp/soyuz/stories/soyuz/xx-package-diff.txt
  lib/lp/soyuz/templates/archive-macros.pt
  lib/lp/registry/browser/distributionsourcepackage.py
  lib/lp/registry/stories/distribution/xx-distribution-packages.txt
  lib/canonical/launchpad/templates/structural-subscription-target-portlet-
subscribers.pt
  lib/lp/registry/stories/distribution/xx-distributionsourcepackage-
packaging.txt
  lib/lp/registry/browser/distribution.py

== XmlLint notices ==

lib/lp/registry/templates/distributionsourcepackage-index.pt
    71: parser error : Opening and ending tag mismatch: strong line 71 and a
    ew bug<tal:plural content="string:s" condition="python:
newbugs!=1"/><strong></a
    ^
    73: parser error : Opening and ending tag mismatch: strong line 71 and div
    </div>
    ^
    137: parser error : AttValue: " or ' expected
    <td colspan=3>
    ^
    137: parser error : attributes construct error
    <td colspan=3>
    ^
    137: parser error : Couldn't find end of Start Tag td line 137
    <td colspa...

[Barry Warsaw (barry)]

> == Proposed fix ==
> Many changes! 3.0 goodness. View and see.
> e.g. https://dogfood.launchpad.net/ubuntu/+source/amarok

Looks great, thanks for working on this!

> == Implementation details ==
> The old page was tough to render, this one is no different. The hard part is
> the table of the versions in each series.
>
> Most of the logic is done in the view class, which pumps out rows of
> dictionaries that the template then throws on the page. It uses 3 different
> types of row:
> * a distro series header
> * package details
> * blank row
>
> The type of row is determined by boolean dictionary properties in each row
> returned by view/version_table. I couldn't think of a better way of doing
> this since all the knowledge of how to render stuff is in the view.
>
> The package detail rows also have a JS expander that does an XHR call to get
> more data. This is the same XHR call that the PPA page does to open rows
> there. I had to tweak the JS a little to make it work outside of an archive
> context. It does this by coding the archive url in the template as a <script>
> element - not pleasant but having discussed this at length with Michael and
> Celso we could not think of any other way of doing it.

It sounds like you had pretty thorough pre-imps about a number of tricky
issues. That helps with the review a lot, thanks for having them.

> == Demo and Q/A ==
> I set this up on dogfood since the .dev data is rubbish.
> See:
> https://dogfood.launchpad.net/ubuntu/+source/amarok
> https://dogfood.launchpad.net/ubuntu/+source/firefox-3.5
> etc.

That was very helpful!

> = Launchpad lint =
> Once again I have been foiled by lint being at the bottom of the email
> template instead of at the top. I'm not re-writing this email, so please
> consider the lint fixing done as I will be doing it right after sending this.

This bites me all the time too :(. No problem.

The code looks generally pretty good. I have a number of comments, but I
think they will be easy to address, so I'll give the branch merge-conditional,
r=me with their consideration.

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml 2009-08-27 11:34:14 +0000
+++ lib/lp/registry/browser/configure.zcml 2009-08-27 20:18:32 +0000
> @@ -523,6 +523,7 @@
> classes="
> DistributionSourcePackageFacets
> DistributionSourcePackageOverviewMenu
> + DistributionSourcePackageActionMenu
> DistributionSourcePackageBugsMenu"

Please sort alphabetically.

> module="lp.registry.browser.distributionsourcepackage"/>
> <browser:url

=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py 2009-08-27 10:13:51 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py 2009-08-27 20:18:32 +0000
> @@ -127,7 +149,29 @@
> return self._package_diffs
>
>
> +class IDistributionSourcePackageActionMenu(Interface):
> + """Marker interface for the action menu."""
> +
> +
> +class DistributionSourcePackageActionMenu(
> + NavigationMenu, DistributionSourcePackageLinksMixin):
> + """Ac...

review: Approve (code)

[Julian Edwards (julian-edwards)]

On Friday 28 August 2009 20:36:11 Barry Warsaw wrote:
> Review: Approve code
>
> > == Proposed fix ==
> > Many changes! 3.0 goodness. View and see.
> > e.g. https://dogfood.launchpad.net/ubuntu/+source/amarok
>
> Looks great, thanks for working on this!

Thanks for your patience with the review Barry, and once again apologies for
inflicting Soyuz *and* tales on you! :)

> It sounds like you had pretty thorough pre-imps about a number of tricky
> issues. That helps with the review a lot, thanks for having them.

Yeah, just a few :)

> > I set this up on dogfood since the .dev data is rubbish.
> > See:
> > https://dogfood.launchpad.net/ubuntu/+source/amarok
> > https://dogfood.launchpad.net/ubuntu/+source/firefox-3.5
> > etc.
>
> That was very helpful!

I <3 dogfood.

> The code looks generally pretty good. I have a number of comments, but I
> think they will be easy to address, so I'll give the branch
> merge-conditional, r=me with their consideration.

Ok great, thanks! I've addressed all your comments, see inline.

> > +class DistributionSourcePackageActionMenu(
> > + NavigationMenu, DistributionSourcePackageLinksMixin):
> > + """Action menu for distro source packages."""
> > + usedfor = IDistributionSourcePackageActionMenu
> > + facet = 'overview'
> > + title = 'Actions'
> > + links = ('change_log', 'subscribe', 'edit')
>
> While I prefer using tuples for these, as you've shown here, our defacto
> standard is to use lists. Is there a reason why you did it this way?
> Otherwise, might as well stick with the trend and use a list here too.

I've changed it to lists for now, if we later decide we want tuples as we
discussed in IRC then it's easily changed.

> > @property
> > def page_title(self):
> > @@ -268,6 +312,7 @@
> > """Render a submit input for the delete_packaging_action."""
> > assert self.can_delete_packaging, 'User cannot delete
> > Packaging.' return ('<input type="submit" class="button" value="Delete
> > Link" ' + 'style="padding: 0pt; font-size: 80%%" '
>
> Do you think it would be better to move this style setting into a class
> inside style-3-0.css?

I don't think so - this is a one-off style for this particular case (it makes
the row look stupidly fat otherwise) and it doesn't make sense to me to
increase the size of the main style sheet for that.

> You should be able to write these last two lines as:
>
> result = sorted(series, key=operator.attrgetter('version'),
> reverse=True)

Heh, yes, thanks for fixing my Python dyslexia.

> > + if version not in pocket_dict:
> > + pocket_dict[version] = [pub]
> > + else:
> > + pocket_dict[version].append(pub)
>
> What do you think about this instead...
>
> pocket_dict.setdefault(version, []).append(pub)

I think it's so good, I used it.

> > + # After the title row, we list each package version that's
> > + # currently published, and which pockets it's published in.
> > + pocket_dict = self.published_by_version(package)
> > + for version in pocket_dict.iterkeys():
>
> Is there a...

[Barry Warsaw (barry)]

On Sep 01, 2009, at 10:36 AM, Julian Edwards wrote:

>On Friday 28 August 2009 20:36:11 Barry Warsaw wrote:
>> Review: Approve code
>>
>> > == Proposed fix ==
>> > Many changes! 3.0 goodness. View and see.
>> > e.g. https://dogfood.launchpad.net/ubuntu/+source/amarok
>>
>> Looks great, thanks for working on this!
>
>Thanks for your patience with the review Barry, and once again apologies for
>inflicting Soyuz *and* tales on you! :)

Don't worry, I'll get you back someday with Mailman and ZCML. :)

>> > +class DistributionSourcePackageActionMenu(
>> > + NavigationMenu, DistributionSourcePackageLinksMixin):
>> > + """Action menu for distro source packages."""
>> > + usedfor = IDistributionSourcePackageActionMenu
>> > + facet = 'overview'
>> > + title = 'Actions'
>> > + links = ('change_log', 'subscribe', 'edit')
>>
>> While I prefer using tuples for these, as you've shown here, our defacto
>> standard is to use lists. Is there a reason why you did it this way?
>> Otherwise, might as well stick with the trend and use a list here too.
>
>I've changed it to lists for now, if we later decide we want tuples as we
>discussed in IRC then it's easily changed.

Agreed. I put this in the tech-debt category and we should change it globally
at some point. I've also put this on the agenda for tomorrow's reviewer
meetings.

>> > @property
>> > def page_title(self):
>> > @@ -268,6 +312,7 @@
>> > """Render a submit input for the delete_packaging_action."""
>> > assert self.can_delete_packaging, 'User cannot delete
>> > Packaging.' return ('<input type="submit" class="button" value="Delete
>> > Link" ' + 'style="padding: 0pt; font-size: 80%%" '
>>
>> Do you think it would be better to move this style setting into a class
>> inside style-3-0.css?
>
>I don't think so - this is a one-off style for this particular case (it makes
>the row look stupidly fat otherwise) and it doesn't make sense to me to
>increase the size of the main style sheet for that.

Hmm. I wonder if we need a policy for these kinds of things. OTOH, it /is/
nice to have one-off style changes more local to the code they affect. I
often find it difficult to figure out what a style affects by just looking at
the css file.

>> You should be able to write these last two lines as:
>>
>> result = sorted(series, key=operator.attrgetter('version'),
>> reverse=True)
>
>Heh, yes, thanks for fixing my Python dyslexia.

:)

>> > + if version not in pocket_dict:
>> > + pocket_dict[version] = [pub]
>> > + else:
>> > + pocket_dict[version].append(pub)
>>
>> What do you think about this instead...
>>
>> pocket_dict.setdefault(version, []).append(pub)
>
>I think it's so good, I used it.

Yay!

>> > + # After the title row, we list each package version that's
>> > + # currently published, and which pockets it's published in.
>> > + pocket_dict = self.published_by_version(package)
>> > + for version in pocket_dict.iterkeys():
>>
>> Is there a known efficiency reason to use iterkeys()? Is pocket_dict huge?...

=== modified file 'lib/canonical/launchpad/templates/structural-subscription-target-portlet-subscribers.pt'
--- lib/canonical/launchpad/templates/structural-subscription-target-portlet-subscribers.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/structural-subscription-target-portlet-subscribers.pt	2009-08-27 12:54:28 +0000
@@ -38,7 +38,6 @@
         </ul>
       </div>
       <div tal:condition="not: parent_target/bug_subscriptions">
-        <i>There are no bug subscriptions.</i>
         <a tal:attributes="href string:${parent_target/fmt:url}/+subscribe">
           (subscribe)
         </a>

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-27 11:34:14 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-27 20:18:32 +0000
@@ -523,6 +523,7 @@
         classes="
             DistributionSourcePackageFacets
             DistributionSourcePackageOverviewMenu
+            DistributionSourcePackageActionMenu
             DistributionSourcePackageBugsMenu"
         module="lp.registry.browser.distributionsourcepackage"/>
     <browser:url

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2009-08-27 10:48:44 +0000
+++ lib/lp/registry/browser/distribution.py	2009-08-27 20:18:32 +0000
@@ -449,7 +449,7 @@
 
     def subscribe(self):
         text = 'Subscribe to bug mail'
-        return Link('+subscribe', text)
+        return Link('+subscribe', text, icon='edit')
 
 
 class DistributionBountiesMenu(ApplicationMenu):

=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py	2009-08-27 10:13:51 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py	2009-08-27 20:18:32 +0000
@@ -12,15 +12,20 @@
     'DistributionSourcePackageView',
     ]
 
+from datetime import datetime
 import itertools
 import operator
+import pytz
 
-from zope.component import getUtility
+from zope.component import getUtility, provideAdapter
 from zope.formlib import form
+from zope.interface import implements, Interface
 from zope.schema import Choice
 from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 
+from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
+from lp.answers.interfaces.questionenums import QuestionStatus
 from lp.soyuz.interfaces.archive import IArchiveSet
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease)
@@ -36,7 +41,9 @@
 from canonical.launchpad.webapp import (
     ApplicationMenu, LaunchpadEditFormView, LaunchpadFormView, Link,
     Navigation, StandardLaunchpadFacets, action, canonical_url, redirection)
-from canonical.launchpad.webapp.menu import enabled_with_permission
+from canonical.launchpad.webapp.interfaces import INavigationMenu
+from canonical.launchpad.webapp.menu import (
+    enabled_with_permission, NavigationMenu)
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 
 from lazr.delegates import delegates
@@ -58,12 +65,7 @@
     enable_only = ['overview', 'bugs', 'answers', 'branches']
 
 
-class DistributionSourcePackageOverviewMenu(ApplicationMenu):
-
-    usedfor = IDistributionSourcePackage
-    facet = 'overview'
-    links = ['subscribe', 'publishinghistory', 'edit']
-
+class DistributionSourcePackageLinksMixin:
     def subscribe(self):
         return Link('+subscribe', 'Subscribe to bug mail', icon='edit')
 
@@ -77,6 +79,26 @@
         # is the only editable property of a source package right now.
         return Link('+edit', 'Edit bug reporting guidelines', icon='edit')
 
+    def new_bugs(self):
+        base_path = "+bugs"
+        get_data = "?field.status:list=NEW"
+        return Link(base_path + get_data, "New bugs", site="bugs")
+
+    def open_questions(self):
+        base_path = "+questions"
+        get_data = "?field.status=OPEN"
+        return Link(base_path + get_data, "Open Questions", site="answers")
+
+
+class DistributionSourcePackageOverviewMenu(
+    ApplicationMenu, DistributionSourcePackageLinksMixin):
+
+    usedfor = IDistributionSourcePackage
+    facet = 'overview'
+    links = [
+        'subscribe', 'publishinghistory', 'edit', 'new_bugs',
+        'open_questions']
+
 
 class DistributionSourcePackageBugsMenu(
         DistributionSourcePackageOverviewMenu):
@@ -127,7 +149,29 @@
         return self._package_diffs
 
 
+class IDistributionSourcePackageActionMenu(Interface):
+    """Marker interface for the action menu."""
+
+
+class DistributionSourcePackageActionMenu(
+    NavigationMenu, DistributionSourcePackageLinksMixin):
+    """Action menu for distro source packages."""
+    usedfor = IDistributionSourcePackageActionMenu
+    facet = 'overview'
+    title = 'Actions'
+    links = ('change_log', 'subscribe', 'edit')
+
+    def change_log(self):
+        text = 'View full change log'
+        return Link('+changelog', text, icon="info")
+
+
 class DistributionSourcePackageView(LaunchpadFormView):
+    implements(IDistributionSourcePackageActionMenu)
+
+    @property
+    def page_title(self):
+        return self.context.title
 
     @property
     def page_title(self):
@@ -268,6 +312,7 @@
         """Render a submit input for the delete_packaging_action."""
         assert self.can_delete_packaging, 'User cannot delete Packaging.'
         return ('<input type="submit" class="button" value="Delete Link" '
+                'style="padding: 0pt; font-size: 80%%" '
                 'name="%s"/>' % (self.delete_packaging_action.__name__,))
 
     def handleDeletePackagingError(self, action, data, errors):
@@ -301,41 +346,112 @@
               distroseries=distroseries.displayname)))
         self.next_url = canonical_url(self.context)
 
-    def version_listing(self):
-        result = []
-        for sourcepackage in self.context.get_distroseries_packages():
-            packaging = sourcepackage.direct_packaging
+    @cachedproperty
+    def active_distroseries_packages(self):
+        """Cached proxy call to context/get_distroseries_packages."""
+        return self.context.get_distroseries_packages()
+
+    @property
+    def packages_by_active_distroseries(self):
+        """Dict of packages keyed by distroseries."""
+        packages_dict = {}
+        for package in self.active_distroseries_packages:
+            packages_dict[package.distroseries] = package
+        return packages_dict
+
+    @property
+    def active_series(self):
+        """Return active distroseries where this package is published.
+
+        Used in the template code that shows the table of versions.
+        The returned series are sorted in reverse order of creation.
+        """
+        series = set()
+        for package in self.active_distroseries_packages:
+            series.add(package.distroseries)
+        result = list(series)
+        result.sort(key=operator.attrgetter("version"), reverse=True)
+        return result
+
+    def published_by_version(self, sourcepackage):
+        """Return a dict of publications keyed by version.
+
+        :param sourcepackage: ISourcePackage
+        """
+        publications = sourcepackage.distroseries.getPublishedReleases(
+            sourcepackage.sourcepackagename)
+        pocket_dict = {}
+        for pub in publications:
+            version = pub.source_package_version
+            if version not in pocket_dict:
+                pocket_dict[version] = [pub]
+            else:
+                pocket_dict[version].append(pub)
+        return pocket_dict
+
+    @property
+    def version_table(self):
+        """Rows of data for the template to render in the packaging table."""
+        rows = []
+        packages_by_series = self.packages_by_active_distroseries
+        for distroseries in self.active_series:
+            # The first row for each series is the "title" row.
+            packaging = packages_by_series[distroseries].direct_packaging
             if packaging is None:
                 delete_packaging_form_id = None
-                packaging_field = None
+                hidden_packaging_field = None
             else:
                 delete_packaging_form_id = "delete_%s_%s_%s" % (
                     packaging.distroseries.name,
                     packaging.productseries.product.name,
                     packaging.productseries.name)
-                packaging_field = self._renderHiddenPackagingField(packaging)
-            series_result = []
-            for published in \
-                sourcepackage.published_by_pocket.iteritems():
-                for drspr in published[1]:
-                    series_result.append({
-                        'series': sourcepackage.distroseries,
-                        'pocket': published[0].name.lower(),
-                        'package': drspr,
-                        'packaging': packaging,
-                        'delete_packaging_form_id': delete_packaging_form_id,
-                        'packaging_field': packaging_field,
-                        'sourcepackage': sourcepackage
-                        })
-            for row in range(len(series_result)-1, 0, -1):
-                for column in ['series', 'pocket', 'package', 'packaging',
-                               'packaging_field', 'sourcepackage']:
-                    if (series_result[row][column] ==
-                            series_result[row-1][column]):
-                        series_result[row][column] = None
-            for row in series_result:
-                result.append(row)
-        return result
+                hidden_packaging_field = self._renderHiddenPackagingField(
+                    packaging)
+            package = packages_by_series[distroseries]
+            title_row = {
+                'blank_row': False,
+                'title_row': True,
+                'data_row': False,
+                'distroseries': distroseries,
+                'series_package': package,
+                'packaging': packaging,
+                'hidden_packaging_field': hidden_packaging_field,
+                'delete_packaging_form_id': delete_packaging_form_id,
+                }
+            rows.append(title_row)
+
+            # After the title row, we list each package version that's
+            # currently published, and which pockets it's published in.
+            pocket_dict = self.published_by_version(package)
+            for version in pocket_dict.iterkeys():
+                most_recent_publication = pocket_dict[version][0]
+                if most_recent_publication.datepublished is None:
+                    published_since = None
+                else:
+                    published_since = datetime.now(
+                        tz=pytz.UTC) - most_recent_publication.datepublished
+                row = {
+                    'blank_row': False,
+                    'title_row': False,
+                    'data_row': True,
+                    'version': version,
+                    'publication': most_recent_publication,
+                    'pockets': ", ".join(
+                        [pub.pocket.name for pub in pocket_dict[version]]),
+                    'component': most_recent_publication.component_name,
+                    'published_since': published_since,
+                    }
+                rows.append(row)
+            # We need a blank row after each section, so the series
+            # header row doesn't appear too close to the previous
+            # section.
+            rows.append({
+                'blank_row': True,
+                'title_row': False,
+                'data_row': False,
+                })
+
+        return rows
 
     def releases(self):
         dspr_pubs = self.context.getReleasesAndPublishingHistory()
@@ -357,6 +473,11 @@
                 dspr, spphs, spr_diffs.get(dspr.sourcepackagerelease, []))
             for (dspr, spphs) in dspr_pubs]
 
+    @cachedproperty
+    def open_questions(self):
+        """Return result set containing open questions for this package."""
+        return self.context.searchQuestions(status=QuestionStatus.OPEN)
+
 
 class DistributionSourcePackageEditView(LaunchpadEditFormView):
     """Edit a distribution source package."""

=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2009-08-24 20:28:33 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2009-08-25 10:58:26 +0000
@@ -84,7 +84,8 @@
 
     usedfor = ISourcePackage
     facet = 'overview'
-    links = ['packaging', 'edit_packaging', 'changelog', 'builds']
+    links = [
+        'packaging', 'edit_packaging', 'changelog', 'builds', 'set_upstream']
 
     def changelog(self):
         return Link('+changelog', 'View changelog', icon='list')
@@ -95,6 +96,9 @@
     def edit_packaging(self):
         return Link('+edit-packaging', 'Change upstream link', icon='edit')
 
+    def set_upstream(self):
+        return Link("+edit-packaging", "Set upstream link", icon="add")
+
     def builds(self):
         text = 'Show builds'
         return Link('+builds', text, icon='info')

=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-packages.txt'
--- lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2009-08-26 12:05:05 +0000
+++ lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2009-08-28 14:59:57 +0000
@@ -1,4 +1,9 @@
-= Distribution Package Search Results =
+============================
+Distribution Source Packages
+============================
+
+Distribution Package Search Results
+-----------------------------------
 
 Although there is a separate search page, we can search from the
 distribution overview page which takes us there and displays the
@@ -24,11 +29,10 @@
     >>> browser.url
     'http://localhost/ubuntu/+source/pmount'
 
-Get pmount 0.1-1 version
+Get pmount 0.1-2 version
 
-    >>> browser.getLink("0.1-1").click()
-    >>> browser.url
-    'http://localhost/ubuntu/+source/pmount/0.1-1'
+    >>> browser.getLink("0.1-2").url
+    'http://localhost/ubuntu/+source/pmount/0.1-2'
 
 Ensure that the correct binaries appear on the search results.  We only
 show one link to mozilla-firefox on the results page under each distro
@@ -109,7 +113,8 @@
     pmount
 
 
-== Distribution package change summary ==
+Distribution package change summary
+-----------------------------------
 
 Before we can test the page we publish netapplet to the ubuntutest main
 archive as well as some new PPAs.
@@ -179,20 +184,154 @@
 
     >>> logout()
 
-A /$DISTRO/+source/$PACKAGE page shows for a given source package all
-the distro releases in which it was published (see table at the top of
-the page). The information presented in each row is as follows: the
-distro series name and status as well as the package component, pocket
-and version.
+
+A /$DISTRO/+source/$PACKAGE page shows an overview of a source package in
+a distribution.  There are several sections of information.
+
+    >>> user_browser.open("http://launchpad.dev/ubuntu/+source/iceweasel/")
+
+Under the title there's a short paragraph that says how many 'new' bugs
+and open questions the package has.
+
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'bugs-and-questions-summary'))
+    This package has 0 new bugs and 0 open questions.
+
+Links exist to jump to the query page for the new bugs and open questions.
+
+    >>> print user_browser.getLink("0 new bugs").url
+    http://bugs.launchpad.dev/ubuntu/+source/iceweasel/+bugs?field.status:list=NEW
+
+    >>> print user_browser.getLink("0 open questions").url
+    http://answers.launchpad.dev/ubuntu/+source/iceweasel/+questions?field.status=OPEN
+
+The page also has a table that shows the distro series in which the package is
+published, and if there is a link to a product series. If there is no upstream
+set then a link to set one is given at the end of the row.  For each distro
+series a list of the versions available in that series are presented, along
+with which pocket has each version, the component in which it's published, and
+the time elapsed since it was published.
+
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'packages_list'))
+    The Warty Warthog Release (current stable release)      Set upstream link
+      1.0  release  (main)  ... weeks ago
+
+Each 'version' line contains an expandable row that shows more information
+about that version.  To show it, click the expander icon.  If the user has
+javascript enabled, the information is shown in-place.
+
+    >>> expander_url = find_tags_by_class(
+    ...     user_browser.contents, 'expander')[0]
+    >>> print expander_url
+    <a class="expander" href="/ubuntu/+archive/primary/+sourcepub/26/+listing-archive-extra" id="pub26-expander">
+    <img style... src="/@@/treeCollapsed" alt="Show details" title="Show details" id="pub26-arrow" />
+    </a>
+
+    >>> browser.open(user_browser.getLink(id="pub26-expander").url)
+    >>> print extract_text(browser.contents)
+    Publishing details
+    Published
+      on 2006-04-11
+      Copied from ubuntu warty in PPA for Mark Shuttleworth
+    Changelog
+    Builds
+      i386
+    Built packages
+      mozilla-firefox ff from iceweasel
+    Package files
+      firefox-0.9.2.orig.tar.gz (9.5 MiB)
+      iceweasel-1.0.dsc (123 bytes)
+      mozilla-firefox_0.9_i386.deb (3 bytes)
+
+There's also a section on the page that gives some package information:
+
+    >>> print extract_text(find_tag_by_id(user_browser.contents, 'current'))
+    Package information
+    Maintainer: Foo Bar
+    Urgency:* Low Urgency
+    Component:* main
+    Architectures:* any
+    *actual publishing details may vary in this distribution, these are just the package defaults.
+
+And if the source has direct packaging linkage, the upstream's description
+is used in another section:
+
+    >>> print extract_text(find_tag_by_id(user_browser.contents, 'upstream'))
+    This package is not linked to an upstream product.
+
+As can be seen, the packaging is not linked yet.  We can do that now using the
+"Set upstream link" link.
+
+    >>> user_browser.getLink("Set upstream link").click()
+    >>> print user_browser.url
+    http://launchpad.dev/ubuntu/warty/+source/iceweasel/+edit-packaging
+
+    >>> user_browser.getControl(
+    ...     name='field.productseries').value = "firefox/trunk"
+    >>> user_browser.getControl('Change').click()
+
+Go back to the source page, and now the upstream's description is shown.
+
+    >>> user_browser.open("http://launchpad.dev/ubuntu/+source/iceweasel/")
+    >>> print extract_text(find_tag_by_id(user_browser.contents, 'upstream'))
+    Upstream
+    The Mozilla Firefox web browser
+
+
+Distribution source packages side-bar
+-------------------------------------
+
+The page has a side-bar with a global actions menu, a "Get Involved"
+menu, a "Latest release" portlet and a "Bug subscriptions" portlet.
+
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'global-actions'))
+    View full change log
+    Subscribe to bug mail
+
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'involvement'))
+    Get Involved
+    Report a bug
+    Ask a question
+    Help translate
+
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'latest-release'))
+    Latest release
+    Version: 1.0
+    Uploaded by: Mark Shuttleworth
+    On date: ...
+
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents,
+    ...                    'portlet-structural-subscribers'))
+    Bug subscriptions
+    ...
+
+(see bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt for more
+on structural subscriptions)
+
+
+Related PPAs
+------------
+
+Switching to a different source now, "netapplet" is published in two
+distroseries.  The distroseries are presented in order, most recent first.
 
     >>> browser.open("http://launchpad.dev/ubuntutest/+source/netapplet/")
-    >>> print extract_text(find_tag_by_id(browser.contents, 'packaging'))
-    ubuntutest version                                 Upstream version
-    hoary-test development main release 1.0.1a         None defined
-    breezy-autotest development main release 1.3.1     None defined
-
-Directly after the distro releases, the three latest PPA uploads of
-this source package are displayed.
+    >>> print extract_text(find_tag_by_id(browser.contents, 'packages_list'))
+    Mock Hoary (active development)                   Set upstream link
+      1.0.1a  release  (main)  (not published)
+    Breezy Badger Autotest  (active development)      Set upstream link
+      1.3.1   release  (main)  (not published)
+
+(See more about packaging in:
+registry/stories/distribution/xx-distributionsourcepackage-packaging.txt)
+
+At the bottom of the page, the three latest PPA uploads of this source package
+are displayed.
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'ppa_packaging'))
     PPA named nightly for Person-name2 owned by Person-name2
@@ -208,14 +347,17 @@
     >>> link.text
     "...more untrusted versions of..."
 
+
+Source package change logs
+--------------------------
+
 /$DISTRO/+source/$PACKAGE/+changelog pages contain a version history that lists
 each published version of a package with its changelog entry for that version.
+To navigate to this page, click on the "View full change log" link from
+the index page.
 
-XXX julian 2009-08-26
-The +changelog page is currently NOT linked from +index.  The index page is
-currently undergoing a redesign and the link to it will be added therein.
-Until then, +changelog is a hidden page, but needs to land ahead of that
-redesign.
+    >>> browser.open("http://launchpad.dev/ubuntu/+source/foobar/")
+    >>> browser.getLink("View full change log").click()
 
 Each version history entry has a header with the version as the title
 and details of the publishing status in each distroseries it's published
@@ -223,7 +365,6 @@
 
 Package "foobar" is deleted:
 
-    >>> browser.open("http://launchpad.dev/ubuntu/+source/foobar/+changelog")
     >>> first_header = find_tag_by_id(browser.contents,
     ...     "detail_foobar_1.0")
     >>> print extract_text(first_header)
@@ -290,25 +431,35 @@
 changelog:
 
     >>> user_browser.open(
-    ...     "http://launchpad.dev/ubuntu/+source/commercialpackage/")
+    ...     "http://launchpad.dev/ubuntu/+source/commercialpackage/"
+    ...     "+changelog")
     >>> changelog = find_tag_by_id(
     ...     user_browser.contents, 'commercialpackage_1.0-1')
     >>> changelog.find('a')
     <a href="http://launchpad.dev/~name16" class="sprite person">&nbsp;[e-mail]</a>
 
 
-== Packages that are not published ==
+Packages that are not published
+-------------------------------
 
 If the package being viewed has no publishing history, a blank table is
 displayed:
 
     >>> user_browser.open(
     ...     "http://launchpad.dev/ubuntu/+source/a52dec/")
-    >>> print extract_text(find_tag_by_id(user_browser.contents, 'packaging'))
-    Ubuntu version                  Upstream version
-
-
-== Version history ==
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'packages_list'))
+
+The package information portlet also reflects that the package is not present
+at all in the distribution.
+
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'current'))
+     There is no current release for this source package in Ubuntu.
+
+
+Version history
+---------------
 
 The sourcepackage version history in a distribution is presented as
 all distinct sourcepackage releases and their corresponding changelogs

=== renamed file 'lib/canonical/launchpad/pagetests/packaging/xx-distributionsourcepackage-packaging-concurrent-deletion.txt' => 'lib/lp/registry/stories/distribution/xx-distributionsourcepackage-packaging-concurrent-deletion.txt'
=== renamed file 'lib/canonical/launchpad/pagetests/packaging/xx-distributionsourcepackage-packaging.txt' => 'lib/lp/registry/stories/distribution/xx-distributionsourcepackage-packaging.txt'
--- lib/canonical/launchpad/pagetests/packaging/xx-distributionsourcepackage-packaging.txt	2009-06-13 19:58:26 +0000
+++ lib/lp/registry/stories/distribution/xx-distributionsourcepackage-packaging.txt	2009-08-27 20:42:12 +0000
@@ -9,15 +9,13 @@
 package in this distribution, and the packaging associations for this
 source package in each series of this distribution.
 
-If there are multiple releases in a distroseries, the values that are
-identical are not repeated.
- 
     >>> content = anon_browser.contents
-    >>> print extract_text(find_tag_by_id(content, 'packaging'))
-    Ubuntu version                                 Upstream version
-    hoary development main release 1.0.9a-4ubuntu1 None defined
-    warty current     main release 1.0.9a-4        alsa-utils trunk series
-                      main         1.0.8-1ubuntu1
+    >>> print extract_text(find_tag_by_id(content, 'packages_list'))
+    The Hoary Hedgehog Release (active development)     Set upstream link
+      1.0.9a-4ubuntu1 release (main) ... weeks ago
+    The Warty Warthog Release (current stable release)  alsa-utils trunk series
+      1.0.8-1ubuntu1  release (main) ... weeks ago
+      1.0.9a-4        release (main) ... weeks ago
 
 
 === Delete Link Button ===
@@ -48,11 +46,12 @@
     >>> for tag in find_tags_by_class(content, 'informational'):
     ...     print extract_text(tag)
     Removed upstream association between alsa-utils trunk and Warty.
-    >>> print extract_text(find_tag_by_id(content, 'packaging'))
-    Ubuntu version                                 Upstream version
-    hoary development main release 1.0.9a-4ubuntu1 None defined
-    warty current     main release 1.0.9a-4        None defined
-                      main         1.0.8-1ubuntu1
+    >>> print extract_text(find_tag_by_id(content, 'packages_list'))
+    The Hoary Hedgehog Release (active development)     Set upstream link
+      1.0.9a-4ubuntu1 release (main) ... weeks ago
+    The Warty Warthog Release (current stable release)  Set upstream link
+      1.0.8-1ubuntu1  release (main) ... weeks ago
+      1.0.9a-4        release (main) ... weeks ago
 
 
 == Multiple package links ==
@@ -80,9 +79,11 @@
 
     >>> user_browser.open(
     ...     'http://launchpad.dev/ubuntu/+source/evolution')
-    >>> print extract_text(find_tag_by_id(user_browser.contents, 'packaging'))
-    Ubuntu version                     Upstream version
-    hoary development main release 1.0 Evolution no-crashes series
+    >>> print extract_text(find_tag_by_id(
+    ...     user_browser.contents, 'packages_list'))
+    The Hoary Hedgehog Release (active development) Evolution no-crashes series
+      1.0 release (main)  ... weeks ago
+
 
 Once he deletes the link, the older link shows:
 
@@ -92,6 +93,7 @@
     ...     print message
     Removed upstream association between Evolution no-crashes and Hoary.
 
-    >>> print extract_text(find_tag_by_id(user_browser.contents, 'packaging'))
-    Ubuntu version                     Upstream version
-    hoary development main release 1.0 Evolution trunk series
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'packages_list'))
+    The Hoary Hedgehog Release (active development) Evolution trunk series
+      1.0 release (main)  ... weeks ago

=== modified file 'lib/lp/registry/templates/distributionsourcepackage-index.pt'
--- lib/lp/registry/templates/distributionsourcepackage-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/distributionsourcepackage-index.pt	2009-08-28 15:25:46 +0000
@@ -3,28 +3,52 @@
   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="context/@@main_template/master"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad"
 >
 
 <body>
 
-  <metal:portlets fill-slot="portlets">
-    <div tal:replace="structure context/@@+portlet-structural-subscribers" />
-    <div tal:replace="structure context/@@+portlet-latestbugs" />
-    <div tal:replace="structure context/@@+portlet-latestquestions" />
-  </metal:portlets>
-
-<div metal:fill-slot="main">
-
-  <h1>
-    &ldquo;<span tal:replace="context/name" />&rdquo; source package in
-    <span tal:replace="context/distribution/displayname" />
-  </h1>
-
+<metal:block fill-slot="head_epilogue">
+  <tal:devmode condition="devmode">
+    <tal:archive_js define="lp_js string:${icingroot}/build">
+      <script type="text/javascript"
+              tal:attributes="src string:${lp_js}/soyuz/base.js">
+      </script>
+    </tal:archive_js>
+  </tal:devmode>
+</metal:block>
+
+<tal:heading metal:fill-slot="heading">
+  <h1 tal:content="view/page_title"/>
+</tal:heading>
+
+<tal:side metal:fill-slot="side">
+    <tal:menu replace="structure view/@@+global-actions" />
+
+    <tal:involved replace="structure context/@@+get-involved" />
+
+    <tal:current define="current context/currentrelease">
+    <div class="portlet" id="latest-release" tal:condition="current">
+      <h2>Latest release</h2>
+      <dl>
+        <dt>Version:</dt>
+          <dd><a tal:content="current/version"
+                 tal:attributes="href current/fmt:url">3.2.1-3</a>
+          </dd>
+        <dt>Uploaded by:</dt>
+          <dd><a tal:replace="structure current/creator/fmt:link">Foo Bar</a></dd>
+        <dt>On date:</dt>
+          <dd tal:content="current/dateuploaded/fmt:datetime"/>
+      </dl>
+    </div>
+    </tal:current>
+
+    <tal:subscribers
+      replace="structure context/@@+portlet-structural-subscribers"/>
+</tal:side>
+
+<tal:main metal:fill-slot="main">
   <p class="error message"
      tal:condition="view/errors"
      tal:content="view/error_count" />
@@ -40,61 +64,165 @@
      Field specific error for the hidden packaging field.
   </p>
 
-  <h2>Published versions and upstream associations</h2>
-
-  <table id="packaging" class="listing">
-    <thead>
-      <tr>
-        <th colspan="5">
-          <span tal:replace="context/distribution/displayname" /> version
-        </th>
-        <th>Upstream version</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr tal:repeat="row view/version_listing">
-        <td><span tal:condition="row/series"
-                  tal:content="row/series/name">hoary</span></td>
-        <td><span tal:condition="row/series"
-                  tal:content="row/series/status/name/fmt:lower" /></td>
-        <td><span tal:condition="row/package"
-                  tal:content="row/package/component/name/fmt:lower" /></td>
-        <td tal:content="row/pocket">release</td>
-        <td><a tal:content="row/package/version"
-               tal:attributes="href row/package/fmt:url">2.2.1-1</a>
-        </td>
-        <td>
-          <tal:distroseries_row condition="row/series">
-            <span tal:condition="row/packaging"
-                  tal:replace="row/packaging/productseries/title" />
-            <tal:no_direct condition="not: row/packaging">
-              None defined
-            </tal:no_direct>
-            <a tal:attributes="
-               href string:${row/sourcepackage/fmt:url}/+edit-packaging"
-               title="Edit upstream association">
-              <img src="/@@/edit" />
-            </a>
-            <form tal:condition="row/packaging_field"
-                  style="display: inline"
-                  action=""
-                  method="POST"
-                  tal:attributes="action request/URL;
-                                  id row/delete_packaging_form_id">
-              <tal:hidden replace="structure row/packaging_field" />
-              <tal:action
-                  replace="structure view/renderDeletePackagingAction" />
-            </form>
-          </tal:distroseries_row>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <p style="text-align: right">
-    <a href="+publishinghistory">See full publishing history...</a>
-  </p>
-
-  <div tal:define="ppa_versions view/related_ppa_versions"
+  <div class="top-portlet" id="bugs-and-questions-summary"
+       tal:define="newbugs context/new_bugtasks/count;
+                   open_questions view/open_questions/count">
+    This package has
+    <a tal:attributes="href view/menu:overview/new_bugs/url"><strong class="bugs-stat"><tal:newbugs content="newbugs"/> new bug<tal:plural content="string:s" condition="python: newbugs!=1"/><strong></a>
+     and <a tal:attributes="href view/menu:overview/open_questions/url"><strong class="answers-stat"><tal:openq content="open_questions"/> open question<tal:plural content="string:s" condition="python: open_questions!=1"/>.</strong></a>
+  </div>
+
+  <div class="yui-g">
+
+    <div class="yui-u first" tal:define="current context/currentrelease">
+      <div class="portlet" tal:condition="current" id="current">
+        <h2>Package information</h2>
+        <div class="two-column-list">
+          <dl>
+            <dt>Maintainer:</dt>
+            <dd>
+               <a tal:replace="structure current/maintainer/fmt:link">Foo Bar</a>
+            </dd>
+          </dl>
+          <dl>
+            <dt>Urgency:<sup>*</sup></dt>
+            <dd tal:content="current/urgency/title"/>
+          </dl>
+          <dl>
+            <dt>Component:<sup>*</sup></dt>
+            <dd tal:content="current/component/name"/>
+          </dl>
+          <dl>
+            <dt>Architectures:<sup>*</sup></dt>
+            <dd tal:content="current/architecturehintlist"/>
+          </dl>
+        </div>
+        <p style="font-size: 80%;">
+          <sup>*</sup>actual publishing details may vary in this distribution, these are just the package defaults.
+        </p>
+      </div><!--portlet-->
+      <div class="portlet" tal:condition="not: current" id="current">
+        There is no current release for this source package in
+        <span tal:replace="context/distribution/displayname">ubuntu</span>.
+      </div>
+    </div><!--yui-u-->
+
+    <div class="yui-u">
+      <div class="portlet" id="upstream">
+        <tal:project define="project context/upstream_product">
+          <div tal:condition="project">
+            <h2>Upstream</h2>
+            <div style="float:left; padding:0 1em 1em 0;"
+                 tal:content="structure project/image:logo"/>
+            <div tal:content="structure project/summary" />
+          </div>
+          <tal:noproject condition="not: project">
+              This package is not linked to an upstream product.
+          </tal:noproject>
+        </tal:project>
+      </div><!--portlet -->
+    </div><!--yui-u -->
+
+  </div><!--yui-g -->
+
+
+  <div class="yui-u"
+       tal:define="archive context/latest_overall_publication/archive|nothing">
+
+    <table class="listing" id="packages_list">
+      <tal:rows repeat="row view/version_table">
+
+      <tal:title_row condition="row/title_row">
+      <tr class="section-heading shaded" style="vertical-align: middle">
+        <td colspan=3>
+          <img tal:replace="structure context/distribution/image:icon"/>
+          <a tal:attributes="href row/series_package/fmt:url"
+             tal:content="row/distroseries/title"/>
+          (<span tal:replace="row/distroseries/status/title/lower"/>)
+          <div style="float:right;">
+            <a tal:condition="not: row/packaging"
+               tal:replace="structure row/series_package/menu:overview/set_upstream/fmt:link"/>
+            <tal:has_packaging condition="row/packaging">
+              <img tal:replace="structure row/packaging/productseries/image:icon"/>
+              <tal:title replace="row/packaging/productseries/title"/>
+              <a tal:attributes="
+                href row/series_package/menu:overview/edit_packaging/url">
+                <img src="/@@/edit">
+              </a>
+              <form style="display: inline"
+                    method="POST"
+                    tal:condition="row/hidden_packaging_field"
+                    tal:attributes="action request/URL;
+                                    id row/delete_packaging_form_id">
+                <tal:hidden replace="structure row/hidden_packaging_field" />
+                <tal:action replace="structure view/renderDeletePackagingAction" />
+              </form>
+            </tal:has_packaging>
+          </div><!--float right-->
+        </td>
+      </tr>
+      </tal:title_row>
+
+      <tal:package_row condition="row/data_row">
+      <tal:define define="pubid row/publication/id">
+
+      <tr class="archive_package_row">
+        <td style="white-space: nowrap">
+          <a class="expander"
+             tal:attributes="id string:pub${pubid}-expander;
+                             href string:${archive/fmt:url}/+sourcepub/${pubid}/+listing-archive-extra">
+            <img style="padding-right:0.5em;" src="/@@/treeCollapsed"
+                 alt="Show details" title="Show details"
+                 tal:attributes="id string:pub${pubid}-arrow"/>
+          </a>
+          <a tal:attributes="href row/version">
+            <img src="/@@/package-source" />
+            <tal:version content="row/version"/>
+          </a>
+        </td>
+        <td>
+          <tal:pockets content="row/pockets/lower"/>
+          (<tal:component content="row/component"/>)
+        </td>
+        <td>
+          <tal:last_published condition="row/published_since">
+            <span tal:replace="row/published_since/fmt:approximateduration"/>
+            ago
+          </tal:last_published>
+          <tal:not_published
+               condition="not: row/published_since"
+               content="string:(not published)"/>
+        </td>
+      </tr>
+      <tr tal:attributes="id string:pub${pubid}" style="display: none">
+        <td colspan=3>
+          <div class="package-details"
+               tal:attributes="id string:pub${pubid}-container" />
+        </td>
+      </tr>
+
+      </tal:define>
+      </tal:package_row>
+
+      <tal:blank_row condition="row/blank_row">
+        <tr><td colspan=3 style="padding-bottom: 1em; border-top: 0" /></tr>
+      </tal:blank_row>
+
+      </tal:rows>
+    </table>
+    <script
+       tal:content="string:LP.client.cache['archive_context_url'] = '${archive/fmt:url}';"/>
+    <metal:js use-macro="archive/@@+macros/expandable-table-js"/>
+
+    <p style="float:right; padding-top:1em">
+      <a href="+publishinghistory">See full publishing history</a>
+    </p>
+
+  </div>
+
+  <div class="yui-u">
+  <div class="portlet"
+       tal:define="ppa_versions view/related_ppa_versions"
        tal:condition="ppa_versions" id="related-ppa-versions">
     <div id="slide-trigger">
       <div class="widget-hd">
@@ -103,7 +231,7 @@
       </div>
     </div>
     <div class="widget-bd">
-      <p>The following <strong>unsupported</strong> and 
+      <p>The following <strong>unsupported</strong> and
          <strong>untrusted</strong> Personal Archives (PPAs) provide
          packages of
          '<span tal:replace="context/name" />':</p>
@@ -171,14 +299,9 @@
 </script>
 
   </div>
-
-  <h2>Version history</h2>
-
-  <tal:block
-    repeat="dspr view/releases"
-    replace="structure dspr/@@+changes">
-  </tal:block>
-
-</div>
+  </div>
+
+</tal:main>
+
 </body>
 </html>

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distrorelease-sources.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distrorelease-sources.txt	2009-06-16 18:31:28 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distrorelease-sources.txt	2009-08-26 15:24:40 +0000
@@ -38,10 +38,10 @@
   >>> print browser.url
   http://launchpad.dev/ubuntu/+source/mozilla-firefox
 
-Click the "Show publishing history" link to see specific information
+Click the "See full publishing history" link to see specific information
 about Firefox's publishing history.
 
-  >>> browser.getLink("Show publishing history").click()
+  >>> browser.getLink("See full publishing history").click()
   >>> print extract_text(find_tag_by_id(browser.contents, 'publishing-summary'))
   Date                                              Status     Target   Pocket   Component   Section   Version
   2006-02-13 12:19:00 UTC                           Published  Warty    release  main        web       0.9
@@ -54,7 +54,7 @@
 By clicking in the 'target' distroseries we will get to the
 SourcePackage page:
 
-  >>> browser.getLink("warty").click()
+  >>> browser.getLink("The Warty Warthog Release").click()
   >>> browser.url
   'http://launchpad.dev/ubuntu/warty/+source/mozilla-firefox'
 
@@ -438,9 +438,8 @@
 distroseries and archive are shown.
 
     >>> anon_browser.open(
-    ...     'http://launchpad.dev/ubuntu/+source/alsa-utils')
-
-    >>> anon_browser.getLink("Show publishing history").click()
+    ...     'http://launchpad.dev/ubuntu/+source/alsa-utils/'
+    ...     '+publishinghistory')
 
     >>> print extract_text(
     ...    find_tag_by_id(anon_browser.contents, 'publishing-summary'))

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-package-diff.txt'
--- lib/lp/soyuz/stories/soyuz/xx-package-diff.txt	2009-05-06 20:53:05 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-package-diff.txt	2009-08-26 15:24:40 +0000
@@ -125,10 +125,11 @@
 
 == Ubuntu sources ==
 
-All diffs are visible in the 'biscuit source in ubuntu' page, right
-below the changelog text for each uploaded version.
+All diffs are visible in the 'biscuit source in ubuntu' change log page, right
+below the text for each uploaded version.
 
-    >>> anon_browser.open('http://launchpad.dev/ubuntu/+source/biscuit')
+    >>> anon_browser.open(
+    ...     'http://launchpad.dev/ubuntu/+source/biscuit/+changelog')
     >>> changes = find_tags_by_class(anon_browser.contents, 'boardComment')
     >>> for change in changes:
     ...     print 30 * '='

=== modified file 'lib/lp/soyuz/templates/archive-macros.pt'
--- lib/lp/soyuz/templates/archive-macros.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/archive-macros.pt	2009-08-25 17:05:15 +0000
@@ -64,9 +64,18 @@
         }
     };
 
+    /*
+     * If a page wants to use this outside of an archive context then it
+     * car define LP.client.cache['archive_context'], which should be a
+     * full or relative URL to the context archive page required.
+     */
+    var base_url = (typeof(LP.client.cache['archive_context_url']) != "undefined") ? LP.client.cache['archive_context_url'] : '';
+    if (base_url !== ''){
+        base_url += '/'
+    }
     var pub_id = container.get('id').replace(
         '-container', '').replace('pub', '');
-    var uri = '+sourcepub/' + pub_id + '/+listing-archive-extra';
+    var uri = base_url + '+sourcepub/' + pub_id + '/+listing-archive-extra';
     Y.io(uri, config);
 }