Launchpad itself

Merge lp:~sinzui/launchpad/source-package-ui into lp:launchpad

  1. source-package-ui
  2. Merge into devel
Proposed by Curtis Hovey
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~sinzui/launchpad/source-package-ui
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~sinzui/launchpad/source-package-ui
Reviewer Review Type Date Requested Status
Aaron Bentley (community) code Approve
Martin Albisetti (community) ui Approve
Review via email: mp+11718@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :
Download full text (3.4 KiB)

This is my branch to update the last source package pages to UI 3.0.

    lp:~sinzui/launchpad/source-package-ui
    Diff size: 651
    Launchpad bug: https://bugs.launchpad.net/bugs/429020
    Test command: ./bin/test -vv \
        -t question-add.txt \
        -t xx-sourcepackage-packaging.txt \
        -t xx-distroseries-sources
    Pre-implementation: no one
    Target release: 3.1.0

= Update the last source package pages to UI 3.0 =

sourcepackage-gethelp.pt
    * Move the template to answers. Update it to 3.0.

sourcepackage-packaging.pt
    * Linkify the items in the table so that the portlets are not needed.
    * Update the page to UI 3.0

sourcepackage-index.pt
    * Move the details portlet to the top of the first column, Move Upstream
      associations to the top right column.
    * Move Releases in Ubuntu and Upstream release series inline.
    * Move Changelog, Show builds, and Show upstream links into content
    * Change upstream link and Set upstream link are identical; merge them.
    * I considered the moving the download files to the side portlets, but
      their purpose is not really for users, be developers, so I think they
      belong on the content.

== QA ==

Compare
    http://people.canonical.com/~curtis/sourcepackage.png
With
    https://edge.launchpad.net/ubuntu/karmic/+source/alsa-utils

== Lint ==

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/lp/answers/stories/question-add.txt
  lib/lp/answers/templates/sourcepackage-gethelp.pt
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/sourcepackage.py
  lib/lp/registry/templates/sourcepackage-index.pt
  lib/lp/registry/templates/sourcepackage-packaging.pt
  lib/lp/registry/templates/sourcepackage-portlet-details.pt
  lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt

== Test ==

    * lib/lp/answers/stories/question-add.txt
      * Added a test to verify that the breadcrumb shows up in the page title.
        This is a known issue that Salgado has a fix for. It is out of scope
        for this branch.
      * Updated test to show the page uses the standard link.
    * lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt
      * Updated brittle test.

== Implementation ==

    * lib/canonical/launchpad/pagetitles.py
      * Removed unused page titles.
    * lib/lp/answers/templates/sourcepackage-gethelp.pt
      * Moved page to answers.
      * Updated the page to 3.0
      * Switched to standard links.
    * lib/lp/registry/browser/configure.zcml
      * Updated config to use the template from the lp/ansers
      * Registered +packaging as its own view.
    * lib/lp/registry/browser/sourcepackage.py
      * Added SourcePackageHelpView and SourcePackagePackaging to provide
        unique heading and titles to the pages.
    * lib/lp/registry/templates/sourcepackage-index.pt
      * Moved a lot of content around, and changed a many <ul> in <dl>.
        But as you can see from the one test change, the content has not
        changed at all. If the one test was not checking markup, there would
        have been no failures.
      * See the picture if you do not want to run the server.
    * lib/lp/registry/template...

Read more...

Revision history for this message
Martin Albisetti (beuno) wrote :

For a mechanical change, this looks great.
It needs the h1, and there are a few comments on IRC that would be great to have.

