Merge lp:~julian-edwards/launchpad/mechanical-changes-6 into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Mechanical 3.0 changes for DistroArchSeriesBinaryPackage[Release] pages

== Implementation details ==
I slipped in a quick bug fix while I was at it:
https://bugs.edge.launchpad.net/bugs/241341
to fix a page heading. This was just a case of changing the title property on
the context class.

The change to the DistroArchSeriesBinaryPackage is trivial and can be seen
here:
https://launchpad.dev/ubuntu/warty/i386/mozilla-firefox

The change to the DistroArchSeriesBinaryPackageRelease page was more involved.
It uses several page fragments in the package relationships section that are
in a different context/view. They are not used anywhere else so I added some
conditional "yui-u" div classes to those so that they don't appear when not
necessary.

The breadcrumbs on both pages are not working properly, I will fix those in a
separate branch.

== Tests ==
bin/test -vvt stories.soyuz -t distroarchseriesbinarypackage

== Demo and Q/A ==
See the URLs above.

= Launchpad lint =

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

Linting changed files:
  lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-predepends.pt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-depends.pt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-suggests.pt
  lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-portlet-
details.pt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-conflicts.pt
  lib/lp/soyuz/templates/distroarchseriesbinarypackage-index.pt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-enhances.pt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-replaces.pt
  lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-index.pt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-recommends.pt
  lib/lp/soyuz/model/distroarchseriesbinarypackage.py
  lib/lp/soyuz/templates/binarypackagerelease-portlet-provides.pt
  lib/lp/soyuz/templates/binarypackagerelease-portlet-breaks.pt

[Michael Nelson (michael.nelson)]

> = Summary =
> Mechanical 3.0 changes for DistroArchSeriesBinaryPackage[Release] pages

These pages look *so* much better! It's great seeing LP transformed :)

>
> == Implementation details ==
> I slipped in a quick bug fix while I was at it:
> https://bugs.edge.launchpad.net/bugs/241341
> to fix a page heading. This was just a case of changing the title property on
> the context class.

Great! As mentioned in irc, you've added an extra 'for' into the title unintentionally, and it would be good to use smartquotes here.

>
> The change to the DistroArchSeriesBinaryPackage is trivial and can be seen
> here:
> https://launchpad.dev/ubuntu/warty/i386/mozilla-firefox
>
> The change to the DistroArchSeriesBinaryPackageRelease page was more involved.
> It uses several page fragments in the package relationships section that are
> in a different context/view. They are not used anywhere else so I added some
> conditional "yui-u" div classes to those so that they don't appear when not
> necessary.
>
> The breadcrumbs on both pages are not working properly, I will fix those in a
> separate branch.
>
> == Tests ==
> bin/test -vvt stories.soyuz -t distroarchseriesbinarypackage

Looks like the tests for the title need updating (or you may have done it since I merged).

