Merge lp:~michael.nelson/launchpad/418024-ppa-packages-traversal into lp:launchpad

[Michael Nelson]

[Michael Nelson (michael.nelson)]

= Summary =

This is the first branch of a pipeline of changes for the new PPA-index
page described at:

https://dev.launchpad.net/VersionThreeDotO/Soyuz/PPAUI

This branch specifically creates a new traversal from a PPA, /+packages
and replicates all the detailed package info/interactions from the
current ppa/index to /+packages.

A subsequent branch in the pipeline then updates the PPA index page.

== Proposed fix ==

== Pre-implementation notes ==

== Implementation details ==

There are two XXX's in this branch.

bug 420376 is related to the copy/delete packages links displayed on the
/+packages traversal. I've not used a main_side layout as (1) there is
no other information for the side-bar, and (2) these links will
disappear when the copy/delete functionality is presented on this page.

bug 419921 - in the build status summary, we want to link to a filtered
view of each summary (Pending, Successful, Failed), but currently cannot
as the filtering options do not yet match.

== Tests ==
bin/test -vv -t archive-views.txt -t xx-ppa-packages.txt

== Demo and Q/A ==

Visit:

https://launchpad.dev/~cprov/+archive/ppa/+packages

= Launchpad lint =

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

Linting changed files:
  lib/canonical/launchpad/icing/style.css
  lib/lp/soyuz/browser/tests/archive-views.txt
  lib/lp/soyuz/interfaces/archive.py
  lib/lp/soyuz/templates/archive-macros.pt
  lib/lp/soyuz/templates/archive-packages.pt
  lib/lp/soyuz/browser/configure.zcml
  lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt
  lib/lp/soyuz/model/archive.py
  lib/lp/soyuz/browser/archive.py

== Pylint notices ==

lib/lp/soyuz/interfaces/archive.py
    41: [F0401] Unable to import 'lazr.enum' (No module named enum)
    54: [F0401] Unable to import 'lazr.restful.declarations' (No module
named restful)
    60: [F0401] Unable to import 'lazr.restful.fields' (No module named
restful)

lib/lp/soyuz/model/archive.py
    14: [F0401] Unable to import 'lazr.lifecycle.event' (No module named
lifecycle)

--
Michael

[Gavin Panella (allenap)]

Hi Michael,

Hardly anything to say, it's all good. I have a few comments, but
they're all trivial. I mentioned on IRC that the package counters
javascript appeared to be broken, but I haven't commented seeing as
there is more work in another branch; this is more of a checkpoint
review.

Gavin.

> === modified file 'lib/canonical/launchpad/icing/style.css'
> --- lib/canonical/launchpad/icing/style.css 2009-08-31 00:06:29 +0000
> +++ lib/canonical/launchpad/icing/style.css 2009-09-02 11:25:06 +0000
> @@ -1690,14 +1690,6 @@
> float: left; /* So the border doesn't use 100% of the page */
> }
>
> -div#build-status-summary {
> - clear:right;
> - float:right;
> -}
> -
> -div#build-status-summary h2 {
> - margin-top:0;
> -}
>
> div#build-status-summary th {
> text-align:left;
> @@ -1844,6 +1836,18 @@
> padding: 1em 1em 2em 0em;
> }
>
> +/* XXX Michael Nelson 20090828 bug=420376
> + * Temporary style for actions on the ppa/+packages page until we move
> + * the copy/delete packages functionality into the page itself. */
> +div.ppa-packaging-tmp-actions {
> + float:right;
> +}
> +
> +div.ppa-packaging-tmp-actions .portlet {
> + border-top: 0 none;
> +}
> +
> +
> /* --- Code --- */
>
> body.tab-branches #applications {background: url(app-code-wm.gif) no-repeat;}
>
> === modified file 'lib/lp/soyuz/browser/archive.py'
> --- lib/lp/soyuz/browser/archive.py 2009-09-01 18:26:21 +0000
> +++ lib/lp/soyuz/browser/archive.py 2009-09-02 11:25:06 +0000
> @@ -18,6 +18,8 @@
> 'ArchiveNavigationMenu',
> 'ArchivePackageCopyingView',
> 'ArchivePackageDeletionView',
> + 'ArchivePackagesView',
> + 'ArchivePackagesActionMenu',