review: Approve (ui)
Revision history for this message
Aaron Bentley (abentley) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/pagetitles.py'
2--- lib/canonical/launchpad/pagetitles.py 2009-09-14 15:16:12 +0000
3+++ lib/canonical/launchpad/pagetitles.py 2009-09-14 18:06:44 +0000
4@@ -904,14 +904,6 @@
5
6 sourcepackage_filebug = ContextTitle("Report a bug about %s")
7
8-sourcepackage_gethelp = ContextTitle('Help and support options for %s')
9-
10-sourcepackage_packaging = ContextTitle('%s upstream links')
11-
12-def sourcepackage_index(context, view):
13- """Return the page title for a source package in a distroseries."""
14- return '%s source packages' % context.distroseries.title
15-
16 sourcepackage_translate = ContextTitle('Help translate %s')
17
18 sourcepackagenames_index = 'Source package name set'
19
20=== modified file 'lib/lp/answers/stories/question-add.txt'
21--- lib/lp/answers/stories/question-add.txt 2009-09-09 06:37:22 +0000
22+++ lib/lp/answers/stories/question-add.txt 2009-09-13 20:51:35 +0000
23@@ -32,8 +32,9 @@
24 ... 'http://launchpad.dev/ubuntu/hoary/'
25 ... '+sources/mozilla-firefox/+gethelp')
26 >>> user_browser.title
27- 'Help and support options for ...mozilla-firefox...'
28- >>> user_browser.getLink('Submit your question').click()
29+ '+gethelp : ...mozilla-firefox... package : 5.04 : Ubuntu'
30+
31+ >>> user_browser.getLink('Ask a question').click()
32 >>> user_browser.title
33 '+addquestion : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package
34 : 5.04 : Ubuntu'
35
36=== renamed file 'lib/lp/registry/templates/sourcepackage-gethelp.pt' => 'lib/lp/answers/templates/sourcepackage-gethelp.pt'
37--- lib/lp/registry/templates/sourcepackage-gethelp.pt 2009-07-17 17:59:07 +0000
38+++ lib/lp/answers/templates/sourcepackage-gethelp.pt 2009-09-13 20:51:35 +0000
39@@ -3,10 +3,7 @@
40 xmlns:tal="http://xml.zope.org/namespaces/tal"
41 xmlns:metal="http://xml.zope.org/namespaces/metal"
42 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
43- xml:lang="en"
44- lang="en"
45- dir="ltr"
46- metal:use-macro="context/@@main_template/master"
47+ metal:use-macro="view/macro:page/main_only"
48 i18n:domain="launchpad"
49 >
50
51@@ -14,10 +11,9 @@
52
53 <div metal:fill-slot="main">
54
55- <h1>Help for <span
56- tal:replace="context/displayname" /> </h1>
57-
58-
59+ <h1 tal:content="view/page_title" />
60+
61+ <div class="top-portlet">
62 <h2>Ask your question!</h2>
63
64 <p>
65@@ -26,13 +22,15 @@
66 modules/canonical.launchpad.webapp.vhosts/allvhosts/configs/answers/rooturl">Launchpad
67 answer</a> tracker.
68 </p>
69- <ul>
70- <li><a tal:attributes="href
71- string:${context/fmt:url}/+questions">Search through existing questions</a></li>
72- <li><a tal:attributes="href
73- string:${context/fmt:url}/+addquestion">Submit your question</a></li>
74+ <ul class="horizontal">
75+ <li><a class="sprite info"
76+ tal:attributes="href
77+ string:${context/fmt:url}/+questions">Search through existing questions</a></li>
78+ <li><a tal:replace="structure context/menu:answers/new/fmt:link" /></li>
79 </ul>
80+ </div>
81
82+ <div>
83 <h2>Other support options</h2>
84
85 <p>
86@@ -63,7 +61,7 @@
87 Thanks!
88 </p>
89 </tal:needupstream>
90-
91+ </div>
92 </div>
93 </body>
94 </html>
95
96=== modified file 'lib/lp/registry/browser/configure.zcml'
97--- lib/lp/registry/browser/configure.zcml 2009-09-14 15:16:12 +0000
98+++ lib/lp/registry/browser/configure.zcml 2009-09-14 18:06:44 +0000
99@@ -1994,20 +1994,26 @@
100 name="+index"
101 facet="overview"
102 template="../templates/sourcepackage-index.pt"/>
103- <browser:page
104- name="+gethelp"
105- facet="answers"
106- template="../templates/sourcepackage-gethelp.pt"/>
107- <browser:page
108- name="+packaging"
109- facet="overview"
110- template="../templates/sourcepackage-packaging.pt"/>
111 <!-- SourcePackage Portlets -->
112 <browser:page
113 name="+portlet-details"
114 facet="overview"
115 template="../templates/sourcepackage-portlet-details.pt"/>
116 </browser:pages>
117+ <browser:page
118+ for="lp.registry.interfaces.sourcepackage.ISourcePackage"
119+ permission="zope.Public"
120+ class="lp.registry.browser.sourcepackage.SourcePackagePackaging"
121+ name="+packaging"
122+ facet="overview"
123+ template="../templates/sourcepackage-packaging.pt"/>
124+ <browser:page
125+ for="lp.registry.interfaces.sourcepackage.ISourcePackage"
126+ permission="zope.Public"
127+ class="lp.registry.browser.sourcepackage.SourcePackageHelpView"
128+ name="+gethelp"
129+ facet="answers"
130+ template="../../answers/templates/sourcepackage-gethelp.pt"/>
131 <browser:menus
132 classes="
133 SourcePackageFacets
134
135=== modified file 'lib/lp/registry/browser/sourcepackage.py'
136--- lib/lp/registry/browser/sourcepackage.py 2009-09-04 12:32:58 +0000
137+++ lib/lp/registry/browser/sourcepackage.py 2009-09-14 04:24:20 +0000
138@@ -9,7 +9,9 @@
139 'SourcePackageBreadcrumb',
140 'SourcePackageChangeUpstreamView',
141 'SourcePackageFacets',
142+ 'SourcePackageHelpView',
143 'SourcePackageNavigation',
144+ 'SourcePackagePackaging',
145 'SourcePackageView',
146 ]
147
148@@ -157,6 +159,11 @@
149 self.processForm()
150
151 @property
152+ def page_title(self):
153+ """The HTML page title."""
154+ return '%s package' % self.context.name
155+
156+ @property
157 def cancel_url(self):
158 return canonical_url(self.context)
159
160@@ -245,3 +252,21 @@
161 @property
162 def potemplates(self):
163 return list(self.context.getCurrentTranslationTemplates())
164+
165+
166+class SourcePackagePackaging:
167+ """A View to show where the package is packged."""
168+
169+ @property
170+ def page_title(self):
171+ """The HTML page title."""
172+ return 'Upstream links'
173+
174+
175+class SourcePackageHelpView:
176+ """A View to show Answers help."""
177+
178+ @property
179+ def page_title(self):
180+ """The HTML page title."""
181+ return 'Help and support options'
182
183=== modified file 'lib/lp/registry/templates/sourcepackage-index.pt'
184--- lib/lp/registry/templates/sourcepackage-index.pt 2009-08-07 22:14:06 +0000
185+++ lib/lp/registry/templates/sourcepackage-index.pt 2009-09-14 04:24:20 +0000
186@@ -3,148 +3,180 @@
187 xmlns:tal="http://xml.zope.org/namespaces/tal"
188 xmlns:metal="http://xml.zope.org/namespaces/metal"
189 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
190- xml:lang="en"
191- lang="en"
192- dir="ltr"
193- metal:use-macro="context/@@main_template/master"
194- i18n:domain="launchpad"
195->
196+ metal:use-macro="view/macro:page/main_only"
197+ i18n:domain="launchpad">
198 <body>
199- <metal:heading fill-slot="pageheading">
200- <h1 tal:content="context/title">source package name</h1>
201- </metal:heading>
202-
203- <metal:leftportlets fill-slot="portlets_one">
204- <div tal:replace="structure context/@@+portlet-details" />
205- </metal:leftportlets>
206-
207- <metal:rightportlets fill-slot="portlets_two">
208- <div tal:replace="structure context/@@+portlet-releases" />
209- <div tal:replace="structure context/@@+portlet-upstream" />
210- </metal:rightportlets>
211-
212-<div metal:fill-slot="main">
213-
214- <h2>Versions published</h2>
215-
216- <p class="warning message" tal:condition="not:context/currentrelease">
217- There is no current release of this source package
218- in <span tal:replace="context/distroseries/title" />.
219- You can still report bugs, make translations, and so on,
220- but they might not be used until the package is published.
221- </p>
222-
223- <dl id="publishing_history" tal:condition="view/published_by_pocket">
224- <tal:block repeat="pocket view/published_by_pocket">
225- <tal:block condition="pocket/packages">
226- <dt><dfn tal:content="pocket/pocketdetails/title">Plain</dfn></dt>
227- <dd>
228- <p tal:content="pocket/pocketdetails/description">
229- The description of the pocket.
230- </p>
231- <ul>
232- <li tal:repeat="spr pocket/packages">
233- <a tal:content="spr/displayname"
234- tal:attributes="href spr/fmt:url">apache2</a>
235+ <div metal:fill-slot="main">
236+ <div class="top-portlet">
237+ <h2>Versions published</h2>
238+
239+ <p class="warning message" tal:condition="not:context/currentrelease">
240+ There is no current release of this source package
241+ in <span tal:replace="context/distroseries/title" />.
242+ You can still report bugs, make translations, and so on,
243+ but they might not be used until the package is published.
244+ </p>
245+
246+ <dl id="publishing_history" tal:condition="view/published_by_pocket">
247+ <tal:block repeat="pocket view/published_by_pocket">
248+ <tal:block condition="pocket/packages">
249+ <dt><dfn tal:content="pocket/pocketdetails/title">Plain</dfn></dt>
250+ <dd>
251+ <p tal:content="pocket/pocketdetails/description">
252+ The description of the pocket.
253+ </p>
254+ <ul>
255+ <li tal:repeat="spr pocket/packages">
256+ <a tal:content="spr/displayname"
257+ tal:attributes="href spr/fmt:url">apache2</a>
258+ </li>
259+ </ul>
260+ </dd>
261+ </tal:block>
262+ </tal:block>
263+ </dl>
264+
265+ <ul class="horizontal">
266+ <li>
267+ <a tal:replace="structure context/menu:overview/changelog/fmt:link" />
268+ </li>
269+ </ul>
270+ </div>
271+
272+ <div class="yui-g">
273+ <div class="yui-u first">
274+ <div tal:replace="structure context/@@+portlet-details" />
275+ </div>
276+
277+ <div class="yui-u">
278+ <div class="portlet">
279+ <h2>Upstream associations</h2>
280+
281+ <div id="upstreams" class="two-column-list"
282+ tal:define="series context/productseries">
283+ <tal:has_series condition="series">
284+ <dl
285+ tal:define="project series/product/project"
286+ tal:condition="project">
287+ <dt>Project Group:</dt>
288+ <dd>
289+ <a tal:replace="structure project/fmt:link" />
290+ </dd>
291+ </dl>
292+
293+ <dl>
294+ <dt>Project:</dt>
295+ <dd>
296+ <a tal:replace="structure series/product/fmt:link" />
297+ </dd>
298+ </dl>
299+
300+ <dl>
301+ <dt>Branch:</dt>
302+ <dd>
303+ <a
304+ tal:content="series/name"
305+ tal:attributes="href series/fmt:url">Series</a>
306+ </dd>
307+ </dl>
308+ </tal:has_series>
309+
310+ <tal:has_no_series condition="not: context/productseries">
311+ <dl>
312+ <dt>Related project:</dt>
313+ <dd>
314+ <em>No project associated with this sourcepackage</em>
315+ </dd>
316+ </dl>
317+ </tal:has_no_series>
318+ </div>
319+
320+ <ul class="horizontal">
321+ <li>
322+ <a tal:replace="structure context/menu:overview/edit_packaging/fmt:link" />
323+ </li>
324+ <li>
325+ <a tal:replace="structure context/menu:overview/packaging/fmt:link" />
326+ </li>
327+ </ul>
328+ </div>
329+ </div>
330+ </div>
331+
332+ <div class="yui-g">
333+ <div class="yui-u first">
334+ <div tal:replace="structure context/@@+portlet-releases" />
335+
336+ <ul class="horizontal" style="margin-bottom: 1em;">
337+ <li>
338+ <a tal:replace="structure context/menu:overview/builds/fmt:link" />
339 </li>
340 </ul>
341- </dd>
342- </tal:block>
343- </tal:block>
344- </dl>
345-
346- <h2>Upstream associations</h2>
347-
348- <ul id="upstreams" tal:define="series context/productseries">
349- <tal:has_series condition="series">
350- <li tal:condition="series/product/project">
351- <b>Project Group:</b>
352- <a tal:define="project series/product/project"
353- tal:content="project/displayname"
354- tal:attributes="href string:/${project/name}">
355- Project</a>
356- </li>
357- <li><b>Project:</b>
358- <a tal:condition="series/product"
359- tal:content="series/product/displayname"
360- tal:attributes="href string:/${series/product/name}">
361- Project</a>
362- </li>
363- <li><b>Branch: </b>
364- <a tal:define="productseries context/productseries"
365- tal:content="productseries/name"
366- tal:attributes="href productseries/fmt:url">
367- ProjectSeries</a><br />
368- </li>
369- </tal:has_series>
370- <tal:has_no_series condition="not: context/productseries">
371- <li><b>Related project:</b>
372- <i>
373- No project associated with this sourcepackage
374- </i>
375- </li>
376- </tal:has_no_series>
377- <small>(<a tal:attributes="href string:${context/fmt:url}/+packaging">update</a>)</small>
378- </ul>
379-
380- <tal:block tal:condition="context/currentrelease"
381- tal:define="current context/currentrelease">
382-
383- <h2>Download files from current release (<span
384- tal:replace="current/version">2.1.3-4</span>)</h2>
385-
386- <div id="files" tal:content="structure current/@@+files" />
387-
388- <h2>Binary packages</h2>
389-
390- <div id="binaries" tal:define="binaries view/binaries">
391- <ul tal:condition="binaries">
392- <li tal:repeat="bin_name binaries">
393- <span tal:replace="bin_name" />
394- <span tal:repeat="archtag python:binaries[bin_name]">
395- (<a tal:content="archtag" tal:attributes="href
396- string:../../${archtag}/${bin_name}" />)</span>
397- </li>
398- </ul>
399- <p tal:condition="not: binaries">
400- No binaries have been generated for this release.
401- </p>
402+ </div>
403+
404+ <div class="yui-u">
405+ <div tal:replace="structure context/@@+portlet-upstream" />
406+
407+ <div>
408+ <h2>Binary packages</h2>
409+
410+ <div id="binaries" tal:define="binaries view/binaries">
411+ <ul tal:condition="binaries">
412+ <li tal:repeat="bin_name binaries">
413+ <span tal:replace="bin_name" />
414+ <span tal:repeat="archtag python:binaries[bin_name]">
415+ (<a tal:content="archtag" tal:attributes="href
416+ string:../../${archtag}/${bin_name}" />)</span>
417+ </li>
418+ </ul>
419+
420+ <p tal:condition="not: binaries">
421+ No binaries have been generated for this release.
422+ </p>
423+ </div>
424+ </div>
425+ </div>
426+ </div>
427+
428+ <div class="portlet"
429+ tal:define="current context/currentrelease"
430+ tal:condition="current">
431+ <h2>Download files from current release (<span
432+ tal:replace="current/version">2.1.3-4</span>)</h2>
433+
434+ <div id="files" tal:content="structure current/@@+files" />
435+
436+ <h2>Package relationships</h2>
437+
438+ <table width="100%" valign="top">
439+ <tr>
440+ <td id="depends" tal:define="relationships view/builddepends">
441+ <h3>Build dependencies</h3>
442+ <tal:block tal:condition="relationships/has_items"
443+ replace="structure relationships/@@+render-list"/>
444+ </td>
445+ <td id="dependsindep"
446+ tal:define="relationships view/builddependsindep">
447+ <h3>Platform-independent build dependencies</h3>
448+ <tal:block tal:condition="relationships/has_items"
449+ replace="structure relationships/@@+render-list"/>
450+ </td>
451+ </tr>
452+ <tr>
453+ <td id="conflicts" tal:define="relationships view/build_conflicts">
454+ <h3>Build conflicts</h3>
455+ <tal:block tal:condition="relationships/has_items"
456+ replace="structure relationships/@@+render-list"/>
457+ </td>
458+ <td id="conflictsindep"
459+ tal:define="relationships view/build_conflicts_indep">
460+ <h3>Platform-independent build dependencies</h3>
461+ <tal:block tal:condition="relationships/has_items"
462+ replace="structure relationships/@@+render-list"/>
463+ </td>
464+ </tr>
465+ </table>
466+ </div>
467 </div>
468-
469- <h2>Package relationships</h2>
470-
471- <table width="100%" valign="top">
472- <tr>
473- <td id="depends" tal:define="relationships view/builddepends">
474- <h3>Build dependencies</h3>
475- <tal:block tal:condition="relationships/has_items"
476- replace="structure relationships/@@+render-list"/>
477- </td>
478- <td id="dependsindep"
479- tal:define="relationships view/builddependsindep">
480- <h3>Platform-independent build dependencies</h3>
481- <tal:block tal:condition="relationships/has_items"
482- replace="structure relationships/@@+render-list"/>
483- </td>
484- </tr>
485- <tr>
486- <td id="conflicts" tal:define="relationships view/build_conflicts">
487- <h3>Build conflicts</h3>
488- <tal:block tal:condition="relationships/has_items"
489- replace="structure relationships/@@+render-list"/>
490- </td>
491- <td id="conflictsindep"
492- tal:define="relationships view/build_conflicts_indep">
493- <h3>Platform-independent build dependencies</h3>
494- <tal:block tal:condition="relationships/has_items"
495- replace="structure relationships/@@+render-list"/>
496- </td>
497- </tr>
498- </table>
499-
500- </tal:block>
501-
502-</div>
503-</body>
504+ </body>
505 </html>
506-
507
508=== modified file 'lib/lp/registry/templates/sourcepackage-packaging.pt'
509--- lib/lp/registry/templates/sourcepackage-packaging.pt 2009-09-07 09:15:02 +0000
510+++ lib/lp/registry/templates/sourcepackage-packaging.pt 2009-09-13 21:40:53 +0000
511@@ -3,24 +3,15 @@
512 xmlns:tal="http://xml.zope.org/namespaces/tal"
513 xmlns:metal="http://xml.zope.org/namespaces/metal"
514 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
515- xml:lang="en"
516- lang="en"
517- dir="ltr"
518- metal:use-macro="context/@@main_template/master"
519+ metal:use-macro="view/macro:page/main_only"
520 i18n:domain="launchpad"
521 >
522
523 <body>
524
525-<metal:rightportlets fill-slot="portlets_two">
526- <div tal:replace="structure context/@@+portlet-upstream" />
527-</metal:rightportlets>
528-
529-
530 <div metal:fill-slot="main">
531
532- <h1>Upstream links for <span tal:replace="context/displayname">foobar in
533- hoary</span></h1>
534+ <h1 tal:content="view/page_title" />
535
536 <p>
537 Linking distribution packages to upstream series allows
538@@ -53,14 +44,14 @@
539 <tr tal:attributes="
540 class python: packaging == context.packaging and 'highlight' or None">
541
542- <td tal:content="packaging/distroseries/distribution/displayname">
543- ubuntu
544- </td>
545- <td tal:content="packaging/distroseries/displayname">
546- hoary
547- </td>
548- <td tal:content="packaging/productseries/title">
549- evolution main
550+ <td>
551+ <a tal:replace="structure packaging/distroseries/distribution/fmt:link" />
552+ </td>
553+ <td>
554+ <a tal:replace="structure packaging/distroseries/fmt:link" />
555+ </td>
556+ <td>
557+ <a tal:replace="structure packaging/productseries/fmt:link" />
558 </td>
559
560 </tr>
561
562=== modified file 'lib/lp/registry/templates/sourcepackage-portlet-details.pt'
563--- lib/lp/registry/templates/sourcepackage-portlet-details.pt 2009-07-17 17:59:07 +0000
564+++ lib/lp/registry/templates/sourcepackage-portlet-details.pt 2009-09-14 04:24:20 +0000
565@@ -5,30 +5,33 @@
566 omit-tag="">
567
568 <div class="portlet" id="portlet-details">
569- <h2><span tal:replace="context/name" /> details</h2>
570-
571- <div class="portletBody portletContent">
572- <tal:currentrelease tal:condition="context/currentrelease"
573- tal:define="current context/currentrelease">
574- <b>Current version:</b>
575- <span tal:replace="current/version" /><br />
576-
577- <b>Uploaded:</b>
578- <span
579- tal:attributes="title current/dateuploaded/fmt:datetime"
580- tal:content="current/dateuploaded/fmt:approximatedate" /><br />
581-
582- <b>Urgency:</b>
583- <span tal:content="current/urgency/title" /><br />
584-
585- <b>Component:</b>
586- <span tal:content="current/component/name"/><br />
587-
588+ <h2><span tal:replace="context/name" /> information</h2>
589+
590+ <div class="two-column-list"
591+ tal:define="current context/currentrelease">
592+ <tal:currentrelease tal:condition="current">
593+ <dl>
594+ <dt>Current version:</dt>
595+ <dd><span tal:replace="current/version" /></dd>
596+ </dl>
597+ <dl>
598+ <dt>Uploaded:</dt>
599+ <dd><span
600+ tal:attributes="title current/dateuploaded/fmt:datetime"
601+ tal:content="current/dateuploaded/fmt:approximatedate" /></dd>
602+ </dl>
603+ <dl>
604+ <dt>Urgency:</dt>
605+ <dd><span tal:content="current/urgency/title" /></dd>
606+ </dl>
607+ <dl>
608+ <dt>Component:</dt>
609+ <dd><span tal:content="current/component/name"/></dd>
610+ </dl>
611 </tal:currentrelease>
612- <tal:norelease tal:condition="not: context/currentrelease">
613- <i>No published releases of this package have been uploaded in
614- <tal:block content="context/distroseries/fullseriesname" />
615- </i>
616+ <tal:norelease tal:condition="not: current">
617+ <em>No published releases of this package have been uploaded in
618+ <tal:series content="context/distroseries/fullseriesname" /></em>
619 </tal:norelease>
620 </div>
621
622
623=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt'
624--- lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt 2009-09-07 13:26:02 +0000
625+++ lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt 2009-09-14 04:24:20 +0000
626@@ -81,20 +81,10 @@
627 It also provides the upstream relationships for this source, Project,
628 Product and Branches:
629
630- >>> print find_tag_by_id(browser.contents, 'upstreams')
631- <ul id="upstreams">
632- <li>
633- <b>Project Group:</b>
634- <a href="/mozilla">the Mozilla Project</a>
635- </li>
636- <li><b>Project:</b>
637- <a href="/firefox">Mozilla Firefox</a>
638- </li>
639- <li><b>Branch: </b>
640- <a href="/firefox/trunk">trunk</a><br />
641- </li>
642- <small>(<a href="/ubuntu/warty/+source/mozilla-firefox/+packaging">update</a>)</small>
643- </ul>
644+ >>> print extract_text(find_tag_by_id(browser.contents, 'upstreams'))
645+ Project Group: the Mozilla Project
646+ Project: Mozilla Firefox ...
647+ Branch: trunk
648
649 The user can also download the files for the "currentrelease" (last
650 published version) if they are available:
651