The only other thing is that we need to ensure we markup the package relationships correctly... currently there are dt's that are not enclosed by dl's (like having an <li> without it being inside a <ul> or an <ol>. That in itself is as easy as doing the following for each relationship portlet:

http://pastebin.ubuntu.com/264324/

It does leave one remaining problem - the <dt> is then followed by a <ul> rather than a bunch of <dd>'s, but we can't fix that yet as another template (sourcepackage-index.pt) uses the same +render-list traversal (which in-turn uses the packagerelationship-list.pt). So I think we should wait until sourcepackage-index.pt is updated to 3-0 before updating packagerelationship-list.pt to output dd's). I'll leave it up to you whether it's worth an XXX.

Looking forward to seeing it land!

IRC log:
<bigjools> great
<noodles775> bigjools: you mention in your MP that the breadcrumbs aren't working properly - in what way?
<bigjools> noodles775: they are now, I landed a change last night :)
<noodles775> bigjools: heh, I couldn't find a problem :)
<bigjools> they stopped at 9.04
<noodles775> bigjools: any reason you didn't use smartquote in the title?
<bigjools> or whatever version
<bigjools> meh, details :)
<noodles775> (like in model/distributionsourcepackage's title?)
<noodles775> bigjools: also, see https://launchpad.dev/ubuntu/warty/i386/mozilla-firefox
<noodles775> What do you think we should do in that case? (The empty Package relationships section)
<bigjools> noodles775: it will never be empty in real life
<noodles775> Great.
<bigjools> our sample data is bong
* jtv (n=[e-mail]) has joined #launchpad-reviews
<noodles775> bigjools: also with the dasbp title, was it an explicit decision to do '"mozilla-firefox" binary package in Ubuntu Karmic for i386' rather than without the 'for' as suggested by mpt: '"mozilla-firefox" binary pa...

review: Approve (code/ui)

=== modified file 'lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt'
--- lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2009-04-30 12:16:12 +0000
+++ lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2009-09-02 11:28:03 +0000
@@ -1,5 +1,6 @@
-Distro Arch Release Binary Package
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+=================================
+Distro Arch Series Binary Package
+=================================
 
   >>> from lp.soyuz.model.binarypackagename import (
   ...     BinaryPackageName)
@@ -15,6 +16,11 @@
   >>> firefox_hoary_i386 = DistroArchSeriesBinaryPackage(hoary_i386,
   ...                                                    firefox_name)
 
+`DistroArchSeriesBinaryPackage`s have a title property:
+
+  >>> print pmount_hoary_i386.title
+  "pmount" binary package in The Hoary Hedgehog Release for i386 (x86)
+
 
 First, we create a new version of pmount, and a version of
 mozilla-firefox that coincides with pmount's. We're hitch-hiking on two
@@ -36,7 +42,7 @@
   ...     PackagePublishingPocket, IDistributionSet)
   >>> priority = PackagePublishingPriority.STANDARD
 
-XXX: noodles 2008-11-05 bug=294585: The dependency on a database id 
+XXX: noodles 2008-11-05 bug=294585: The dependency on a database id
 needs to be removed.
   >>> bpr = Build.get(8).createBinaryPackageRelease(
   ...   binarypackagename=firefox_name.id,
@@ -77,7 +83,7 @@
   ...   dateremoved=None,
   ...   archive=hoary_i386.main_archive)
 
