Merge lp:~cprov/launchpad/bug-417159-build-ui-tweaks into lp:launchpad

[Celso Providelo]

[Celso Providelo (cprov)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

= Summary =

This branch fixes 2 trivial UI bugs in Build:+index:

https://bugs.edge.launchpad.net/bugs/417159
https://bugs.edge.launchpad.net/bugs/416365

The first issues was fixes by moving the binary-packages and the binary-files sections to separate rows, it should mitigate the issue with long filenames.

The second issue is easier, we now include a label for the 'retry' action.

== Tests ==

./bin/test -vv -t stories.ppa -t stories.soyuz

== Demo and Q/A ==

https://launchpad.dev/~cprov/+archive/ppa/+build/27

https://launchpad.dev/~cprov/+archive/ppa/+build/26 (logged in as cprov or foo.bar)

= 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/templates/build-index.pt
  lib/lp/soyuz/browser/build.py
  lib/lp/soyuz/stories/soyuz/xx-build-record.txt
  lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkquX/EACgkQ7KBXuXyZSjDqwgCfRhP+sYl6DP1a9uGsPvGJez+r
NwIAoKhO4EvLnlW3PQZmQ2AZvKF6YEhB
=xiy1
-----END PGP SIGNATURE-----

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2009-08-18 17:52:41 +0000
+++ lib/lp/soyuz/browser/build.py	2009-09-14 14:40:18 +0000
@@ -106,7 +106,7 @@
     @enabled_with_permission('launchpad.Edit')
     def retry(self):
         """Only enabled for build records that are active."""
-        text = 'Retry build'
+        text = 'Retry this build'
         return Link(
             '+retry', text, icon='retry',
             enabled=self.context.can_be_retried)
 
=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt	2009-09-12 06:49:56 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt	2009-09-14 14:40:18 +0000
@@ -395,7 +395,7 @@
     ...     "http://launchpad.dev/~cprov/+archive/ppa/+packages")
 
     >>> cprov_browser.getLink('i386').click()
-    >>> cprov_browser.getLink("Retry build").click()
+    >>> cprov_browser.getLink("Retry this build").click()
     >>> cprov_browser.getControl("Retry Build").click()
 
 At this point anyone can also visualise that 'cdrkit' source is being
 
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2009-09-10 20:12:12 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2009-09-14 14:40:18 +0000
@@ -207,19 +207,19 @@
     >>> print extract_text(
     ...     find_tag_by_id(admin_browser.contents, 'status'))
     Build status
-    Failed to upload Retry build on Bob The Builder
+    Failed to upload on Bob The Builder Retry this build
     Started ... ago
     Finished ... (took 1 minute, 0.0 seconds)
     buildlog (7 bytes)
     uploadlog (7 bytes)
 
-    >>> print admin_browser.getLink('Retry build').url
+    >>> print admin_browser.getLink('Retry this build').url
     http://launchpad.dev/ubuntutest/+source/testing/1.0/+build/31/+retry
 
-By clicking on the 'Retry build' link, administrators are informed of
+By clicking on the 'Retry this build' link, administrators are informed of
 the consequences of this action.
 
-    >>> admin_browser.getLink('Retry build').click()
+    >>> admin_browser.getLink('Retry this build').click()
     >>> print extract_text(find_main_content(admin_browser.contents))
     Retry i386 build of testing 1.0 in ubuntutest breezy-autotest RELEASE
     ...
@@ -238,7 +238,7 @@
     >>> print extract_text(
     ...     find_tag_by_id(admin_browser.contents, 'status'))
     Build status
-    Failed to upload Retry build on Bob The Builder
+    Failed to upload on Bob The Builder Retry this build
     Started ... ago
     Finished ... (took 1 minute, 0.0 seconds)
     buildlog (7 bytes)
@@ -248,7 +248,7 @@
 performed, but then the failed build will be pending again and
 retrying the build is not a possibility anymore.
 
-    >>> admin_browser.getLink("Retry build").click()
+    >>> admin_browser.getLink("Retry this build").click()
     >>> admin_browser.getControl("Retry Build").click()
     >>> for text in get_feedback_messages(admin_browser.contents):
     ...     print text
@@ -259,7 +259,7 @@
     Needs building
     Start in ... (0) Rescore build What's this?
 
-    >>> admin_browser.getLink("Retry build").click()
+    >>> admin_browser.getLink("Retry this build").click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError
 
=== modified file 'lib/lp/soyuz/templates/build-index.pt'
--- lib/lp/soyuz/templates/build-index.pt	2009-08-19 15:12:29 +0000
+++ lib/lp/soyuz/templates/build-index.pt	2009-09-14 14:40:18 +0000
@@ -42,24 +42,16 @@
 
       </div> <!-- yui-g  -->
 
-      <div class="yui-g">
-
-        <div id="binaries" class="yui-u first"
-             tal:define="uploaded view/has_done_upload;"
-             tal:condition="context/binarypackages">
-          <div class="portlet">
-            <div metal:use-macro="template/macros/binaries" />
-          </div>
-        </div>
-
-        <div id="files" class="yui-u"
-             tal:condition="context/binarypackages">
-          <div class="portlet">
-            <div metal:use-macro="template/macros/files" />
-          </div>
-        </div>
-
-      </div> <!-- yui-g  -->
+      <div id="binaries" class="portlet"
+           tal:define="uploaded view/has_done_upload;"
+           tal:condition="context/binarypackages">
+        <div metal:use-macro="template/macros/binaries" />
+      </div>
+
+      <div id="files" class="portlet"
+           tal:condition="context/binarypackages">
+        <div metal:use-macro="template/macros/files" />
+      </div>
 
       <div id="buildlog" class="portlet"
            tal:condition="context/buildstate/enumvalue:BUILDING">
@@ -141,10 +133,6 @@
       <span tal:attributes="
             class string:buildstatus${context/buildstate/name};"
             tal:content="context/buildstate/title">Fully built</span>
-      <tal:retry
-        define="link context/menu:context/retry"
-        condition="link/enabled"
-        replace="structure link/fmt:icon" />
       <tal:building condition="context/buildstate/enumvalue:BUILDING">
         on <a tal:content="view/buildqueue/builder/title"
               tal:attributes="href view/buildqueue/builder/fmt:url"/>
@@ -153,6 +141,9 @@
         on <a tal:content="context/builder/title"
               tal:attributes="href context/builder/fmt:url"/>
       </tal:built>
+      <tal:retry define="link context/menu:context/retry"
+                 condition="link/enabled"
+                 replace="structure link/fmt:link" />
     </p>
 
     <ul>