Launchpad itself

Merge lp://staging/~julian-edwards/launchpad/mechanical-30-ui-changes-3 into lp://staging/launchpad

  1. mechanical-30-ui-changes-3
  2. Merge into devel
Proposed by Julian Edwards
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~julian-edwards/launchpad/mechanical-30-ui-changes-3
Merge into: lp://staging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~julian-edwards/launchpad/mechanical-30-ui-changes-3
Reviewer Review Type Date Requested Status
Michael Nelson (community) ui Approve
Edwin Grubbs (community) Approve
Review via email: mp+10038@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

= Summary =
More 3.0 mechanical template conversions

== Implementation details ==
Two more templates dealt with:
 * distribution-archive-list.pt converted to 3.0 format.
 * binarypackagerelease-index.pt removed! It's not linked from anywhere and
is a page that is only traversed to from the build. The
distroarchseriesbinarypackagerelease page has the real data for built packages
on it.

= 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/browser/configure.zcml
  lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt
  lib/lp/soyuz/templates/distribution-archive-list.pt

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Hi Julian,

This branch looks good. Since I'm a non-graduated UI reviewer, it will need a second UI review.

merge-approved*

To the next UI reviewer, you can populate https://launchpad.dev/ubuntu/+archives with data by running this script.

./scripts/populate-archive.py -s hoary -a 386 --to-archive=test-rebuild --to-user=cprov --reason='zoing'

-Edwin

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

On Wednesday 12 August 2009 21:41:24 Edwin Grubbs wrote:>
> ./scripts/populate-archive.py -s hoary -a 386 --to-archive=test-rebuild
> --to-user=cprov --reason='zoing'

Argh, I should have given you that in the MP! Sorry.

And thanks for the review!

Revision history for this message
Michael Nelson (michael.nelson) wrote :

> On Wednesday 12 August 2009 21:41:24 Edwin Grubbs wrote:>
> > ./scripts/populate-archive.py -s hoary -a 386 --to-archive=test-rebuild
> > --to-user=cprov --reason='zoing'
>
> Argh, I should have given you that in the MP! Sorry.

Even easier would be to do a quick screenshot and link it to the MP :)

OK, it's a straight-forward update which is nice for a change! :) The only thing that looks strange is the table being hard-up against the footer. I think you'll find that if you wrap your content in a div with class "top-portlet" that you will then have a space between the bottom of the table and the footer.

So with that change ui=me, although, afaik I haven't graduated either, but I've been landing things like this with "...[ui=rs] UI review by intellectronica. Blah blah".

review: Approve (ui)
Revision history for this message
Julian Edwards (julian-edwards) wrote :

On Thursday 13 August 2009 14:16:38 Michael Nelson wrote:
> Review: Approve ui
>
> > On Wednesday 12 August 2009 21:41:24 Edwin Grubbs wrote:>
> >
> > > ./scripts/populate-archive.py -s hoary -a 386 --to-archive=test-rebuild
> > > --to-user=cprov --reason='zoing'
> >
> > Argh, I should have given you that in the MP! Sorry.
>
> Even easier would be to do a quick screenshot and link it to the MP :)

Possibly, but generally I like to let people play with things themselves, they
can sometimes notice problems that are not apparent in the screenshot.

>
> OK, it's a straight-forward update which is nice for a change! :) The only
> thing that looks strange is the table being hard-up against the footer. I
> think you'll find that if you wrap your content in a div with class
> "top-portlet" that you will then have a space between the bottom of the
> table and the footer.

Did the trick, thanks!

> So with that change ui=me, although, afaik I haven't graduated either, but
> I've been landing things like this with "...[ui=rs] UI review by
> intellectronica. Blah blah".

Our current policy is that two non-graduated UI reviewers suffice, until we
get more graduations.