These should be in alphabetical order :)

> 'ArchiveView',
> 'ArchiveViewBase',
> 'traverse_distro_archive',
> @@ -30,7 +32,7 @@
> from zope.app.form.utility import setUpWidget
> from zope.component import getUtility
> from zope.formlib import form
> -from zope.interface import implements
> +from zope.interface import implements, Interface
> from zope.schema import Choice, List
> from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
>
> @@ -38,6 +40,8 @@
>
> from canonical.cachedproperty import cachedproperty
> from canonical.launchpad import _
> +from canonical.launchpad.helpers import english_list
> +from canonical.lazr.utils import smartquote
> from lp.soyuz.browser.build import BuildRecordsView
> from lp.soyuz.browser.sourceslist import (
> SourcesListEntries, SourcesListEntriesView)
> @@ -308,13 +312,8 @@
>
> return self.context.getArchiveDependency(archive)
>
> -class ArchiveContextMenu(ContextMenu):
> - """Overview Menu for IArchive."""
> -
> - usedfor = IArchive
> - links = ['ppa', 'admin', 'edit', 'builds', 'delete', 'copy',
> - 'edit_dependencies', 'manage_subscribers']
> -
> +
> +class ArchiveMenuMixin:
> def ppa(self):
> text = 'View PPA'
> return Link(canonical_url(self.context), text, icon='info')
> @@ -341,9 +340,13 @@
> return Link('+edit', text, icon='edit')
>
> def builds(self):
> - text = 'View build records'
> + text = 'View all builds'
> return ...

[Gavin Panella (allenap)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2009-08-31 00:06:29 +0000
+++ lib/canonical/launchpad/icing/style.css	2009-09-02 09:20:43 +0000
@@ -1690,14 +1690,6 @@
   float: left; /* So the border doesn't use 100% of the page */
 }
 
-div#build-status-summary {
-    clear:right;
-    float:right;
-}
-
-div#build-status-summary h2 {
-    margin-top:0;
-}
 
 div#build-status-summary th {
     text-align:left;
@@ -1844,6 +1836,18 @@
     padding: 1em 1em 2em 0em;
 }
 
+/* XXX Michael Nelson 20090828 bug=420376
+ * Temporary style for actions on the ppa/+packages page until we move
+ * the copy/delete packages functionality into the page itself. */
+div.ppa-packaging-tmp-actions {
+    float:right;
+}
+
+div.ppa-packaging-tmp-actions .portlet {
+    border-top: 0 none;
+}
+
+
 /* --- Code --- */
 
 body.tab-branches #applications {background: url(app-code-wm.gif) no-repeat;}

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2009-09-01 18:26:21 +0000
+++ lib/lp/soyuz/browser/archive.py	2009-09-02 09:20:43 +0000
@@ -18,6 +18,8 @@
     'ArchiveNavigationMenu',
     'ArchivePackageCopyingView',
     'ArchivePackageDeletionView',
+    'ArchivePackagesView',
+    'ArchivePackagesActionMenu',
     'ArchiveView',
     'ArchiveViewBase',
     'traverse_distro_archive',
@@ -30,7 +32,7 @@
 from zope.app.form.utility import setUpWidget
 from zope.component import getUtility
 from zope.formlib import form
-from zope.interface import implements
+from zope.interface import implements, Interface
 from zope.schema import Choice, List
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
@@ -38,6 +40,8 @@
 
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
+from canonical.launchpad.helpers import english_list
+from canonical.lazr.utils import smartquote
 from lp.soyuz.browser.build import BuildRecordsView
 from lp.soyuz.browser.sourceslist import (
     SourcesListEntries, SourcesListEntriesView)
@@ -308,13 +312,8 @@
 
         return self.context.getArchiveDependency(archive)
 
