Merge lp:~julian-edwards/launchpad/trivial-ui into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Fix a bunch of trivial ui issues

== Proposed fix ==
 * https://bugs.edge.launchpad.net/bugs/328402 - show the ppa's signing key
fingerprint
 * https://bugs.edge.launchpad.net/soyuz/+bug/57559 - everything's already
fixed apart from the last item which is to change a heading
 * https://bugs.edge.launchpad.net/bugs/131515 - Fix inconsistent titles on
some package-related pages
 * https://bugs.edge.launchpad.net/bugs/237263 - add (pending) at the end of a
diff title's text if it's not ready to download yet

== Implementation details ==
Pretty trivial changes, I even removed some template code that was filling
heading slots!

== Tests ==
Loads involved. I already tested with -t stories -t pagetests -t doc and
everything passes.

== Demo and Q/A ==
Run this in "psql launchpad_dev" so cprov's PPA gets a signing key:
update archive set signing_key=1 where id=9;

https://launchpad.dev/ubuntu/warty/+source/mozilla-firefox/0.9
https://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9
https://dogfood.launchpad.net/~cprov/+archive/ppa
https://dogfood.launchpad.net/~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/lp/soyuz/model/distributionsourcepackagerelease.py
  lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
  lib/lp/soyuz/browser/distroseriessourcepackagerelease.py
  lib/lp/registry/browser/sourcepackage.py
  lib/lp/soyuz/templates/sourcepackagerelease-diffs.pt
  lib/lp/soyuz/stories/soyuz/xx-package-diff.txt
  lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt
  lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt
  lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-
extra.pt
  lib/lp/soyuz/templates/archive-index.pt
  lib/lp/soyuz/browser/distributionsourcepackagerelease.py
  lib/lp/soyuz/model/distroseriessourcepackagerelease.py
  lib/lp/soyuz/doc/package-meta-classes.txt
  lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt

== Pylint notices ==

lib/lp/soyuz/model/distributionsourcepackagerelease.py
    39: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

lib/lp/soyuz/model/distroseriessourcepackagerelease.py
    27: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

[Guilherme Salgado (salgado)]

The code looks good

review: Approve

[Barry Warsaw (barry)]

This page has incorrect headers:

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

all the others look fine. It should be easy to fix that one, so conditional on that I'll approve the ui.

review: Approve (ui*)

=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2009-09-15 05:26:07 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2009-09-18 12:18:51 +0000
@@ -72,7 +72,7 @@
     """Builds a breadcrumb for an `ISourcePackage`."""
     @property
     def text(self):
-        return smartquote('"%s" package') % (self.context.name)
+        return smartquote('"%s" source package') % (self.context.name)
 
 
 class SourcePackageFacets(QuestionTargetFacetMixin, StandardLaunchpadFacets):
@@ -161,7 +161,8 @@
     @property
     def page_title(self):
         """The HTML page title."""
-        return '%s package' % self.context.name
+        return smartquote('"%s" source package in %s') % (
+            self.context.name, self.context.distroseries.title)
 
     @property
     def cancel_url(self):

=== modified file 'lib/lp/soyuz/browser/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2009-09-09 14:35:04 +0000
+++ lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2009-09-18 12:18:51 +0000
@@ -23,6 +23,8 @@
     IDistributionSourcePackageRelease)
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 
+from canonical.lazr.utils import smartquote
+
 
 class DistributionSourcePackageReleaseNavigation(Navigation):
     usedfor = IDistributionSourcePackageRelease
@@ -45,8 +47,8 @@
     usedfor = IDistributionSourcePackageRelease
 
     @property
-    def page_title(self):
-        return self.context.title
+    def label(self):
+        return smartquote(self.context.title)
 
     @cachedproperty
     def _cached_publishing_history(self):

=== modified file 'lib/lp/soyuz/browser/distroseriessourcepackagerelease.py'
--- lib/lp/soyuz/browser/distroseriessourcepackagerelease.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/browser/distroseriessourcepackagerelease.py	2009-09-18 12:18:51 +0000
@@ -12,6 +12,7 @@
     IDistroSeriesSourcePackageRelease)
 from canonical.launchpad.webapp import (
     ApplicationMenu, Navigation, stepthrough)
+from canonical.lazr.utils import smartquote
 
 
 class DistroSeriesSourcePackageReleaseOverviewMenu(ApplicationMenu):