-XXX: noodles 2008-11-06 bug=294585: The dependency on a database id 
+XXX: noodles 2008-11-06 bug=294585: The dependency on a database id
 needs to be removed.
   >>> bpr = Build.get(9).createBinaryPackageRelease(
   ...   binarypackagename=pmount_name.id,

=== modified file 'lib/lp/soyuz/model/distroarchseriesbinarypackage.py'
--- lib/lp/soyuz/model/distroarchseriesbinarypackage.py	2009-07-19 04:41:14 +0000
+++ lib/lp/soyuz/model/distroarchseriesbinarypackage.py	2009-09-02 11:28:03 +0000
@@ -71,7 +71,7 @@
     @property
     def title(self):
         """See IDistroArchSeriesBinaryPackage."""
-        return 'Binary Package "%s" in %s' % (
+        return '"%s" binary package in %s' % (
             self.binarypackagename.name, self.distroarchseries.title)
 
     @cachedproperty
@@ -238,7 +238,7 @@
         current_release = self.currentrelease
         if current_release is None:
             return None
-            
+
         src_pkg_release = current_release.distributionsourcepackagerelease
         if src_pkg_release is None:
             return None

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-breaks.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-breaks.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-breaks.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-breaks">
-
-  <h2>Breaks</h2>
-
-  <div class="portletBody portletContent"
-       id="breaks"
-       tal:define="relationships view/breaks">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list" />
-
+  tal:define="relationships view/breaks"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-breaks">
+
+  <div id="breaks">
+    <dt>Breaks:</dt>
+    <tal:block replace="structure relationships/@@+render-list" />
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-conflicts.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-conflicts.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-conflicts.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-conflicts">
-
-  <h2>Conflicts</h2>
-
-  <div class="portletBody portletContent"
-       id="conflicts"
-       tal:define="relationships view/conflicts">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/conflicts"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-conflicts">
+
+  <div id="conflicts">
+    <dt>Conflicts:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-depends.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-depends.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-depends.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-depends">
-
-  <h2>Depends on</h2>
-
-  <div class="portletBody portletContent"
-       id="depends"
-       tal:define="relationships view/depends">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/depends"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-depends">
+
+  <div id="depends">
+    <dt>Depends on:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-enhances.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-enhances.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-enhances.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-enhances">
-
-  <h2>Enhances</h2>
-
-  <div class="portletBody portletContent"
-       id="enhances"
-       tal:define="relationships view/enhances">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/enhances"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-enhances">
+
+  <div id="enhances">
+    <dt>Enhances:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-predepends.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-predepends.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-predepends.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-predepends">
-
-  <h2>Pre-Depends on</h2>
-
-  <div class="portletBody portletContent"
-       id="predepends"
-       tal:define="relationships view/pre_depends">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/pre_depends"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-predepends">
+
+  <div id="predepends">
+    <dt>Pre-Depends on:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-provides.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-provides.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-provides.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-provides">
-
-  <h2>Provides</h2>
-
-  <div class="portletBody portletContent"
-       id="provides"
-       tal:define="relationships view/provides">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/provides"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-provides">
+
+  <div id="provides">
+    <dt>Provides:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-recommends.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-recommends.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-recommends.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-recommends">
-
-  <h2>Recommends</h2>
-
-  <div class="portletBody portletContent"
-       id="recommends"
-       tal:define="relationships view/recommends">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/recommends"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-recommends">
+
+  <div id="recommends">
+    <dt>Recommends:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-replaces.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-replaces.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-replaces.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-replaces">
-
-  <h2>Replaces</h2>
-
-  <div class="portletBody portletContent"
-       id="replaces"
-       tal:define="relationships view/replaces">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/replaces"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-replaces">
+
+  <div id="replaces">
+    <dt>Replaces:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-suggests.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-suggests.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-suggests.pt	2009-09-02 14:54:06 +0000
@@ -2,17 +2,13 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-suggests">
-
-  <h2>Suggests</h2>
-
-  <div class="portletBody portletContent"
-       id="suggests"
-       tal:define="relationships view/suggests">
-
-     <tal:block condition="relationships/has_items"
-                replace="structure relationships/@@+render-list"/>
-
+  tal:define="relationships view/suggests"
+  tal:condition="relationships/has_items"
+  class="first yui-u" id="portlet-suggests">
+
+  <div id="suggests">
+    <dt>Suggests:</dt>
+    <tal:block replace="structure relationships/@@+render-list"/>
   </div>
 
 </div>

=== modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackage-index.pt'
--- lib/lp/soyuz/templates/distroarchseriesbinarypackage-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroarchseriesbinarypackage-index.pt	2009-09-01 19:49:09 +0000
@@ -3,37 +3,20 @@
   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_only"
   i18n:domain="launchpad"
 >
   <body>
 
-  <metal:leftportlets fill-slot="portlets_one">
-    <div tal:replace="structure context/@@+portlet-details" />
-    <div tal:replace="structure context/distroarchseries/@@+portlet-details" />
-  </metal:leftportlets>
-
-  <metal:rightportlets fill-slot="portlets_two">
-    <div tal:replace="structure context/@@+portlet-releases" />
-  </metal:rightportlets>
-
 <div metal:fill-slot="main">
 
-      <div>
-        <a
-          tal:attributes="href context/distroarchseries/fmt:url"
-          tal:content="context/distroarchseries/displayname"
-        />
-      </div>
-      <h1 tal:content="context/title">pmount in Ubuntu Hoary i386</h1>
-
+  <div class="top-portlet">
   <tal:description replace="structure context/description/fmt:text-to-html">
     Package description
   </tal:description>
+  </div>
 
+  <div class="portlet">
   <h2>Publishing history</h2>
 
     <table id="publishing-summary" class="listing">
@@ -55,7 +38,9 @@
          </tal:block>
        </tbody>
     </table>
+  </div>
 
+  <div class="top-portlet">
   <tal:sourcepkg tal:define="spackage context/distro_source_package"
                    tal:condition="spackage">
     <h2>Source package</h2>
@@ -63,7 +48,7 @@
       <div id="source">
         <ul>
           <li class="source package">
-            <a 
+            <a
                tal:content="spackage/title"
                tal:attributes="href spackage/fmt:url"
                id="source_package">SOURCEPACKAGE</a>
@@ -71,6 +56,7 @@
         </ul>
       </div>
   </tal:sourcepkg>
+  </div>
 </div>
 </body>
 </html>

=== modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-index.pt'
--- lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-index.pt	2009-09-02 14:54:06 +0000
@@ -3,103 +3,84 @@
   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_only"
   i18n:domain="launchpad"
 >
   <body>
 
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-  <div tal:replace="structure context/distroarchseries/@@+portlet-details" />
-</metal:leftportlets>
-
-
 <div metal:fill-slot="main">
 
-      <div>
-        <a
-          tal:attributes="href context/distroarchseries/fmt:url"
-          tal:content="context/distroarchseries/displayname"
-        />:
-        <a tal:attributes="href context/distroarchseriesbinarypackage/fmt:url">
-          &ldquo;<tal:packagename
-            replace="context/distroarchseriesbinarypackage/name"
-          />&rdquo; package
-        </a>
-      </div>
-      <h1 tal:content="context/title">Name of package</h1>
 
+  <div class="top-portlet">
   <tal:description replace="structure context/description/fmt:text-to-html">
      Package Description
   </tal:description>
-
-  <h2>Source package</h2>
-
-  <div id="source">
-    <ul>
-      <li class="source package">
-        <a tal:define="spackage context/distributionsourcepackagerelease"
-           tal:content="spackage/title"
-           tal:attributes="href spackage/fmt:url">SOURCEPACKAGE</a>
-      </li>
-    </ul>
-  </div>
-
-  <h2>Downloadable files</h2>
-
-  <div id="files">
-    <div id="build" tal:condition="context/build">
-        <a tal:define="pbuild context/build"
-           tal:content="pbuild/title"
-           tal:attributes="href pbuild/fmt:url">BUILD</a> produced
-        <span tal:condition="context/files">
-          these files:
-        </span>
+  </div>
+
+  <div class="yui-g">
+
+  <div class="first yui-u">
+    <div tal:replace="structure context/@@+portlet-details" />
+  </div>
+
+  <div class="yui-u">
+    <div class="portlet">
+      <h2>Downloadable files</h2>
+      <div id="files">
+        <div id="build" tal:condition="context/build">
+            <a tal:define="pbuild context/build"
+               tal:content="pbuild/title"
+               tal:attributes="href pbuild/fmt:url">BUILD</a> produced
+            <span tal:condition="context/files">
+              these files:
+            </span>
+            <span tal:condition="not: context/files">
+              no files for this binary package.
+            </span>
+        </div>
+
+        <div id="downloadable-files">
+            <ul class="download" tal:condition="context/files">
+              <li tal:repeat="file context/files">
+                <a class="sprite"
+                   tal:content="file/libraryfile/filename"
+                   tal:attributes="href file/libraryfile/http_url"></a>
+                (<span tal:replace="file/libraryfile/content/filesize/fmt:bytes" />)
+              </li>
+            </ul>
+        </div>
+      </div>
+      <!-- No build and no downloadable files -->
+      <div tal:condition="not: context/build">
         <span tal:condition="not: context/files">
-          no files for this binary package.
+          There are no downloadable files for this binary package.
         </span>
-    </div>
-    
-    <div id="downloadable-files">
-        <ul class="download" tal:condition="context/files">
-          <li tal:repeat="file context/files">
-            <a tal:content="file/libraryfile/filename"
-               tal:attributes="href file/libraryfile/http_url"></a>
-            (<span tal:replace="file/libraryfile/content/filesize/fmt:bytes" />)
-          </li>
-        </ul>
-    </div>
-  </div>
-  <!-- No build and no downloadable files -->
-  <div tal:condition="not: context/build">
-    <span tal:condition="not: context/files">
-      There are no downloadable files for this binary package.
-    </span>
-  </div>
-
-
-  <h2>Package relationships</h2>
-
-  <table width="100%" tal:define="bpr context/binarypackagerelease">
-     <tr>
-       <td><div tal:replace="structure bpr/@@+portlet-depends" /></td>
-       <td><div tal:replace="structure bpr/@@+portlet-conflicts" /></td>
-       <td><div tal:replace="structure bpr/@@+portlet-provides" /></td>
-     </tr>
-     <tr>
-       <td><div tal:replace="structure bpr/@@+portlet-replaces" /></td>
-       <td><div tal:replace="structure bpr/@@+portlet-suggests" /></td>
-       <td><div tal:replace="structure bpr/@@+portlet-recommends" /></td>
-     </tr>
-     <tr>
-       <td><div tal:replace="structure bpr/@@+portlet-predepends" /></td>
-       <td><div tal:replace="structure bpr/@@+portlet-enhances" /></td>
-       <td><div tal:replace="structure bpr/@@+portlet-breaks" /></td>
-     </tr>
-  </table>
+      </div>
+    </div><!--portlet-->
+  </div><!--yui-u-->
+
+  </div><!--yui-g-->
+
+
+  <style>#relationships div {padding-top:0.5em;}</style>
+  <div class="yui-g" tal:define="bpr context/binarypackagerelease">
+  <div class="portlet" id="relationships">
+
+    <h2>Package relationships</h2>
+
+    <div tal:replace="structure bpr/@@+portlet-depends" />
+    <div tal:replace="structure bpr/@@+portlet-conflicts" />
+    <div tal:replace="structure bpr/@@+portlet-provides" />
+    <div tal:replace="structure bpr/@@+portlet-replaces" />
+    <div tal:replace="structure bpr/@@+portlet-suggests" />
+    <div tal:replace="structure bpr/@@+portlet-recommends" />
+    <div tal:replace="structure bpr/@@+portlet-predepends" />
+    <div tal:replace="structure bpr/@@+portlet-enhances" />
+    <div tal:replace="structure bpr/@@+portlet-breaks" />
+
+  </div><!--portlet-->
+  </div><!--yui-g-->
+
 </div>
 </body>
 </html>

=== modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-portlet-details.pt'
--- lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroarchseriesbinarypackagerelease-portlet-details.pt	2009-09-02 11:56:16 +0000
@@ -6,24 +6,36 @@
 
   <h2>Details</h2>
 
-  <div class="portletBody portletContent">
-
-    <b>Package version:</b>
-    <span tal:replace="context/version" /><br />
-
-    <b>Source:</b>
-    <a tal:content="context/distributionsourcepackagerelease/version"
+  <div class="two-column-list">
+
+  <dl>
+    <dt>Package version:</dt>
+    <dd tal:content="context/version" />
+  </dl>
+
+  <dl>
+    <dt>Source:</dt>
+    <dd id="source">
+    <a tal:content="context/distributionsourcepackagerelease/title"
        tal:attributes="href context/distributionsourcepackagerelease/fmt:url"
-       >apache2 2.1-3</a><br />
-
-    <b>Status:</b>
-    <span tal:replace="context/status/title" /><br />
-
-    <b>Component:</b>
-    <span tal:replace="context/component/name" /><br />
-
-    <b>Priority:</b>
-    <span tal:replace="context/priority/title" /><br />
+       >apache2 2.1-3 (source) in Ubuntu</a><br />
+    </dd>
+  </dl>
+
+  <dl>
+    <dt>Status:</dt>
+    <dd tal:content="context/status/title" />
+  </dl>
+
+  <dl>
+    <dt>Component:</dt>
+    <dd tal:content="context/component/name" />
+  </dl>
+
+  <dl>
+    <dt>Priority:</dt>
+    <dd tal:content="context/priority/title" />
+  </dl>
 
   </div>