-class ArchiveContextMenu(ContextMenu):
-    """Overview Menu for IArchive."""
-
-    usedfor = IArchive
-    links = ['ppa', 'admin', 'edit', 'builds', 'delete', 'copy',
-             'edit_dependencies', 'manage_subscribers']
-
+
+class ArchiveMenuMixin:
     def ppa(self):
         text = 'View PPA'
         return Link(canonical_url(self.context), text, icon='info')
@@ -341,9 +340,13 @@
         return Link('+edit', text, icon='edit')
 
     def builds(self):
-        text = 'View build records'
+        text = 'View all builds'
         return Link('+builds', text, icon='info')
 
+    def builds_successful(self):
+        text = 'View successful builds'
+        return Link('+builds?build_state=built', text, icon='info')
+
     @enabled_with_permission('launchpad.Edit')
     def delete(self):
         """Display a delete menu option for non-copy archives."""
@@ -372,6 +375,14 @@
         return Link('+edit-dependencies', text, icon='edit')
 
 
+class ArchiveContextMenu(ContextMenu, ArchiveMenuMixin):
+    """Overview Menu for IArchive."""
+
+    usedfor = IArchive
+    links = ['ppa', 'admin', 'edit', 'builds', 'builds_successful', 'delete',
+             'copy', 'edit_dependencies', 'manage_subscribers']
+
+
 class ArchiveNavigationMenu(NavigationMenu):
     """IArchive navigation menu.
 
@@ -382,6 +393,17 @@
     links = []
 
 
+class IArchivePackagesActionMenu(Interface):
+    """A marker interface for the packages action menu."""
+
+
+class ArchivePackagesActionMenu(NavigationMenu, ArchiveMenuMixin):
+    """An action menu for archive package-related actions."""
+    usedfor = IArchivePackagesActionMenu
+    facet = 'overview'
+    links = ['copy', 'delete']
+
+
 class ArchiveBreadcrumb(Breadcrumb):
     """Builds a breadcrumb for an `IArchive`."""
 
@@ -555,6 +577,11 @@
         return SimpleVocabulary(status_terms)
 
     @cachedproperty
+    def series_with_sources(self):
+        """Cache the context's series with sources."""
+        return self.context.series_with_sources
+
+    @property
     def series_vocabulary(self):
         """Return a vocabulary for selecting a distribution series.
 
@@ -562,7 +589,7 @@
         selection of a series
         """
         series_terms = [SimpleTerm(None, token='any', title='Any Series')]
-        for distroseries in self.context.series_with_sources:
+        for distroseries in self.series_with_sources:
             series_terms.append(
                 SimpleTerm(distroseries, token=distroseries.name,
                            title=distroseries.displayname))
@@ -692,15 +719,13 @@
             canonical_url(self.context, view_name='+edit'),
             id="displayname", title="Edit this displayname")
 
-        self.setupSourcesListEntries()
-
-    def setupSourcesListEntries(self):
-        """Setup of the sources list entries widget."""
+    @property
+    def sources_list_entries(self):
+        """Setup and return the source list entries widget."""
         entries = SourcesListEntries(
             self.context.distribution, self.archive_url,
             self.context.series_with_sources)
-        self.sources_list_entries = SourcesListEntriesView(
-            entries, self.request)
+        return SourcesListEntriesView(entries, self.request)
 
     @property
     def package_copy_requests(self):
@@ -709,6 +734,28 @@
                 IPackageCopyRequestSet).getByTargetArchive(self.context))
 
 
+class ArchivePackagesView(ArchiveSourcePackageListViewBase):
+    """Detailed packages view for an archive."""
+    implements(IArchivePackagesActionMenu)
+
+    @property
+    def page_title(self):
+        return smartquote('Packages in "%s"' % self.context.displayname)
+
+    @property
+    def series_list_string(self):
+        """Return an English string of the distroseries."""
+        return english_list(
+            [series.displayname for series in self.series_with_sources])
+
+    @property
+    def is_copy(self):
+        """Return whether the context of this view is a copy archive."""
+        # This property enables menu items to be shared between
+        # context and view menues.
+        return self.context.is_copy
+
+
 class ArchiveSourceSelectionFormView(ArchiveSourcePackageListViewBase,
                                      LaunchpadFormView):
     """Base class to implement a source selection widget for PPAs."""

