Launchpad itself

Merge lp:~jtv/launchpad/bug-429272 into lp:launchpad

  1. bug-429272
  2. Merge into devel
Proposed by Jeroen T. Vermeulen
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jtv/launchpad/bug-429272
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~jtv/launchpad/bug-429272
Reviewer Review Type Date Requested Status
Eleanor Berger (community) Approve
Review via email: mp+11690@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

= Bug 429272 =

This fixes double headings on three Translations pages: the pofile
person filter page, plus 2× import queue (the global queue and one for a
given context). It turns out they still had h1's in their main slots.

No pagetests are affected, and I don't think it'd be particularly useful
to test that this exact mistake won't regress for these specific pages.

This is a lint-free branch™.

Jeroen

Revision history for this message
Eleanor Berger (intellectronica) wrote :

r=me
ui=me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/translations/templates/hastranslationimports-index.pt'
2--- lib/lp/translations/templates/hastranslationimports-index.pt 2009-09-03 10:43:02 +0000
3+++ lib/lp/translations/templates/hastranslationimports-index.pt 2009-09-14 10:35:23 +0000
4@@ -20,11 +20,6 @@
5 </metal:css>
6
7 <div metal:fill-slot="main">
8- <h1 tal:condition="view/label"
9- tal:content="view/label">
10- Translation import queue for Foo Bar
11- </h1>
12-
13 <p id="description">
14 These translation related entries are imported, blocked, deleted or
15 waiting to be imported in Launchpad for
16
17=== modified file 'lib/lp/translations/templates/pofile-filter.pt'
18--- lib/lp/translations/templates/pofile-filter.pt 2009-09-02 07:13:11 +0000
19+++ lib/lp/translations/templates/pofile-filter.pt 2009-09-14 10:35:23 +0000
20@@ -20,11 +20,7 @@
21
22 <body>
23 <div metal:fill-slot="main">
24- <h1 tal:condition="view/person">Contributions by
25- <tal:contributor content="view/person/displayname"/>
26- </h1>
27-
28- <tal:block define="messages view/translations">
29+ <tal:block define="messages view/translations">
30
31 <p tal:condition="not:view/translations" class="informational message">
32 This person has made no contributions to this file.
33@@ -78,10 +74,10 @@
34 </tr>
35 </tal:translation>
36 </tal:message>
37- </table>
38+ </table>
39
40- </tal:translations>
41- </tal:block>
42- </div>
43- </body>
44+ </tal:translations>
45+ </tal:block>
46+ </div>
47+</body>
48 </html>
49
50=== modified file 'lib/lp/translations/templates/translationimportqueue-index.pt'
51--- lib/lp/translations/templates/translationimportqueue-index.pt 2009-09-01 09:51:12 +0000
52+++ lib/lp/translations/templates/translationimportqueue-index.pt 2009-09-14 10:35:23 +0000
53@@ -19,11 +19,6 @@
54 </metal:css>
55
56 <div metal:fill-slot="main">
57- <h1 tal:condition="view/label"
58- tal:content="view/label">
59- Translation files waiting to be imported in Launchpad
60- </h1>
61-
62 <p id="description">
63 These translation related entries are imported, blocked, deleted or
64 waiting to be imported in Launchpad.