Cheers!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/browser/configure.zcml'
2--- lib/lp/soyuz/browser/configure.zcml 2009-08-11 14:45:46 +0000
3+++ lib/lp/soyuz/browser/configure.zcml 2009-08-12 14:51:49 +0000
4@@ -33,13 +33,6 @@
5 attribute_to_parent="archive"
6 urldata="lp.soyuz.browser.publishing.BinaryPublicationURL"/>
7 </facet>
8- <browser:url
9- for="lp.soyuz.interfaces.binarypackagerelease.IBinaryPackageRelease"
10- path_expression="name"
11- attribute_to_parent="build"/>
12- <browser:defaultView
13- for="lp.soyuz.interfaces.binarypackagerelease.IBinaryPackageRelease"
14- name="+index"/>
15 <browser:navigation
16 module="lp.soyuz.browser.binarypackagerelease"
17 classes="
18@@ -50,9 +43,6 @@
19 facet="overview"
20 permission="zope.Public">
21 <browser:page
22- name="+index"
23- template="../templates/binarypackagerelease-index.pt"/>
24- <browser:page
25 name="+portlet-details"
26 template="../templates/binarypackagerelease-portlet-details.pt"/>
27 <browser:page
28
29=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt'
30--- lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt 2009-07-31 02:45:01 +0000
31+++ lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt 2009-08-12 13:00:09 +0000
32@@ -51,8 +51,6 @@
33
34 >>> main_content = find_main_content(anon_browser.contents)
35 >>> print extract_text(main_content)
36- Details...
37- ...
38 Copy Archives related to Ubuntu Linux
39 'Copy' archives containing packages copied from other archives
40 (the main archive or PPAs) for a distribution.
41
42=== removed file 'lib/lp/soyuz/templates/binarypackagerelease-index.pt'
43--- lib/lp/soyuz/templates/binarypackagerelease-index.pt 2009-07-17 17:59:07 +0000
44+++ lib/lp/soyuz/templates/binarypackagerelease-index.pt 1970-01-01 00:00:00 +0000
45@@ -1,109 +0,0 @@
46-<html
47- xmlns="http://www.w3.org/1999/xhtml"
48- xmlns:tal="http://xml.zope.org/namespaces/tal"
49- xmlns:metal="http://xml.zope.org/namespaces/metal"
50- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
51- xml:lang="en"
52- lang="en"
53- dir="ltr"
54- metal:use-macro="context/@@main_template/master"
55- i18n:domain="launchpad"
56->
57- <body>
58- <metal:heading fill-slot="pageheading">
59- <h1 tal:content="context/summary">Package summary</h1>
60- </metal:heading>
61-
62- <metal:leftportlets fill-slot="portlets_one">
63- <div tal:replace="structure context/@@+portlet-details" />
64- </metal:leftportlets>
65-
66- <tal:XXX condition="nothing">
67- # XXX: matsubara 2006-02-13 bug=31342
68- # The main template is broken when there is no actions portlet -->
69- </tal:XXX>
70- <metal:rightportlets fill-slot="portlets_two">
71- <div>&nbsp;</div>
72- </metal:rightportlets>
73-
74- <div metal:fill-slot="main">
75-
76- <p class="highlighted" tal:content="context/description" />
77-
78- <b>Source package:</b>
79- <a tal:define="spackage context/distributionsourcepackagerelease"
80- tal:content="spackage/name"
81- tal:attributes="href spackage/fmt:url">
82- SOURCEPACKAGE</a><br />
83-
84- <b>Download:</b>
85- <ul tal:condition="context/files">
86- <li class="download" tal:repeat="file context/files">
87- <a tal:content="file/libraryfile/filename"
88- tal:attributes="href file/libraryfile/http_url"></a>
89- (<span tal:replace="file/libraryfile/content/filesize/fmt:bytes" />)
90- </li>
91- </ul>
92- <p tal:condition="not: context/files">
93- No files for this binary package.
94- </p>
95-
96- <h2>Relationship to other packages</h2>
97-
98- <table>
99- <tbody>
100- <tr id="provides" tal:define="relationships view/provides"
101- tal:condition="relationships/has_items">
102- <th><label>Provides:</label></th>
103- <td>
104- <tal:block replace="structure relationships/@@+render-list"/>
105- </td>
106- </tr>
107-
108- <tr id="depends" tal:define="relationships view/depends"
109- tal:condition="relationships/has_items">
110- <th><label>Depends on:</label></th>
111- <td>
112- <tal:block replace="structure relationships/@@+render-list"/>
113- </td>
114- </tr>
115-
116- <tr id="recommends" tal:define="relationships view/recommends"
117- tal:condition="relationships/has_items">
118- <th><label>Recommends:</label></th>
119- <td>
120- <tal:block replace="structure relationships/@@+render-list"/>
121- </td>
122- </tr>
123-
124- <tr id="suggests" tal:define="relationships view/suggests"
125- tal:condition="relationships/has_items">
126- <th><label>Suggests:</label></th>
127- <td>
128- <tal:block replace="structure relationships/@@+render-list"/>
129- </td>
130- </tr>
131-
132- <tr id="conflicts" tal:define="relationships view/conflicts"
133- tal:condition="relationships/has_items">
134- <th><label>Conflicts with:</label></th>
135- <td>
136- <tal:block replace="structure relationships/@@+render-list"/>
137- </td>
138- </tr>
139-
140- <tr id="replaces" tal:define="relationships view/replaces"
141- tal:condition="relationships/has_items">
142- <th><label>Replaces:</label></th>
143- <td>
144- <tal:block replace="structure relationships/@@+render-list"/>
145- </td>
146- </tr>
147-
148- </tbody>
149- </table>
150-
151- </div>
152- </body>
153-</html>
154-<!-- 1-0 todo Where is this used? -->
155
156=== modified file 'lib/lp/soyuz/templates/distribution-archive-list.pt'
157--- lib/lp/soyuz/templates/distribution-archive-list.pt 2009-07-17 17:59:07 +0000
158+++ lib/lp/soyuz/templates/distribution-archive-list.pt 2009-08-12 13:00:09 +0000
159@@ -3,18 +3,17 @@
160 xmlns:tal="http://xml.zope.org/namespaces/tal"
161 xmlns:metal="http://xml.zope.org/namespaces/metal"
162 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
163- xml:lang="en"
164- lang="en"
165- dir="ltr"
166- metal:use-macro="view/macro:page/onecolumn"
167+ metal:use-macro="view/macro:page/main_only"
168 i18n:domain="launchpad"
169 >
170 <body>
171
172+ <div metal:fill-slot="heading">
173+ <h1>Copy Archives related to <tal:title replace="context/title" /></h1>
174+ </div>
175+
176 <div metal:fill-slot="main">
177
178- <h1>Copy Archives related to <tal:title replace="context/title" /></h1>
179-
180 <p>'Copy' archives containing packages copied from other archives (the
181 main archive or PPAs) for a distribution.
182 </p>
183@@ -55,7 +54,7 @@
184 </tbody>
185 </table>
186
187- <tal:navigation_bottom
188+ <tal:navigation_bottom
189 replace="structure view/batchnav/@@+navigation-links-lower" />
190
191 <div id="empty-result" tal:condition="not: batch">