=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml	2009-08-21 18:05:01 +0000
+++ lib/lp/soyuz/browser/configure.zcml	2009-08-25 08:21:09 +0000
@@ -234,15 +234,20 @@
         name="+macros"
         permission="zope.Public"
         template="../templates/archive-macros.pt"/>
-    <browser:pages
-        for="lp.soyuz.interfaces.archive.IArchive"
-        permission="launchpad.View"
-        class="lp.soyuz.browser.archive.ArchiveView">
-        <browser:page
-            template="../templates/archive-index.pt"
-            facet="overview"
-            name="+index"/>
-    </browser:pages>
+    <browser:page
+        for="lp.soyuz.interfaces.archive.IArchive"
+        permission="launchpad.View"
+        name="+index"
+        template="../templates/archive-index.pt"
+        facet="overview"
+        class="lp.soyuz.browser.archive.ArchiveView"/>
+    <browser:page
+        for="lp.soyuz.interfaces.archive.IArchive"
+        permission="launchpad.View"
+        name="+packages"
+        template="../templates/archive-packages.pt"
+        facet="overview"
+        class="lp.soyuz.browser.archive.ArchivePackagesView"/>
     <browser:pages
         for="lp.soyuz.interfaces.archive.IArchive"
         permission="launchpad.View">
@@ -322,7 +327,8 @@
     <browser:menus
         classes="
             ArchiveContextMenu
-            ArchiveNavigationMenu"
+            ArchiveNavigationMenu
+            ArchivePackagesActionMenu"
         module="lp.soyuz.browser.archive"/>
     <browser:url
         for="lp.soyuz.interfaces.archivepermission.IArchiveUploader"

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2009-09-01 18:26:21 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2009-09-02 09:20:43 +0000
@@ -285,6 +285,40 @@
     >>> login(ANONYMOUS)
 
 
+== ArchivePackageView ==
+
+This view displays detailed information about the archive packages that
+is not so relevant for the PPA index page, such as a summary of build
+statuses, repository usage, full publishing details and access to
+copy/delete packages where appropriate.
+
+And let's create two views to compare:
+
+    >>> ppa_archive_view = create_initialized_view(
+    ...     cprov.archive, name="+packages")
+    >>> copy_archive_view = create_initialized_view(
+    ...     copy_archive, name="+packages")
+
+    >>> print ppa_archive_view.page_title
+    Packages in ...PPA for Celso Providelo...
+
+    >>> print copy_archive_view.page_title
+    Packages in ...Copy archive intrepid-security-rebuild... 
+
+This view inherits from ArchiveViewBase and has all the
+corresponding properties such as archive_url, build_counters etc.
+(see ArchiveView above).
+
+Additionally, ArchivePackageView can display a string representation
+of the series supported by this archive.
+
+    >>> print ppa_archive_view.series_list_string
+    Breezy Badger Autotest and Warty
+
+    >>> copy_archive_view.series_list_string
+    ''
+
+
 == ArchivePackageDeletionView ==
 
 We use ArchivePackageDeletionView to provide the mechnisms used to

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2009-08-07 12:44:22 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2009-08-27 13:19:19 +0000
@@ -134,6 +134,8 @@
             title=_("Displayname"), required=True,
             description=_("Displayname for this archive.")))
 
+    title = TextLine(title=_("Name"), required=False, readonly=True)
+
     enabled = Bool(
         title=_("Enabled"), required=False,
         description=_("Whether the archive is enabled or not."))

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2009-07-31 19:45:21 +0000
+++ lib/lp/soyuz/model/archive.py	2009-08-27 13:19:19 +0000
@@ -187,6 +187,11 @@
             alsoProvides(self, IDistributionArchive)
 
     @property
+    def title(self):
+        """See `IArchive`."""
+        return self.displayname
+
+    @property
     def is_ppa(self):
         """See `IArchive`."""
         return self.purpose == ArchivePurpose.PPA

