Launchpad itself

Merge lp:~cprov/launchpad/soyuz-missing-heading into lp:launchpad

  1. soyuz-missing-heading
  2. Merge into devel
Proposed by Celso Providelo
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merge reported by: Celso Providelo
Merged at revision: not available
Proposed branch: lp:~cprov/launchpad/soyuz-missing-heading
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~cprov/launchpad/soyuz-missing-heading
Reviewer Review Type Date Requested Status
Brad Crittenden (community) release-critical Approve
Graham Binns (community) Approve
Michael Nelson (community) ui* Approve
Review via email: mp+12226@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) wrote :

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

= Summary =

This branch fixes https://bugs.edge.launchpad.net/soyuz/+bug/434583, splitting the views and adding the appropriate 'page_title' and 'label' properties to satisfy 3.0 layout.

== Tests ==

./bin/test -vv -t xx-distribution-packages.txt -t xx-sourcepackage-changelog.txt -t xx-distributionsourcepackagerelease-pages.txt

== Demo and Q/A ==

https://launchpad.dev/ubuntu/+source/mozilla-firefox/+changelog
https://launchpad.dev/ubuntu/warty/+source/mozilla-firefox/+changelog
https://launchpad.dev/ubuntu/+source/mozilla-firefox/+publishinghistory
https://launchpad.dev/ubuntu/+source/mozilla-firefox/0.9/+publishinghistory
https://launchpad.dev/ubuntu/warty/+source/mozilla-firefox/+packaging

= 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/stories/soyuz/xx-sourcepackage-changelog.txt
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/sourcepackage.py
  lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt
  lib/lp/soyuz/browser/sourcepackage.py
  lib/lp/registry/browser/distributionsourcepackage.py
  lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt
  lib/lp/registry/templates/sourcepackage-packaging.pt
  lib/lp/registry/stories/distribution/xx-distribution-packages.txt
  lib/lp/soyuz/browser/configure.zcml
  lib/lp/registry/templates/distributionsourcepackage-changelog.pt
  lib/lp/soyuz/templates/sourcepackage-changelog.pt
  lib/lp/soyuz/browser/distributionsourcepackagerelease.py
  lib/lp/soyuz/templates/distributionsourcepackage-publishinghistory.pt

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkq41S8ACgkQ7KBXuXyZSjAR0ACffr4a7CWtOJAL1GrBqOLbTyb2
7isAnRPta2TIFi2FbEmwfV8tMgzdkE3i
=kbCt
-----END PGP SIGNATURE-----

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

Wow - thanks for getting all those done, and for adding missing pagetests!

The only small ui issue I saw was on the page that I did...

https://launchpad.dev/ubuntu/warty/+source/mozilla-firefox/+changelog

I don't know if it's worth fixing atm, but the main heading is correctly "Change logs for mozilla-firefox in Ubuntu Warty", while the leaf-breadcrumb is 'Change log' (singular).

