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

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Mechanical 3.0 conversion of distroseriesbinarypackage page

== Implementation details ==
Pretty straightforward template conversion of
lib/lp/soyuz/templates/distroseriesbinarypackage-index.pt

The two side portlets are removed, although the publishing details one has
moved to the bottom of the main content.

I also took the opportunity to clean up the page test a bit.

== Tests ==
bin/test -vvt xx-distroseries-binary-packages.txt

== Demo and Q/A ==
See dogfood:
https://dogfood.launchpad.net/ubuntu/hardy/+package/kmail

Or in .dev:
https://launchpad.dev/ubuntu/warty/+package/mozilla-firefox/

= 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/pagetitles.py
  lib/lp/soyuz/templates/distroseriesbinarypackage-index.pt
  lib/lp/soyuz/browser/distroseriesbinarypackage.py
  lib/lp/soyuz/stories/soyuz/xx-distroseries-binary-packages.txt

[Abel Deuring (adeuring)]

review: Approve

[Michael Nelson (michael.nelson)]

<noodles> bigjools: sorry, not part of a ui review I know, but do we have any rules about using non-ascii characters in tests? I've always seen people doing ... instead of “
<noodles> I think it's much more readable just to use it as you have...
<bigjools> noodles: I honestly don't know
<bigjools> exactly, and it passes ...
<noodles> yep.
<noodles> ouch... I just saw what this page used tot look like! Gee it's nice seeing all these changes!
<bigjools> :)
<bigjools> horrible wasn't it
<noodles> Yeah, having the publishings down the side...
* bigjools has quit (Ping timeout)
* bigjools (<email address hidden>) has joined #launchpad-soyuz
<bigjools> intel drivers FTW again
<noodles> bigjools: looks great. My only thought (there's always one isn't there... is that I think we should update the h2: "Published as" to something that doesn't require context.
<noodles> heh
<bigjools> not sure I completely understand
<noodles> hmm... maybe not. I was thinking that instead of "Published as", maybe "Publications of 'kmail' in Ubuntu Hardy"
<noodles> but that's too much context.
<noodles> Any ideas? Or do you think there's no benefit in changing from "Publish as"...?
<bigjools> "Published versions" maybe
<noodles> Yeah, perfect

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-02 23:14:55 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-03 19:34:53 +0000
@@ -442,8 +442,6 @@
 
 distroseries_queue = ContextTitle('Queue for %s')
 
-distroseriesbinarypackage_index = ContextTitle('%s')
-
 distroserieslanguage_index = ContextTitle('%s')
 
 distroseriessourcepackagerelease_index = ContextTitle('%s')
 
=== modified file 'lib/lp/soyuz/browser/distroseriesbinarypackage.py'
--- lib/lp/soyuz/browser/distroseriesbinarypackage.py	2009-08-24 20:28:33 +0000
+++ lib/lp/soyuz/browser/distroseriesbinarypackage.py	2009-09-03 16:38:19 +0000
@@ -15,6 +15,7 @@
 from canonical.launchpad.webapp import (
     StandardLaunchpadFacets, ApplicationMenu, Navigation)
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
+from canonical.lazr.utils import smartquote
 
 
 class DistroSeriesBinaryPackageFacets(StandardLaunchpadFacets):
@@ -50,4 +51,6 @@
         self.context = context
         self.request = request
 
-
+    @property
+    def page_title(self):
+        return smartquote(self.context.title)
 
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-binary-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distroseries-binary-packages.txt	2008-11-13 13:46:54 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distroseries-binary-packages.txt	2009-09-03 19:02:44 +0000
@@ -5,20 +5,17 @@
 
     >>> browser.open(
     ...     'http://launchpad.dev/ubuntu/warty/+package/mozilla-firefox')
-    >>> browser.title
-    'Binary package "mozilla-firefox" in ubuntu warty'
-    
+    >>> print browser.title
+    Binary package “mozilla-firefox” in ubuntu warty
+
     >>> main_content = find_main_content(browser.contents)
     >>> print extract_text(main_content)
+    Binary package “mozilla-firefox” in ubuntu warty
+    Ubuntu 4.10 mozilla-firefox
     Mozilla Firefox Web Browser
     Mozilla Firefox Web Browser is .....
     Source package
     iceweasel 1.0 (source) in ubuntu warty
-
-There is a portlet displaying the publishing history:
-
-    >>> portlet = find_portlet(browser.contents, "Published as")
-    >>> print extract_text(portlet)
     Published as
     mozilla-firefox 0.9 in hppa (Release)
     mozilla-firefox 0.9 in i386 (Release)
@@ -27,16 +24,16 @@
 And each publishing history item is a link to the relevant binary
 release:
 
-    >>> browser.getLink('mozilla-firefox 0.9 in hppa (Release)').url
-    'http://launchpad.dev/ubuntu/warty/hppa/mozilla-firefox/0.9'
-    >>> browser.getLink('mozilla-firefox 0.9 in i386 (Release)').url
-    'http://launchpad.dev/ubuntu/warty/i386/mozilla-firefox/0.9'
-    >>> browser.getLink('mozilla-firefox 1.0 in i386 (Release)').url
-    'http://launchpad.dev/ubuntu/warty/i386/mozilla-firefox/1.0'
+    >>> print browser.getLink('mozilla-firefox 0.9 in hppa (Release)').url
+    http://launchpad.dev/ubuntu/warty/hppa/mozilla-firefox/0.9
+    >>> print browser.getLink('mozilla-firefox 0.9 in i386 (Release)').url
+    http://launchpad.dev/ubuntu/warty/i386/mozilla-firefox/0.9
+    >>> print browser.getLink('mozilla-firefox 1.0 in i386 (Release)').url
+    http://launchpad.dev/ubuntu/warty/i386/mozilla-firefox/1.0
 
 The page also displays a link to the distro series source package
 release:
-    
+
     >>> browser.getLink(id="source_package").click()
     >>> browser.title
     'iceweasel 1.0 (source) in ubuntu warty'
@@ -46,11 +43,15 @@
 
     >>> browser.open(
     ...     'http://launchpad.dev/ubuntu/hoary/+package/mozilla-firefox')
-    >>> browser.title
-    'Binary package "mozilla-firefox" in ubuntu hoary'
-    
+    >>> print browser.title
+    Binary package “mozilla-firefox” in ubuntu hoary
+
     >>> main_content = find_main_content(browser.contents)
     >>> print extract_text(main_content)
+    Binary package “mozilla-firefox” in ubuntu hoary
+    Ubuntu 5.04 mozilla-firefox
     No summary available for mozilla-firefox in ubuntu hoary.
     No description available for mozilla-firefox in ubuntu hoary.
+    Published as
+    Not published at present.
 
 
=== modified file 'lib/lp/soyuz/templates/distroseriesbinarypackage-index.pt'
--- lib/lp/soyuz/templates/distroseriesbinarypackage-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroseriesbinarypackage-index.pt	2009-09-03 16:38:19 +0000
@@ -3,46 +3,41 @@
   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:heading fill-slot="pageheading">
-      <h1 tal:content="context/summary">Summary Goes Here</h1>
-    </metal:heading>
-
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-published" />
-</metal:rightportlets>
+
+<body>
+  <metal:heading fill-slot="heading">
+    <h1 tal:content="view/page_title"/>
+  </metal:heading>
 
 <div metal:fill-slot="main">
 
+  <h2 tal:content="context/summary"/>
+
   <tal:description replace="structure context/description/fmt:text-to-html">
       Package Description
   </tal:description>
 
-  <tal:sourcepkg tal:define="spackage context/last_sourcepackagerelease"
-                   tal:condition="spackage">
+  <div class="portlet"
+       tal:define="spackage context/last_sourcepackagerelease"
+       tal:condition="spackage">
     <h2>Source package</h2>
 
       <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>
           </li>
         </ul>
       </div>
-  </tal:sourcepkg>
+  </div>
+
+  <div tal:replace="structure context/@@+portlet-published" />
 
 </div>
 </body>