=== added file 'lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt	2009-08-28 15:19:43 +0000
@@ -0,0 +1,76 @@
+The PPA packages page
+=====================
+
+The PPA packages page is accessible from the PPA page.
+NOTE: The PPA page will be updated in a following branch.
+
+    >> anon_browser.open('http://launchpad.dev/~cprov/+archive/ppa')
+    >> anon_browser.getLink('View package details').click()
+    >> anon_browser.url
+    'http://launchpad.dev/~cprov/+archive/ppa/+packages'
+
+    >>> anon_browser.open('http://launchpad.dev/~cprov/+archive/ppa/+packages')
+
+    >>> print anon_browser.title
+    Packages in ...PPA for Celso Providelo...
+
+While navigating around the PPA the "structural location" includes a PPA:
+
+    >>> print_location(anon_browser.contents)
+    Hierarchy: Celso Providelo > PPA for Celso Providelo
+    Tabs:
+    * Overview (selected) - http://launchpad.dev/~cprov
+    * Code - http://code.launchpad.dev/~cprov
+    * Bugs - http://bugs.launchpad.dev/~cprov
+    * Blueprints - http://blueprints.launchpad.dev/~cprov
+    * Translations - http://translations.launchpad.dev/~cprov
+    * Answers - http://answers.launchpad.dev/~cprov
+    Main heading: Packages in ...PPA for Celso Providelo...
+
+You can see the build details of the packages in the archive by using
+the 'View all builds' link.
+
+    >>> anon_browser.getLink('View all builds').click()
+    >>> print anon_browser.title
+    Builds for PPA for Celso Providelo
+
+    >>> print anon_browser.url
+    http://launchpad.dev/~cprov/+archive/ppa/+builds
+
+
+The rest of the builds page functionality is tested generically at
+in xx-builds-pages.txt.
+
+
+Package totals
+--------------
+
+A summary of the package totals is presented in a portlet (although the
+actual values are loaded in asynchronously.
+
+    >>> anon_browser.open('http://launchpad.dev/~cprov/+archive/ppa/+packages')
+    >>> package_totals = find_portlet(
+    ...     anon_browser.contents, "Package totals")
+    >>> print extract_text(package_totals)
+    Package totals
+    ...
+    Package counters and estimated archive size temporarily
+    unavailable.
+
+A summary of the builds for the PPA is also presented.
+
+    >>> build_summary = find_portlet(
+    ...     anon_browser.contents, "View all builds Package build summary")
+    >>> print extract_text(build_summary)
+    View...
+    A total of 4 builds have been dispatched for this PPA.
+    Completed builds
+    3 successful
+    1 failed
+
+Successful builds link directly to the builds filter.
+
+    >>> successful_builds_link = anon_browser.getLink('3 successful')
+    >>> print successful_builds_link.url
+    http://launchpad.dev/~cprov/+archive/ppa/+builds?build_state=built
+

=== modified file 'lib/lp/soyuz/templates/archive-macros.pt'
--- lib/lp/soyuz/templates/archive-macros.pt	2009-09-01 10:21:45 +0000
+++ lib/lp/soyuz/templates/archive-macros.pt	2009-09-02 09:20:43 +0000
@@ -261,61 +261,63 @@
     :archive: targeted IArchive.
   </tal:comment>
 
-  <ul tal:define="usage_summary archive/@@+index/repository_usage">
-    <li id="source_counter">
-       <tal:source_label replace="usage_summary/source_label" />
+  <dl tal:define="usage_summary archive/@@+index/repository_usage">
+    <dt>Number of packages:</dt>
+    <dd><tal:source_label replace="usage_summary/source_label" />
        (<tal:sources_size
-          replace="usage_summary/sources_size/fmt:bytes" />)</li>
-    <li id="binary_counter">
+          replace="usage_summary/sources_size/fmt:bytes" />)</dd>
+    <dd>
        <tal:binary_label replace="usage_summary/binary_label" />
        (<tal:binaries_size
-          replace="usage_summary/binaries_size/fmt:bytes" />)</li>
-    <li id="total_size">
-       Estimated repository size:
-       <tal:used replace="usage_summary/used/fmt:bytes" />
+          replace="usage_summary/binaries_size/fmt:bytes" />)</dd>
+    <dt>Repository size:</dt>
+    <dd><tal:used replace="usage_summary/used/fmt:bytes" />
        (<span tal:attributes="class usage_summary/used_css_class"
               tal:content="string:${usage_summary/used_percentage}%"/>)