@@ -50,3 +51,6 @@
         self.context = context
         self.request = request
 
+    @property
+    def label(self):
+        return smartquote(self.context.title)

=== modified file 'lib/lp/soyuz/doc/package-meta-classes.txt'
--- lib/lp/soyuz/doc/package-meta-classes.txt	2009-07-23 17:49:31 +0000
+++ lib/lp/soyuz/doc/package-meta-classes.txt	2009-09-18 12:18:51 +0000
@@ -52,9 +52,11 @@
  >>> verifyObject(IDistroSeriesSourcePackageRelease, drspr)
  True
 
- >>> drspr.displayname
- u'pmount 0.1-1'
+ >>> print drspr.displayname
+ pmount 0.1-1
 
+ >>> print drspr.title
+ "pmount" 0.1-1 source package in The Hoary Hedgehog Release
 
 == Querying builds for DistributionSPR and DistroSeriesSPR ==
 

=== modified file 'lib/lp/soyuz/model/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/model/distributionsourcepackagerelease.py	2009-09-03 11:56:54 +0000
+++ lib/lp/soyuz/model/distributionsourcepackagerelease.py	2009-09-18 12:18:51 +0000
@@ -67,7 +67,7 @@
     @property
     def title(self):
         """See IDistributionSourcePackageRelease."""
-        return '%s %s (source) in %s' % (
+        return '"%s" %s source package in %s' % (
             self.name, self.version, self.distribution.displayname)
 
     @property

=== modified file 'lib/lp/soyuz/model/distroseriessourcepackagerelease.py'
--- lib/lp/soyuz/model/distroseriessourcepackagerelease.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/model/distroseriessourcepackagerelease.py	2009-09-18 12:18:51 +0000
@@ -58,9 +58,8 @@
     @property
     def title(self):
         """See `IDistroSeriesSourcePackageRelease`."""
-        return '%s %s (source) in %s %s' % (
-            self.name, self.version, self.distribution.name,
-            self.distroseries.name)
+        return '"%s" %s source package in %s' % (
+            self.name, self.version, self.distroseries.title)
 
     @property
     def version(self):

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2009-09-15 08:06:17 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2009-09-18 15:06:26 +0000
@@ -540,6 +540,7 @@
 
     >>> print extract_text(signing_key_section)
     Signing key: 1024D/12345678 (What is this?)
+    Fingerprint: ABCDEF0123456789ABCDDCBA0000111112345678
 
 The key fingerprint links to the actual key available in the ubuntu
 keyserver.

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt	2009-09-10 22:08:36 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt	2009-09-18 10:18:17 +0000
@@ -231,8 +231,9 @@
 `DistroSeriesBinaryPackage` page.
 
     >>> print extract_text(
-    ...     find_portlet(anon_browser.contents, 'Binary packages'))
-    Binary packages
+    ...     find_portlet(anon_browser.contents,
+    ...     'Binary packages built by this source'))
+    Binary packages built by this source
     foo-bin:
     No summary available for foo-bin in ubuntutest breezy-autotest.
     No description available for foo-bin in ubuntutest breezy-autotest.
@@ -263,7 +264,8 @@
 
     >>> anon_browser.reload()
     >>> print extract_text(
-    ...     find_portlet(anon_browser.contents, 'Binary packages'))
-    Binary packages
+    ...     find_portlet(anon_browser.contents,
+    ...     'Binary packages built by this source'))
+    Binary packages built by this source
     foo-bin: Foo app is great
     Well ... it does nothing, though

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-package-diff.txt'
--- lib/lp/soyuz/stories/soyuz/xx-package-diff.txt	2009-09-10 08:07:46 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-package-diff.txt	2009-09-18 11:12:22 +0000
@@ -139,7 +139,7 @@
     Pending in hoary-release
     ...
     Available diffs
-    1.0-2 to 1.0-3
+    1.0-2 to 1.0-3 (pending)
     ==============================
     1.0-2
     Pending in hoary-release
@@ -156,7 +156,9 @@
     >>> print anon_browser.getLink('1.0-1 to 1.0-2').url
     http://.../biscuit_1.0-1_1.0-2.diff.gz
 
-On the other hand, diffs not yet performed are rendered as plain text.
+On the other hand, diffs not yet performed are rendered as plain text,
+and "(pending)" is appended to the text as a further hint that it's not
+ready yet.
 
     >>> anon_browser.getLink('1.0-2 to 1.0-3')
     Traceback (most recent call last):
