Merge lp:~michael.nelson/launchpad/434000-copy-archive-ui into lp:launchpad

Proposed by Michael Nelson
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~michael.nelson/launchpad/434000-copy-archive-ui
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~michael.nelson/launchpad/434000-copy-archive-ui
Reviewer Review Type Date Requested Status
Barry Warsaw (community) ui* Approve
Brad Crittenden (community) release-critical Approve
Aaron Bentley (community) Approve
Review via email: mp+12164@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

= Summary =

When we updated the archive index for the ppa page, the distribution
copy archive page was also updated - it had some performance issues
which were only just fixed, exposing an ugly ui issue.

http://people.canonical.com/~michaeln/tmp/before-copy-archive.png

This branch updates the page to look like:

http://people.canonical.com/~michaeln/tmp/after-copy-archive.png

== Proposed fix ==

Simply omit the yui-gc (2/3 - 1/3) column layout for copy archives.

This leaves the page readable. But we'll require further ui work -
possibly a separate template for copy-archive indexes - during a later
cycle.

== Pre-implementation notes ==

== Implementation details ==

== Tests ==
bin/test -vv -t stories/ppa -t stories/soyuz

== Demo and Q/A ==
To demo locally, in a harness do:

{{{
ubuntu = getUtility(IDistributionSet)['ubuntu']
loc = factory.makeCopyArchiveLocation(distribution=ubuntu)

cprov = getUtility(IPersonSet).getByName('cprov')
ppa = cprov.archive
req = ppa.requestPackageCopy(loc, cprov)
import transaction;transaction.commit()
}}}

For QA, view:
https://edge.launchpad.net/ubuntu/+archive/test-rebuild-20090909

= 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/archive-macros.pt
  lib/lp/soyuz/templates/archive-index.pt

--
Michael

Revision history for this message
Aaron Bentley (abentley) :
review: Approve
Revision history for this message
Michael Nelson (michael.nelson) wrote :

BTW: the related bug is bug 434000

Revision history for this message
Brad Crittenden (bac) :
review: Approve (release-critical)
Revision history for this message
Barry Warsaw (barry) wrote :

Nice fix, thanks!

review: Approve (ui*)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt 2009-09-18 15:06:26 +0000
+++ lib/lp/soyuz/templates/archive-index.pt 2009-09-21 14:45:36 +0000
@@ -38,7 +38,7 @@
38 <metal:ppa-install38 <metal:ppa-install
39 use-macro="template/macros/ppa-upload-hint-portlet" />39 use-macro="template/macros/ppa-upload-hint-portlet" />
4040
41 <div class="yui-gc">41 <div class="yui-gc" tal:omit-tag="context/is_copy">
4242
43 <div class="yui-u first">43 <div class="yui-u first">
44 <tal:ppa-install tal:condition="context/is_ppa">44 <tal:ppa-install tal:condition="context/is_ppa">
@@ -55,14 +55,11 @@
55 <metal:ppa-statistics-portlet55 <metal:ppa-statistics-portlet
56 use-macro="template/macros/ppa-statistics-portlet" />56 use-macro="template/macros/ppa-statistics-portlet" />
57 </div>57 </div>
58
59 <metal:ppa-simplified-packages-portlet
60 use-macro="template/macros/ppa-simplified-packages-portlet" />
61
62 </div><!-- yui-gc -->58 </div><!-- yui-gc -->
6359
6460 <metal:ppa-simplified-packages-portlet
65 </tal:main>61 use-macro="template/macros/ppa-simplified-packages-portlet" />
62 </tal:main>
6663
67 <tal:side metal:fill-slot="side">64 <tal:side metal:fill-slot="side">
68 <tal:menu replace="structure view/@@+global-actions" />65 <tal:menu replace="structure view/@@+global-actions" />
6966
=== modified file 'lib/lp/soyuz/templates/archive-macros.pt'
--- lib/lp/soyuz/templates/archive-macros.pt 2009-09-10 19:03:13 +0000
+++ lib/lp/soyuz/templates/archive-macros.pt 2009-09-21 14:45:36 +0000
@@ -219,7 +219,7 @@
219 </p>219 </p>
220220
221 <tal:request_list tal:condition="requests">221 <tal:request_list tal:condition="requests">
222 <table id="package-requests"222 <table id="package-requests" class="listing"
223 tal:attributes="summary223 tal:attributes="summary
224 string:Package copy requests for ${context/name}">224 string:Package copy requests for ${context/name}">
225 <thead>225 <thead>