-        of <tal:quota replace="usage_summary/quota/fmt:bytes" /></li>
-  </ul>
-
+        of <tal:quota replace="usage_summary/quota/fmt:bytes" /></dd>
+  </dl>
 
 </metal:package_counters>
 
 <metal:build_status_summary define-macro="build-status-summary">
 
   <tal:comment replace="nothing">
-    Present the build pie chart for the context IArchiveRebuild.
+    Present a summary of the packages with build statuses for the archive.
     :archive: targetted IArchive.
+
+    XXX noodles 20090827 bug=419921
+    Currently we can only provide a direct link to successful builds
+    as there is no single filtering option for failed and pending
+    builds.
   </tal:comment>
 
-  <table id="build-count-table"
-         summary="An overview of the build status for this archive."
-         tal:define="build_counters view/build_counters">
-    <thead>
-      <tr>
-        <th>Total builds:</th>
-        <td class="total" tal:content="view/build_counters/total">100</td>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <th>Failed</th>
-        <td class="failed" tal:content="build_counters/failed">100</td>
-      </tr>
-      <tr>
-        <th>Pending</th>
-        <td class="pending" tal:content="build_counters/pending">100</td>
-      </tr>
-      <tr>
-        <th>Superseded</th>
-        <td class="superseded" tal:content="build_counters/superseded">100</td>
-      </tr>
-      <tr>
-        <th>Succeeded</th>
-        <td class="succeeded" tal:content="build_counters/succeeded">100</td>
-      </tr>
-    </tbody>
-  </table>
+  <div id="build-count-summary">
+
+    <p>A total of
+      <span class="build-count total"
+            tal:content="view/build_counters/total">100</span> builds have
+      been dispatched for this PPA.</p>
+
+    <dl>
+      <dt>Completed builds</dt>
+      <dd>
+        <a tal:attributes="href context/menu:context/builds_successful/fmt:url">
+          <span class="build-count succeeded"
+                tal:content="view/build_counters/succeeded">100</span>
+          successful</a></dd>
+      <dd>
+        <span class="build-count failed"
+              tal:content="view/build_counters/failed">100</span>
+        failed</dd>
+    </dl>
+
+  <p tal:condition="view/build_counters/pending">
+    A recent upload has resulted in
+    <span class="build-count pending"
+          tal:content="view/build_counters/pending">100</span>
+    pending builds.
+  </p>
+  </div>
 </metal:build_status_summary>
 
 <metal:package_filter_form define-macro="package-filter-form">