@@ -203,8 +205,12 @@
     >>> login('[e-mail]')
     >>> biscuit_ppa = name16.archive.getPublishedSources()[0]
     >>> biscuit_ppa_id = biscuit_ppa.id
+    >>> diff_three.date_fulfilled = None
+    >>> diff_three.status = PackageDiffStatus.PENDING
     >>> logout()
 
+The diff starts out as pending:
+
     >>> expander_url = anon_browser.getLink(
     ...     id='pub%s-expander' % biscuit_ppa_id).url
     >>> anon_browser.open(expander_url)
@@ -212,10 +218,25 @@
     Publishing details
     ...
     Available diffs
+      1.0-3 (in Ubuntu) to 1.0-4 (pending)
+    ...
+
+If we complete the diff, the text changes.
+
+    >>> login('[e-mail]')
+    >>> perform_fake_diff(diff_three, 'biscuit_1.0-3_1.0-4.diff.gz')
+    >>> transaction.commit()
+    >>> logout()
+
+    >>> anon_browser.open(expander_url)
+    >>> print extract_text(anon_browser.contents)
+    Publishing details
+    ...
+    Available diffs
       1.0-3 (in Ubuntu) to 1.0-4 (3 bytes)
     ...
 
-The text also link to the librarian file containing the diff.
+The text also links to the librarian file containing the diff.
 
     >>> print anon_browser.getLink(
     ...     '1.0-3 (in Ubuntu) to 1.0-4').url

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2009-09-17 11:35:39 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2009-09-18 15:06:26 +0000
@@ -113,6 +113,8 @@
               (<a href="/+help/soyuz/ppa-sources-list.html"
                   target="help">What is this?</a>)
             </dd>
+            <dt>Fingerprint:</dt>
+            <dd tal:content="signing_key/fingerprint"/>
           </dl>
           <div id="archive-dependencies"
                tal:condition="context/dependencies">

=== modified file 'lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt'
--- lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt	2009-09-09 21:17:10 +0000
+++ lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt	2009-09-18 12:18:51 +0000
@@ -9,10 +9,6 @@
 
 <body>
 
-<div metal:fill-slot="heading">
-  <h1 tal:content="view/page_title">foo-bar 1.0 (source) in ubuntu</h1>
-</div>
-
 <div metal:fill-slot="main">
 
   <div id="source-changelog" class="top-portlet">
@@ -170,7 +166,7 @@
   </div> <!-- source-files -->
 
   <div id="source-binaries" class="portlet">
-   <h2>Binary packages</h2>
+   <h2>Binary packages built by this source</h2>
    <div class="two-column-list">
      <dl tal:repeat="binary context/sample_binary_packages">
       <dt>

=== modified file 'lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt'
--- lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt	2009-09-07 11:40:40 +0000
+++ lib/lp/soyuz/templates/distroseriessourcepackagerelease-index.pt	2009-09-18 12:18:51 +0000
@@ -8,10 +8,6 @@
 >
   <body>
 
-<div metal:fill-slot="heading">
-  <h1 tal:content="context/title"/>
-</div>
-
 <div metal:fill-slot="main">
 
   <div class="top-portlet">

=== modified file 'lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-extra.pt'
--- lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-extra.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-extra.pt	2009-09-18 11:12:22 +0000
@@ -26,7 +26,7 @@
           <tal:pending condition="not: diff/date_fulfilled">
              <tal:pending-diff replace="diff/title">
                1.0 (in Ubuntu) to 1.1
-             </tal:pending-diff>
+             </tal:pending-diff> (pending)
           </tal:pending>
           <tal:fulfilled condition="diff/date_fulfilled">
              <a tal:attributes="href diff/diff_content/http_url"

=== modified file 'lib/lp/soyuz/templates/sourcepackagerelease-diffs.pt'
--- lib/lp/soyuz/templates/sourcepackagerelease-diffs.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/sourcepackagerelease-diffs.pt	2009-09-18 11:12:22 +0000
@@ -15,7 +15,7 @@
           <tal:pending condition="not: diff/date_fulfilled">
              <tal:pending-diff replace="diff/title">
                1.0 (in Ubuntu) to 1.1
-             </tal:pending-diff>
+             </tal:pending-diff> (pending)
           </tal:pending>
           <tal:fulfilled condition="diff/date_fulfilled">
              <a tal:attributes="href diff/diff_content/http_url"