review: Approve (ui*)
Revision history for this message
Graham Binns (gmb) :
review: Approve
Revision history for this message
Brad Crittenden (bac) :
review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt'
2--- lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt 2009-06-13 19:58:26 +0000
3+++ lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt 2009-09-22 13:10:45 +0000
4@@ -6,6 +6,17 @@
5 >>> user_browser.open(
6 ... "http://launchpad.dev/ubuntu/warty/+source/mozilla/+packaging")
7
8+ >>> print_location(user_browser.contents)
9+ Hierarchy: Ubuntu > 4.10 > ...mozilla... source package > Upstream links
10+ Tabs:
11+ * Overview (selected) - http://launchpad.dev/ubuntu/warty/+source/mozilla
12+ * Code - http://code.launchpad.dev/ubuntu/warty/+source/mozilla
13+ * Bugs - http://bugs.launchpad.dev/ubuntu/warty/+source/mozilla
14+ * Blueprints - not linked
15+ * Translations - http://translations.launchpad.dev/ubuntu/warty/+source/mozilla
16+ * Answers - http://answers.launchpad.dev/ubuntu/warty/+source/mozilla
17+ Main heading: Upstream links for mozilla in Ubuntu Warty
18+
19 >>> print extract_text(
20 ... find_tags_by_class(user_browser.contents, 'informational')[0])
21 Launchpad doesn’t know which project and series this package
22
23=== modified file 'lib/lp/registry/browser/configure.zcml'
24--- lib/lp/registry/browser/configure.zcml 2009-09-17 19:05:29 +0000
25+++ lib/lp/registry/browser/configure.zcml 2009-09-22 13:11:13 +0000
26@@ -447,18 +447,20 @@
27 module="lp.registry.browser.distributionsourcepackage"
28 classes="
29 DistributionSourcePackageNavigation"/>
30- <browser:pages
31+ <browser:page
32 for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
33 class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageView"
34 facet="overview"
35- permission="zope.Public">
36- <browser:page
37- name="+index"
38- template="../templates/distributionsourcepackage-index.pt"/>
39- <browser:page
40- name="+changelog"
41- template="../templates/distributionsourcepackage-changelog.pt"/>
42- </browser:pages>
43+ permission="zope.Public"
44+ name="+index"
45+ template="../templates/distributionsourcepackage-index.pt" />
46+ <browser:page
47+ for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
48+ class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageChangelogView"
49+ facet="overview"
50+ permission="zope.Public"
51+ name="+changelog"
52+ template="../templates/distributionsourcepackage-changelog.pt"/>
53 <browser:page
54 for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
55 permission="launchpad.Edit"
56
57=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
58--- lib/lp/registry/browser/distributionsourcepackage.py 2009-09-04 07:29:56 +0000
59+++ lib/lp/registry/browser/distributionsourcepackage.py 2009-09-22 13:27:30 +0000
60@@ -10,6 +10,8 @@
61 'DistributionSourcePackageNavigation',
62 'DistributionSourcePackageOverviewMenu',
63 'DistributionSourcePackageView',
64+ 'DistributionSourcePackageChangelogView',
65+ 'DistributionSourcePackagePublishingHistoryView',
66 ]
67
68 from datetime import datetime
69@@ -39,8 +41,9 @@
70 from canonical.launchpad.browser.structuralsubscription import (
71 StructuralSubscriptionTargetTraversalMixin)
72 from canonical.launchpad.webapp import (
73- ApplicationMenu, LaunchpadEditFormView, LaunchpadFormView, Link,
74- Navigation, StandardLaunchpadFacets, action, canonical_url, redirection)
75+ ApplicationMenu, LaunchpadEditFormView, LaunchpadFormView, LaunchpadView,
76+ Link, Navigation, StandardLaunchpadFacets, action, canonical_url,
77+ redirection)
78 from canonical.launchpad.webapp.menu import (
79 enabled_with_permission, NavigationMenu)
80 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
81@@ -165,7 +168,32 @@
82 return Link('+changelog', text, icon="info")
83
84
85-class DistributionSourcePackageView(LaunchpadFormView):
86+class DistributionSourcePackageBaseView:
87+ """Common features to all `DistributionSourcePackage` views."""
88+
89+ def releases(self):
90+ dspr_pubs = self.context.getReleasesAndPublishingHistory()
91+
92+ # Return as early as possible to avoid unnecessary processing.
93+ if len(dspr_pubs) == 0:
94+ return []
95+
96+ # Collate diffs for relevant SourcePackageReleases
97+ sprs = [dspr.sourcepackagerelease for (dspr, spphs) in dspr_pubs]
98+ pkg_diffs = getUtility(IPackageDiffSet).getDiffsToReleases(sprs)
99+ spr_diffs = {}
100+ for spr, diffs in itertools.groupby(pkg_diffs,
101+ operator.attrgetter('to_source')):
102+ spr_diffs[spr] = list(diffs)
103+
104+ return [
105+ DecoratedDistributionSourcePackageRelease(
106+ dspr, spphs, spr_diffs.get(dspr.sourcepackagerelease, []))
107+ for (dspr, spphs) in dspr_pubs]
108+
109+
110+class DistributionSourcePackageView(DistributionSourcePackageBaseView,
111+ LaunchpadFormView):
112 """View class for DistributionSourcePackage."""
113 implements(IDistributionSourcePackageActionMenu)
114
115@@ -448,32 +476,33 @@
116
117 return rows
118
119- def releases(self):
120- dspr_pubs = self.context.getReleasesAndPublishingHistory()
121-
122- # Return as early as possible to avoid unnecessary processing.
123- if len(dspr_pubs) == 0:
124- return []
125-
126- # Collate diffs for relevant SourcePackageReleases
127- sprs = [dspr.sourcepackagerelease for (dspr, spphs) in dspr_pubs]
128- pkg_diffs = getUtility(IPackageDiffSet).getDiffsToReleases(sprs)
129- spr_diffs = {}
130- for spr, diffs in itertools.groupby(pkg_diffs,
131- operator.attrgetter('to_source')):
132- spr_diffs[spr] = list(diffs)
133-
134- return [
135- DecoratedDistributionSourcePackageRelease(
136- dspr, spphs, spr_diffs.get(dspr.sourcepackagerelease, []))
137- for (dspr, spphs) in dspr_pubs]
138-
139 @cachedproperty
140 def open_questions(self):
141 """Return result set containing open questions for this package."""
142 return self.context.searchQuestions(status=QuestionStatus.OPEN)
143
144
145+class DistributionSourcePackageChangelogView(
146+ DistributionSourcePackageBaseView, LaunchpadView):
147+ """View for presenting change logs for a `DistributionSourcePackage`."""
148+
149+ page_title = 'Change log'
150+
151+ @property
152+ def label(self):
153+ return 'Change log for %s' % self.context.title
154+
155+
156+class DistributionSourcePackagePublishingHistoryView(LaunchpadView):
157+ """View for presenting `DistributionSourcePackage` publishing history."""
158+
159+ page_title = 'Publishing history'
160+
161+ @property
162+ def label(self):
163+ return 'Publishing history of %s' % self.context.title
164+
165+
166 class DistributionSourcePackageEditView(LaunchpadEditFormView):
167 """Edit a distribution source package."""
168
169
170=== modified file 'lib/lp/registry/browser/sourcepackage.py'
171--- lib/lp/registry/browser/sourcepackage.py 2009-09-18 12:18:51 +0000
172+++ lib/lp/registry/browser/sourcepackage.py 2009-09-22 13:10:45 +0000
173@@ -260,6 +260,10 @@
174
175 page_title = 'Upstream links'
176
177+ @property
178+ def label(self):
179+ return "Upstream links for %s" % self.context.title
180+
181
182 class SourcePackageHelpView:
183 """A View to show Answers help."""
184
185=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-packages.txt'
186--- lib/lp/registry/stories/distribution/xx-distribution-packages.txt 2009-09-16 13:44:15 +0000
187+++ lib/lp/registry/stories/distribution/xx-distribution-packages.txt 2009-09-22 13:27:30 +0000
188@@ -23,7 +23,6 @@
189 pmount
190 (Matching binaries: pmount.)
191
192-
193 Follow pmount source package path
194
195 >>> browser.getLink('pmount').click()
196@@ -62,7 +61,6 @@
197 The Mozilla Firefox web browser
198 (Matching binaries: mozilla-firefox, mozilla-firefox-data.)
199
200-
201 The search page will also present commercial packages:
202
203 >>> browser.goBack()
204@@ -191,6 +189,23 @@
205
206 >>> user_browser.open("http://launchpad.dev/ubuntu/+source/iceweasel/")
207
208+The page has an appropriate title and main heading.
209+
210+ >>> from canonical.launchpad.helpers import backslashreplace
211+ >>> print backslashreplace(user_browser.title)
212+ \u201ciceweasel\u201d package : Ubuntu
213+
214+ >>> print_location(user_browser.contents)
215+ Hierarchy: Ubuntu > ?iceweasel? package
216+ Tabs:
217+ * Overview (selected) - not linked
218+ * Code - http://code.launchpad.dev/ubuntu/+source/iceweasel
219+ * Bugs - http://bugs.launchpad.dev/ubuntu/+source/iceweasel
220+ * Blueprints - not linked
221+ * Translations - not linked
222+ * Answers - http://answers.launchpad.dev/ubuntu/+source/iceweasel
223+ Main heading: ?iceweasel? package in Ubuntu
224+
225 Under the title there's a short paragraph that says how many 'new' bugs
226 and open questions the package has.
227
228@@ -359,6 +374,20 @@
229 >>> browser.open("http://launchpad.dev/ubuntu/+source/foobar/")
230 >>> browser.getLink("View full change log").click()
231
232+ >>> print backslashreplace(browser.title)
233+ Change log : \u201cfoobar\u201d package : Ubuntu
234+
235+ >>> print_location(browser.contents)
236+ Hierarchy: Ubuntu > ?foobar? package > Change log
237+ Tabs:
238+ * Overview (selected) - http://launchpad.dev/ubuntu/+source/foobar
239+ * Code - http://code.launchpad.dev/ubuntu/+source/foobar
240+ * Bugs - http://bugs.launchpad.dev/ubuntu/+source/foobar
241+ * Blueprints - not linked
242+ * Translations - not linked
243+ * Answers - http://answers.launchpad.dev/ubuntu/+source/foobar
244+ Main heading: Change log for ?foobar? package in Ubuntu
245+
246 Each version history entry has a header with the version as the title
247 and details of the publishing status in each distroseries it's published
248 in.
249@@ -517,3 +546,45 @@
250 1.0.9a-4ubuntu1
251 1.0.9a-4
252 1.0.8-1ubuntu1
253+
254+Returning to the distribution source package index page using the
255+'Overview' facet link.
256+
257+ >>> anon_browser.getLink('Overview').click()
258+ >>> print backslashreplace(anon_browser.title)
259+ \u201calsa-utils\u201d package : Ubuntu
260+
261+
262+Publishing History
263+------------------
264+
265+Users can inspect the full publishing history by clicking on a link at
266+the bottom of the 'packages_list' section in the distribution source
267+package index page.
268+
269+ >>> anon_browser.getLink('See full publishing history').click()
270+
271+The full publishing history is presented in a new page, with the
272+appropriate title and main heading, but preserving the distribution
273+source package hierarchy.
274+
275+ >>> print backslashreplace(anon_browser.title)
276+ Publishing history : \u201calsa-utils\u201d package : Ubuntu
277+
278+ >>> print_location(anon_browser.contents)
279+ Hierarchy: Ubuntu > ?alsa-utils? package > Publishing history
280+ Tabs:
281+ * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils
282+ * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils
283+ * Bugs - http://bugs.launchpad.dev/ubuntu/+source/alsa-utils
284+ * Blueprints - not linked
285+ * Translations - not linked
286+ * Answers - http://answers.launchpad.dev/ubuntu/+source/alsa-utils
287+ Main heading: Publishing history of ?alsa-utils? package in Ubuntu
288+
289+Returning to the distribution source package index is also possible via
290+the 'back' link at the bottom of the page.
291+
292+ >>> anon_browser.getLink('back').click()
293+ >>> print backslashreplace(anon_browser.title)
294+ \u201calsa-utils\u201d package : Ubuntu
295
296=== modified file 'lib/lp/registry/templates/distributionsourcepackage-changelog.pt'
297--- lib/lp/registry/templates/distributionsourcepackage-changelog.pt 2009-08-26 14:52:00 +0000
298+++ lib/lp/registry/templates/distributionsourcepackage-changelog.pt 2009-09-22 13:11:13 +0000
299@@ -8,19 +8,15 @@
300 >
301
302 <body>
303-<div metal:fill-slot="main">
304-
305-<div class="top-portlet">
306- <h1>
307- Version history
308- </h1>
309-
310- <tal:block
311- repeat="dspr view/releases"
312- replace="structure dspr/@@+changes">
313- </tal:block>
314-</div>
315-
316-</div>
317+ <div metal:fill-slot="main">
318+
319+ <div class="top-portlet">
320+ <tal:block
321+ repeat="dspr view/releases"
322+ replace="structure dspr/@@+changes">
323+ </tal:block>
324+ </div>
325+
326+ </div>
327 </body>
328 </html>
329
330=== modified file 'lib/lp/registry/templates/sourcepackage-packaging.pt'
331--- lib/lp/registry/templates/sourcepackage-packaging.pt 2009-09-13 21:40:53 +0000
332+++ lib/lp/registry/templates/sourcepackage-packaging.pt 2009-09-22 13:10:45 +0000
333@@ -11,8 +11,6 @@
334
335 <div metal:fill-slot="main">
336
337- <h1 tal:content="view/page_title" />
338-
339 <p>
340 Linking distribution packages to upstream series allows
341 distribution and upstream developers share bugs, patches, and translations
342
343=== modified file 'lib/lp/soyuz/browser/configure.zcml'
344--- lib/lp/soyuz/browser/configure.zcml 2009-09-18 09:21:50 +0000
345+++ lib/lp/soyuz/browser/configure.zcml 2009-09-22 13:11:13 +0000
346@@ -543,11 +543,14 @@
347 name="+changes"
348 facet="overview"
349 template="../templates/distributionsourcepackagerelease-changes.pt"/>
350- <browser:page
351- name="+publishinghistory"
352- facet="overview"
353- template="../templates/distributionsourcepackage-publishinghistory.pt"/>
354 </browser:pages>
355+ <browser:page
356+ for="lp.soyuz.interfaces.distributionsourcepackagerelease.IDistributionSourcePackageRelease"
357+ class="lp.soyuz.browser.distributionsourcepackagerelease.DistributionSourcePackageReleasePublishingHistoryView"
358+ permission="zope.Public"
359+ name="+publishinghistory"
360+ facet="overview"
361+ template="../templates/distributionsourcepackage-publishinghistory.pt" />
362 <browser:defaultView
363 for="lp.soyuz.interfaces.distroseriesbinarypackage.IDistroSeriesBinaryPackage"
364 name="+index"/>
365@@ -698,7 +701,7 @@
366 template="../templates/distributionsourcepackage-portlet-pub-details.pt"/>
367 <browser:page
368 for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
369- class="canonical.launchpad.webapp.publisher.LaunchpadView"
370+ class="lp.registry.browser.distributionsourcepackage.DistributionSourcePackagePublishingHistoryView"
371 permission="zope.Public"
372 name="+publishinghistory"
373 facet="overview"
374
375=== modified file 'lib/lp/soyuz/browser/distributionsourcepackagerelease.py'
376--- lib/lp/soyuz/browser/distributionsourcepackagerelease.py 2009-09-19 08:14:43 +0000
377+++ lib/lp/soyuz/browser/distributionsourcepackagerelease.py 2009-09-22 13:11:13 +0000
378@@ -6,6 +6,7 @@
379 __all__ = [
380 'DistributionSourcePackageReleaseNavigation',
381 'DistributionSourcePackageReleaseView',
382+ 'DistributionSourcePackageReleasePublishingHistoryView',
383 ]
384
385 import operator
386@@ -133,3 +134,15 @@
387 {'distroseries': distroseries, 'builds': builds})
388
389 return distroseries_builds
390+
391+
392+class DistributionSourcePackageReleasePublishingHistoryView(LaunchpadView):
393+ """Presenting `DistributionSourcePackageRelease` publishing history."""
394+
395+ usedfor = IDistributionSourcePackageRelease
396+
397+ page_title = 'Publishing history'
398+
399+ @property
400+ def label(self):
401+ return 'Publishing history of %s' % smartquote(self.context.title)
402
403=== modified file 'lib/lp/soyuz/browser/sourcepackage.py'
404--- lib/lp/soyuz/browser/sourcepackage.py 2009-09-07 14:23:49 +0000
405+++ lib/lp/soyuz/browser/sourcepackage.py 2009-09-22 11:55:32 +0000
406@@ -15,6 +15,8 @@
407 class SourcePackageChangelogView:
408 """View class for source package change logs."""
409
410+ page_title = "Change log"
411+
412 @property
413 def label(self):
414 """<h1> for the change log page."""
415
416=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt'
417--- lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2009-09-19 12:52:30 +0000
418+++ lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2009-09-22 13:11:13 +0000
419@@ -162,14 +162,15 @@
420
421 >>> anon_browser.getLink('See full publishing history').click()
422
423- >>> anon_browser.title
424- '\xe2\x80\x9ctesting-dspr\xe2\x80\x9d 1.0 source package in ubuntutest :
425- \xe2\x80\x9ctesting-dspr\xe2\x80\x9d package : ubuntutest'
426+ >>> from canonical.launchpad.helpers import backslashreplace
427+ >>> print backslashreplace(anon_browser.title)
428+ Publishing history : \u201ctesting-dspr\u201d package : ubuntutest
429
430 >>> print extract_text(find_main_content(anon_browser.contents))
431- “testing-dspr” 1.0 source package in ubuntutest
432- ...
433- Publishing history of "testing-dspr" 1.0 source package in ubuntutest
434+ Publishing history of “testing-dspr” 1.0 source package in ubuntutest
435+ ubuntutest
436+ “testing-dspr” package
437+ Publishing history
438 Date Status Target Pocket Component Section Version
439 ... Published Breezy... release main base 1.0
440 ...
441
442=== modified file 'lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt'
443--- lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2009-09-10 22:32:06 +0000
444+++ lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2009-09-22 11:55:32 +0000
445@@ -4,10 +4,20 @@
446
447 >>> user_browser.open(
448 ... "http://launchpad.dev/ubuntu/hoary/+source/pmount/+changelog")
449- >>> print extract_text(find_main_content(user_browser.contents))
450- Change logs for pmount in Ubuntu Hoary
451- ...
452- Change logs for pmount in Ubuntu Hoary
453+ >>> print_location(user_browser.contents)
454+ Hierarchy: Ubuntu > 5.04 > ...pmount... source package > Change log
455+ Tabs:
456+ * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/pmount
457+ * Code - http://code.launchpad.dev/ubuntu/hoary/+source/pmount
458+ * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/pmount
459+ * Blueprints - not linked
460+ * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/pmount
461+ * Answers - http://answers.launchpad.dev/ubuntu/hoary/+source/pmount
462+ Main heading: Change logs for pmount in Ubuntu Hoary
463+
464+
465+ >>> print extract_text(
466+ ... find_tag_by_id(user_browser.contents, 'changelogs'))
467 This is a placeholder changelog for pmount 0.1-2
468 pmount (0.1-1) hoary; urgency=low
469 * Fix description (Malone #1)
470@@ -19,10 +29,8 @@
471
472 >>> user_browser.open(
473 ... "http://launchpad.dev/ubuntu/hoary/+source/alsa-utils/+changelog")
474- >>> print extract_text(find_main_content(user_browser.contents))
475- Change logs for alsa-utils in Ubuntu Hoary
476- ...
477- Change logs for alsa-utils in Ubuntu Hoary
478+ >>> print extract_text(
479+ ... find_tag_by_id(user_browser.contents, 'changelogs'))
480 alsa-utils (1.0.9a-4ubuntu1) hoary; urgency=low
481 * Placeholder
482 LP: #10
483
484=== modified file 'lib/lp/soyuz/templates/distributionsourcepackage-publishinghistory.pt'
485--- lib/lp/soyuz/templates/distributionsourcepackage-publishinghistory.pt 2009-08-18 13:06:27 +0000
486+++ lib/lp/soyuz/templates/distributionsourcepackage-publishinghistory.pt 2009-09-22 13:11:13 +0000
487@@ -10,10 +10,8 @@
488 <body>
489
490 <div metal:fill-slot="main">
491- <h1>Publishing history of <tal:title content="context/title"/></h1>
492
493 <div class="top-portlet">
494-
495 <table id="publishing-summary" class="listing">
496 <thead>
497 <tr>
498@@ -33,7 +31,6 @@
499 </tal:block>
500 </tbody>
501 </table>
502-
503 </div>
504
505 <p>
506
507=== modified file 'lib/lp/soyuz/templates/sourcepackage-changelog.pt'
508--- lib/lp/soyuz/templates/sourcepackage-changelog.pt 2009-09-07 14:23:49 +0000
509+++ lib/lp/soyuz/templates/sourcepackage-changelog.pt 2009-09-22 11:55:32 +0000
510@@ -10,11 +10,7 @@
511 <body>
512
513 <div metal:fill-slot="main">
514- <h1 tal:content="view/label"/>
515-
516- <tal:block condition="context/distinctreleases">
517-
518- <div id="changelogs">
519+ <div class="top-portlet" id="changelogs">
520 <ul tal:condition="context/distinctreleases">
521 <li tal:repeat="spr context/distinctreleases">
522 <div tal:replace="structure spr/@@+changelog"/>
523@@ -25,9 +21,7 @@
524 There are no change logs associated with this source package.
525 </p>
526 </div>
527-
528- </tal:block>
529-
530- </div>
531- </body>
532+</div>
533+
534+</body>
535 </html>