=== added file 'lib/lp/soyuz/templates/archive-packages.pt'
--- lib/lp/soyuz/templates/archive-packages.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/templates/archive-packages.pt	2009-08-25 09:56:04 +0000
@@ -0,0 +1,183 @@
+<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>
+    <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>
+          <script type="text/javascript"
+                  tal:attributes="src string:${lp_js}/soyuz/lp_dynamic_dom_updater.js">
+          </script>
+          <script type="text/javascript"
+                  tal:attributes="src string:${lp_js}/soyuz/update_archive_build_statuses.js">
+          </script>
+        </tal:archive_js>
+      </tal:devmode>
+      <script type="text/javascript" id="repository-size-update"
+              tal:condition="view/archive_url">
+YUI().use('io-base', 'lazr.anim', 'node', 'soyuz-base',
+          'soyuz.update_archive_build_statuses', function(Y) {
+
+
+/*
+ * Update the page based on the XHR response.
+ */
+function doUpdate(transaction_id, response, args) {
+    args.container.set('innerHTML', response.responseText);
+}
+
+
+/*
+ * Communicate the update has failed and allow the user to retry
+ * the operation.
+ */
+function informFailure(transaction_id, response, args) {
+    function retry_handler (e) {
+        e.preventDefault();
+        dispatchUpdate();
+    };
+
+    var failure_message = Y.soyuz.makeFailureNode(
+        'Failed to fetch repository size ...', retry_handler);
+
+    args.container.set('innerHTML', '');
+    args.container.appendChild(failure_message);
+
+    var anim = Y.lazr.anim.red_flash({
+        node: failure_message
+        });
+    anim.run();
+}
+
+
+/*
+ * Communicate an update is in progress and fire the XHR.
+ */
+function dispatchUpdate () {
+    in_progress_message = Y.soyuz.makeInProgressNode(
+        'Fetching repository size ...')
+
+    var container = Y.get('#package-counters');
+    container.set('innerHTML', '');
+    container.appendChild(in_progress_message);
+
+    var uri = '+repository-size';
+    var xhr_config = {
+        on: {
+            success: doUpdate,
+            failure: informFailure
+        },
+        arguments: {
+            'container': container
+        }
+    };
+
+    Y.io(uri, xhr_config);
+}
+
+Y.on("domready", dispatchUpdate);
+});
+      </script>
+      <style type="text/css" media="screen, print">
+tr#package-counters p{
+    margin-bottom: 3.4em;
+}
+      </style>
+    </metal:block>
+
+    <div metal:fill-slot="main"
+         tal:define="archive_active view/has_sources;
+                     archive_label  view/archive_label;"
+         tal:attributes="class string:archive">
+
+      <div class="top-portlet">
+
+        <div class="ppa-packaging-tmp-actions"
+             tal:content="structure view/@@+global-actions" />
+        <h1 tal:content="view/page_title">
+          PPA for user
+        </h1>
+
+        <p tal:condition="not: context/enabled"
+           style="clear: right;" class="warning message">
+          This archive has been disabled.
+        </p>
+
+        <p>This
+          <tal:archive_label replace="archive_label">PPA</tal:archive_label>
+          currently publishes packages for
+          <tal:series_list replace="view/series_list_string">
+            Gutsy, Hardy and Karmic
+          </tal:series_list>.
+        </p>
+      </div>
+
+      <div class="yui-g">
+        <div class="first yui-u"><div class="portlet">
+          <h2>Package totals</h2>
+          <p>The following information is related to the total published
+             packages in the repository (not on your system).</p>
+          <div id="package-counters">
+            <p class="discreet">
+              Package counters and estimated archive size temporarily
+              unavailable.
+            </p>
+          </div>
+        </div></div> <!-- portlet, yui-u -->
+
+        <div class="yui-u">
+          <div tal:define="archive context"
+               tal:condition="archive_active"
+               id="build-status-summary"
+               class="portlet">
+            <h2>
+              <span class="see-all"><a
+                tal:replace="structure context/menu:context/builds/fmt:link" />
+              </span>
+              Package build summary
+            </h2>
+
+            <metal:build-status-summary
+                use-macro="archive/@@+macros/build-status-summary" />
+          </div>
+        </div>
+
+      </div> <!-- yui-g -->
+
+      <div class="portlet">
+        <h2>Packages</h2>
+        <tal:package-copy-request-list tal:condition="context/is_copy">
+          <metal:package-copy-request-list
+              use-macro="context/@@+macros/package-copy-request-list" />
+        </tal:package-copy-request-list>
+
+        <p tal:condition="not: archive_active">
+          This <tal:archive_label replace="archive_label" /> does not contain
+          any packages yet. Find more information about how to upload
+          packages in the <a href="https://help.launchpad.net/Packaging/PPA"
+          >PPA help page</a>
+        </p>
+
+        <tal:active_archive condition="archive_active">
+
+        <metal:package_filter_form
+          use-macro="context/@@+macros/package-filter-form" />
+
+        <metal:package-list
+            use-macro="context/@@+macros/source-package-list" />
+
+        </tal:active_archive>
+      </div> <!-- portlet -->
+    </div> <!--main -->
+
+  </body>
+
+</html>