Launchpad itself

Merge lp://staging/~allenap/launchpad/ui-convert-bugtarget-x-3.0-bug-427755 into lp://staging/launchpad

  1. ui-convert-bugtarget-x-3.0-bug-427755
  2. Merge into devel
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~allenap/launchpad/ui-convert-bugtarget-x-3.0-bug-427755
Merge into: lp://staging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~allenap/launchpad/ui-convert-bugtarget-x-3.0-bug-427755
Reviewer Review Type Date Requested Status
Eleanor Berger (community) code ui Approve
Review via email: mp+11685@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

This is all pretty trivial stuff, converting a load of portlet and
macro templates to 3.0 rules.

Converted:

  bugtarget-macros-filebug.pt
  bugtarget-portlet-bugfilters-content.pt
  bugtarget-portlet-bugtags.pt
  bugtarget-portlet-tags-content.pt
  bugtarget-portlet-recently-touched-bugs.pt
  bugtarget-portlet-search.pt

No change needed:

  bugtarget-filebug-show-similar.pt
  bugtarget-portlet-bugfilters.pt
  bugtarget-portlet-latestbugs.pt

Tidied:

  bugtarget-macros-search.pt

Revision history for this message
Gavin Panella (allenap) wrote :

Lint free.

./bin/test -vvt 'bug-?target'

To see the changes:

  bugtarget-macros-filebug.pt

    https://bugs.launchpad.net/firefox/+filebug
    https://bugs.launchpad.net/gnome-terminal/+filebug
    https://bugs.launchpad.net/apache/+filebug

  bugtarget-portlet-bugfilters-content.pt

    https://bugs.launchpad.dev/mozilla (Filters portlet)

  bugtarget-portlet-bugtags.pt
  bugtarget-portlet-tags-content.pt

    https://bugs.launchpad.dev/firefox (Tags portlet)

  bugtarget-portlet-recently-touched-bugs.pt

    https://bugs.launchpad.dev/firefox (Latest bugs touched portlet)

  bugtarget-portlet-search.pt

    https://bugs.launchpad.dev/firefox/+bug/5 (Search portlet)

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

r=me ui=me. let's take care of those two XXXs and please, give me back that sane human-readable formatting

review: Approve (code ui)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/templates/bugtarget-macros-filebug.pt'
2--- lib/lp/bugs/templates/bugtarget-macros-filebug.pt 2009-07-17 17:59:07 +0000
3+++ lib/lp/bugs/templates/bugtarget-macros-filebug.pt 2009-09-11 16:35:17 +0000
4@@ -20,8 +20,7 @@
5 <tr tal:condition="view/widgets/packagename|nothing">
6 <td style="padding-bottom: 1.5em" colspan="2"
7 tal:attributes="class view/getPackageNameFieldCSSClass">
8- <ul style="list-style: none"
9- tal:define="select_packagename view/shouldSelectPackageName">
10+ <ul tal:define="select_packagename view/shouldSelectPackageName">
11 <li>
12 <input type="radio" name="packagename_option" value="none"
13 id="no-package"
14@@ -138,139 +137,137 @@
15
16
17 <metal:not_uses_malone define-macro="not_uses_malone">
18-
19 <tal:not_uses_malone tal:condition="not: view/contextUsesMalone">
20-
21 <tal:has-context define="product_or_distro view/getProductOrDistroFromContext"
22 condition="product_or_distro">
23-
24- <div class="highlight-message"><a tal:replace="structure product_or_distro/fmt:link">Alsa Utils</a>
25- <strong>does not use</strong> Launchpad as its bug tracker.
26- <a tal:attributes="href context/menu:overview/edit/fmt:url"
27- tal:condition="context/required:launchpad.Edit"> Change this&nbsp;
28- <span class="sprite edit"></span></a>
29+ <div class="highlight-message">
30+ <a tal:replace="structure product_or_distro/fmt:link">Alsa Utils</a>
31+ <strong>does not use</strong> Launchpad as its bug tracker.
32+ <a tal:attributes="href context/menu:overview/edit/fmt:url"
33+ tal:condition="context/required:launchpad.Edit">
34+ Change this&nbsp;<span class="sprite edit"></span>
35+ </a>
36 </div>
37 <span tal:condition="view/frontpage_form">
38- You can <a href="+filebug">refine and resubmit</a> your bug report.
39+ You can <a href="+filebug">refine and resubmit</a> your bug
40+ report.
41 </span>
42-
43 <tal:upstream condition="view/contextIsProduct">
44-
45 <tal:defines define="bugtracker product_or_distro/getExternalBugTracker">
46-
47- <h3>Are you sure this bug is in <acronym class="explain" style="color: inherit"
48- title="the original developer of the software">upstream</acronym>
49- <span tal:replace="product_or_distro/displayname" />?</h3>
50-
51- <ul>
52- <li tal:condition="product_or_distro/distrosourcepackages">
53+ <h3>
54+ Are you sure this bug is in <acronym class="explain"
55+ style="color: inherit" title="the original developer of
56+ the software">upstream</acronym> <span
57+ tal:replace="product_or_distro/displayname" />?
58+ </h3>
59+ <tal:distro-source-pacakges
60+ condition="product_or_distro/distrosourcepackages">
61+ <p>
62 If you are using a package installed by your Linux
63 distribution, <b>the bug should be reported in that
64 distribution</b>, instead. Launchpad knows that <span
65- tal:replace="product_or_distro/displayname" /> is present in
66- the following distribution packages:
67- <ul class="source package" tal:repeat="dsp product_or_distro/distrosourcepackages">
68- <li><a tal:attributes="href dsp/fmt:url"><span tal:replace="dsp/distribution/displayname" /> <span tal:replace="dsp/sourcepackagename" /></a>
69- </li>
70- </ul>
71+ tal:replace="product_or_distro/displayname" /> is
72+ present in the following distribution packages:
73+ </p>
74+ <ul class="source package" tal:repeat="dsp product_or_distro/distrosourcepackages">
75+ <li>
76+ <a tal:attributes="href dsp/fmt:url"
77+ tal:content="string:${dsp/distribution/displayname} ${dsp/sourcepackagename}" />
78+ </li>
79+ </ul>
80+ <p>
81 You can report bugs by visiting the package's page.
82- </li>
83-
84- <br />
85- <li tal:condition="not: product_or_distro/distrosourcepackages">If
86- the bug you are reporting is in a package installed by a <a
87- href="/distros">distribution registered in Launchpad</a>, you should file the bug
88- against that specific distribution.
89-
90- <tal:XXX condition="nothing">
91- # XXX: Graham Binns 2007-07-12 bug=125574:
92- # The formatting of this next paragraph seems a little
93- # odd when seen in the context of a product that does not
94- # use Malone and does not specify another bug tracker.
95- # For an example of this, see
96- # http://bugs.launchpad.dev/thunderbird/+filebug.
97- </tal:XXX>
98- <p class="helpwanted message">Launchpad doesn't know of
99- any distribution packages that include upstream <span
100+ </p>
101+ </tal:distro-source-pacakges>
102+ <tal:not-distro-source-packages
103+ condition="not: product_or_distro/distrosourcepackages">
104+ <p>
105+ If the bug you are reporting is in a package installed
106+ by a <a href="/distros">distribution registered in
107+ Launchpad</a>, you should file the bug against that
108+ specific distribution.
109+ </p>
110+ <tal:XXX condition="nothing">
111+ XXX: Graham Binns 2007-07-12 bug=125574:
112+ The formatting of this next paragraph seems a little odd
113+ when seen in the context of a product that does not use
114+ Malone and does not specify another bug tracker. For an
115+ example of this, see
116+ http://bugs.launchpad.dev/thunderbird/+filebug.
117+ </tal:XXX>
118+ <p class="helpwanted message">
119+ Launchpad doesn't know of any distribution packages that
120+ include upstream <span
121 tal:replace="product_or_distro/displayname" />. You can
122 help by <a tal:attributes="href
123- string:${product_or_distro/development_focus/fmt:url}/+ubuntupkg">linking
124- them for us.</a></p>
125- </li>
126-
127- <tal:has-bugtracker condition="bugtracker">
128- <br />
129- <li id="bugtarget-upstream-bugtracker-info">
130- Bugs in
131- <abbr title="the original developer of the software"
132- class="explain">upstream</abbr>
133- <span tal:replace="product_or_distro/displayname">
134- Alsa Utils
135- </span>
136- <tal:action
137- define="via_email
138- bugtracker/bugtrackertype/enumvalue:EMAILADDRESS">
139- <tal:via-email condition="via_email">
140- should be sent to
141- <a tal:replace="structure bugtracker/fmt:external-link" />
142- </tal:via-email>
143- <tal:not-via-email condition="not:via_email">
144- should be reported in its official bug tracker,
145- <a tal:replace="structure bugtracker/fmt:external-title-link" />
146- </tal:not-via-email>
147- </tal:action>
148- </li>
149- </tal:has-bugtracker>
150-
151- </ul>
152-
153+ product_or_distro/development_focus/fmt:url/+ubuntupkg">linking
154+ them for us.</a>
155+ </p>
156+ </tal:not-distro-source-packages>
157+ <tal:has-bugtracker condition="bugtracker">
158+ <p id="bugtarget-upstream-bugtracker-info">
159+ Bugs in <abbr title="the original developer of the
160+ software" class="explain">upstream</abbr>
161+ <span tal:replace="product_or_distro/displayname">
162+ Alsa Utils
163+ </span>
164+ <tal:action
165+ define="via_email
166+ bugtracker/bugtrackertype/enumvalue:EMAILADDRESS">
167+ <tal:via-email condition="via_email">
168+ should be sent to
169+ <a tal:replace="structure bugtracker/fmt:external-link" />
170+ </tal:via-email>
171+ <tal:not-via-email condition="not:via_email">
172+ should be reported in its official bug tracker,
173+ <a tal:replace="structure bugtracker/fmt:external-title-link" />
174+ </tal:not-via-email>
175+ </tal:action>
176+ </p>
177+ </tal:has-bugtracker>
178 <tal:XXX condition="nothing">
179- # XXX: kiko 2007-03-14:
180- # We shouldn't be using feedback@launchpad.net, but we have no
181- # way of allowing people to go around changing product bugtracker
182- # details, so for now it will have to do.
183+ XXX: kiko 2007-03-14:
184+ We shouldn't be using feedback@launchpad.net, but we have
185+ no way of allowing people to go around changing product
186+ bugtracker details, so for now it will have to do.
187 </tal:XXX>
188- <p tal:condition="not: bugtracker" class="helpwanted message">
189+ <tal:not-has-bugtracker condition="not: bugtracker">
190+ <p class="helpwanted message">
191 Launchpad doesn't know what bug tracker <span
192- tal:replace="product_or_distro/displayname">Alsa Utils</span>
193- uses. Do you know? <a href="mailto: feedback@launchpad.net">Tell us about it.</a>
194- </p>
195+ tal:replace="product_or_distro/displayname">Alsa
196+ Utils</span> uses. Do you know? <a href="mailto:
197+ feedback@launchpad.net">Tell us about it.</a>
198+ </p>
199+ </tal:not-has-bugtracker>
200 </tal:defines>
201-
202 </tal:upstream>
203-
204-
205 <tal:distro condition="not: view/contextIsProduct">
206-
207 To file a bug for this distribution, visit its official bug
208 tracker.
209-
210 </tal:distro>
211 </tal:has-context>
212-
213 <tal:project condition="view/contextIsProject">
214-
215 <p class="informational message"
216- condition="not: context/required:launchpad.Edit"
217- >
218- There are no projects registered for
219- <span tal:replace="context/displayname">project displayname</span>
220+ condition="not: context/required:launchpad.Edit">
221+ There are no projects registered for <span
222+ tal:replace="context/displayname">project displayname</span>
223 that use Launchpad to track bugs.
224 </p>
225-
226- <tal:admin-warning condition="context/required:launchpad.Edit">
227- <p tal:condition="not: context/products" class="warning message">
228- There are no projects registered for
229- <span tal:replace="context/displayname">project displayname</span>.
230- <br />
231- You need to <a href="+newproduct">register another project that is
232- part of <tal:project replace="context/displayname" /></a> or
233- associate an existing project with it.
234- </p>
235- </tal:admin-warning>
236-
237+ <tal:not-has-products tal:condition="not: context/products">
238+ <tal:admin-warning condition="context/required:launchpad.Edit">
239+ <p class="warning message">
240+ There are no projects registered for <span
241+ tal:replace="context/displayname">project
242+ displayname</span>.
243+ <br />
244+ You need to <a href="+newproduct" tal:attributes="href
245+ context/fmt:url/+newproduct">register another project that
246+ is part of <tal:project replace="context/displayname"
247+ /></a> or associate an existing project with it.
248+ </p>
249+ </tal:admin-warning>
250+ </tal:not-has-products>
251 <tal:has-products condition="context/products">
252-
253 <tal:plural condition="python:context.products.count() > 1">
254 <p id="product-list-summary">
255 There are <tal:count replace="context/products/count" /> projects
256@@ -285,55 +282,47 @@
257 <p>
258 The projects that are part of
259 <tal:project replace="context/displayname" />
260- are listed below, along with
261- the source packages with which they are registered and their
262- external bug trackers. If you can't find an appropriate place
263- to file your bug, please try contacting the administrator of
264- <tal:project replace="context/displayname" />.
265+ are listed below, along with the source packages with
266+ which they are registered and their external bug trackers.
267+ If you can't find an appropriate place to file your bug,
268+ please try contacting the administrator of <tal:project
269+ replace="context/displayname" />.
270 </p>
271 </tal:plural>
272 <tal:singular condition="python:context.products.count() == 1">
273 <p id="product-list-summary">
274- There is 1 project registered as part of
275- <tal:project replace="context/displayname">Project</tal:project>
276- but it does not use Launchpad as its bug tracker.
277+ There is 1 project registered as part of <tal:project
278+ replace="context/displayname">Project</tal:project> but it
279+ does not use Launchpad as its bug tracker.
280 </p>
281 <p>
282- The details of the project are shown below, along with any source
283- packages with which it is registered and its external bug tracker,
284- if it uses one. If you can't find an appropriate place to file
285- your bug, please contact the administrator of
286- <tal:project replace="context/displayname">Project</tal:project>.
287+ The details of the project are shown below, along with any
288+ source packages with which it is registered and its
289+ external bug tracker, if it uses one. If you can't find an
290+ appropriate place to file your bug, please contact the
291+ administrator of <tal:project
292+ replace="context/displayname">Project</tal:project>.
293 </p>
294 </tal:singular>
295-
296 <ul class="product-bug-options" tal:repeat="product context/products">
297 <li condition="product/official_malone">
298 <tal:link replace="structure product/fmt:link" />
299-
300- <ul>
301+ <ul class="bulleted">
302 <tal:external-tracker
303 define="bugtracker product/getExternalBugTracker">
304-
305 <li tal:condition="bugtracker">
306- External bug tracker:
307- <a tal:attributes="href bugtracker/baseurl"
308- tal:content="bugtracker/title">
309- Bug Tracker
310- </a>.
311+ External bug tracker: <a tal:replace="structure
312+ bugtracker/fmt:external-title-link" />.
313 </li>
314-
315 <li tal:condition="not: bugtracker">
316- <tal:product replace="product/displayname">
317- Project
318- </tal:product>
319- does not use an external bug tracker or has not registered
320- it with launchpad.
321+ <tal:product replace="product/displayname">
322+ Project
323+ </tal:product>
324+ does not use an external bug tracker or has not registered
325+ it with launchpad.
326 </li>
327 </tal:external-tracker>
328-
329 <tal:packages define="packages product/distrosourcepackages">
330-
331 <li tal:condition="packages">
332 <ul tal:repeat="package packages">
333 <li class="source package">
334@@ -343,34 +332,29 @@
335 replace="package/distribution/displayname" />
336 <tal:packagename replace="package/sourcepackagename" />
337 </a>
338- (<a
339- tal:attributes="href string:${package/fmt:url}/+filebug"
340- >File a bug here</a>)
341+ (<a tal:attributes="href
342+ package/fmt:url/+filebug">File a bug here</a>)
343 </li>
344 </ul>
345 </li>
346-
347 <li tal:condition="not: packages">
348 <tal:product replace="product/displayname">
349 Project
350 </tal:product>
351- is not registered with any source packages. You can help by
352- <a tal:attributes="href string:${product/development_focus/fmt:url}/+ubuntupkg">linking them for us.</a>
353+ is not registered with any source packages. You can
354+ help by <a tal:attributes="href
355+ product/development_focus/fmt:url/+ubuntupkg">linking
356+ them for us.</a>
357 </li>
358-
359 </tal:packages>
360 </ul>
361 </li>
362 </ul>
363-
364 </tal:has-products>
365-
366 </tal:project>
367 </tal:not_uses_malone>
368-
369 </metal:not_uses_malone>
370
371-
372 <metal:bug_reporting_guidelines define-macro="bug_reporting_guidelines">
373 <tr tal:define="guidelines view/bug_reporting_guidelines"
374 tal:condition="guidelines">
375@@ -384,7 +368,7 @@
376 </metal:bug_reporting_guidelines>
377
378 <metal:similar-bugs define-macro="display-similar-bugs">
379- <ul id="similar-bugs" style="list-style: none; margin-left: 0; margin-bottom: 0">
380+ <ul id="similar-bugs">
381 <li tal:repeat="bug view/similar_bugs" class="similar-bug">
382 <table tal:define="bugtask python:view.getRelevantBugTask(bug)">
383 <tbody>
384@@ -411,51 +395,42 @@
385 >Bug title here</a>
386 </label>
387 </div>
388-
389 <div class="lesser" style="margin-bottom: 0.2em">
390 <span class="lesser">
391 <tal:bugtask-status tal:condition="bugtask">
392 <span tal:attributes="class string:status${bugtask/status/name}"
393 ><tal:status content="bugtask/status/title" /></span>
394 </tal:bugtask-status>
395-
396 <tal:no-bugtask condition="not: bugtask">
397 <tal:closed condition="bug/is_complete">Closed</tal:closed>
398 <tal:open condition="not:bug/is_complete">Open</tal:open>
399 </tal:no-bugtask>
400-
401 (<tal:comments replace="bug/comment_count" />
402 <tal:one_comment condition="python: bug.comment_count == 1"
403 replace="string: comment"
404 /><tal:plural_comments
405 condition="python: bug.comment_count != 1"
406 replace="string: comments" />)
407-
408 last updated
409 <tal:last-updated
410 content="bug/date_last_updated/fmt:approximatedate">
411 2007-07-03
412 </tal:last-updated>
413-
414 <a class="view-bug-link" tal:attributes="href bug/fmt:url"
415 >view this bug</a>
416 </span>
417 </div>
418-
419 <div class="duplicate-details"
420 tal:attributes="id string:details-for-bug-${bug/id}">
421-
422 <div class="lesser" style="margin-bottom: 0.5em;"
423 tal:define="description bug/description/fmt:shorten/500/fmt:obfuscate-email/fmt:text-to-html"
424 tal:content="structure description" />
425-
426 <div class="lesser">
427 <form action="."
428 tal:attributes="action view/action_url"
429 method="post"
430 accept-charset="UTF-8"
431 class="this-is-my-bug-form">
432-
433 <span style="padding-left: 1.5em">
434 <input type="hidden"
435 name="field.bug_already_reported_as"
436@@ -470,13 +445,11 @@
437 tal:attributes="
438 id string:bug-already-reported-as-${bug/id};"
439 />
440-
441 <input type="submit"
442 name="field.actions.this_is_my_bug"
443 tal:attributes="id string:this-is-my-bug-${bug/id}"
444 value="Yes, this is the bug I'm trying to report"
445 />
446-
447 <div tal:attributes="id string:duplicate-overlay-bug-${bug/id}"
448 ></div>
449 </span>
450@@ -489,45 +462,26 @@
451 </table>
452 </li>
453 </ul>
454-
455 <p tal:define="error_message view/widget_errors/bug_already_reported_as|nothing"
456 tal:condition="error_message" tal:content="error_message" class="error message" />
457-
458 </metal:similar-bugs>
459
460 <metal:similar-bugs-and-filebug-form
461 define-macro="show-similar-bugs-and-filebug-form">
462-
463 <tal:similar-bugs condition="view/show_duplicate_list">
464 <metal:similar-bugs
465 use-macro="context/@@+filebug-macros/display-similar-bugs" />
466-
467- <ul style="list-style: none; margin-left: 0">
468- <li style="margin-top: 1em">
469- <tal:comment replace="nothing">
470- We hide this next paragraph if the context doesn't use
471- malone because in that situation we're showing the form
472- after an error message and in that context the message
473- makes no sense.
474- </tal:comment>
475- <table tal:condition="view/contextUsesMalone">
476- <tbody>
477- <tr>
478- <td colspan="2">
479- <input
480- id="bug-not-already-reported"
481- type="button"
482- name="field.bug_already_reported_as"
483- value="No, I need to report a new bug" />
484- </td>
485- </tr>
486- </tbody>
487- </table>
488- </li>
489- </ul>
490-
491+ <tal:comment replace="nothing">
492+ We hide this next paragraph if the context doesn't use malone
493+ because in that situation we're showing the form after an error
494+ message and in that context the message makes no sense.
495+ </tal:comment>
496+ <p style="margin-top: 1em" tal:condition="view/contextUsesMalone">
497+ <input id="bug-not-already-reported" type="button"
498+ name="field.bug_already_reported_as"
499+ value="No, I need to report a new bug" />
500+ </p>
501 </tal:similar-bugs>
502-
503 <tal:submit-new-bug>
504 <div id="bug_reporting_form">
505 <metal:form use-macro="context/@@launchpad_form/form">
506@@ -544,7 +498,6 @@
507 </metal:form>
508 </div>
509 </tal:submit-new-bug>
510-
511 </metal:similar-bugs-and-filebug-form>
512
513 </tal:root>
514
515=== modified file 'lib/lp/bugs/templates/bugtarget-macros-search.pt'
516--- lib/lp/bugs/templates/bugtarget-macros-search.pt 2009-07-17 17:59:07 +0000
517+++ lib/lp/bugs/templates/bugtarget-macros-search.pt 2009-09-13 20:19:53 +0000
518@@ -2,9 +2,6 @@
519 xmlns:tal="http://xml.zope.org/namespaces/tal"
520 xmlns:metal="http://xml.zope.org/namespaces/metal"
521 omit-tag="">
522-<metal:block define-macro="sortwidget_label">
523- <label for="orderby">Sorted by:</label>
524-</metal:block>
525
526 <metal:block define-macro="sortwidget">
527 <tal:comment condition="nothing">
528@@ -59,11 +56,10 @@
529 tal:attributes="selected python:orderby == '-users_affected_count'"
530 >by number of users affected</option>
531 </select>
532-
533 </metal:block>
534
535 <metal:block define-macro="simple-search-form">
536-<form method="get" name="search" class="primary search" action=""
537+<form method="get" name="search" class="primary search"
538 tal:attributes="action search_url|string:">
539 <tal:searchbox replace="structure view/widgets/searchtext" />
540 <metal:widget use-macro="context/@@+bugtarget-macros-search/sortwidget" />
541@@ -82,13 +78,12 @@
542 <div metal:define-slot="extra-search-widgets">
543 </div>
544 </form>
545-
546- <tal:comment condition="nothing">
547- bugtarget-bugs.pt is the only template that uses this form in a page
548- where the search field should be auto-focused. If another template
549- ever falls into this category, the auto-focusing code should be moved
550- here from bugtarget-bugs.pt, but made optional and off by default.
551- </tal:comment>
552-
553+<tal:comment condition="nothing">
554+ bugtarget-bugs.pt is the only template that uses this form in a page
555+ where the search field should be auto-focused. If another template
556+ ever falls into this category, the auto-focusing code should be moved
557+ here from bugtarget-bugs.pt, but made optional and off by default.
558+</tal:comment>
559 </metal:block>
560+
561 </tal:root>
562
563=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt'
564--- lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt 2009-07-17 17:59:07 +0000
565+++ lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt 2009-09-13 20:29:46 +0000
566@@ -1,5 +1,5 @@
567-<div class="portletBody portletContent">
568-
569+<div xmlns:tal="http://xml.zope.org/namespaces/tal"
570+ xmlns:metal="http://xml.zope.org/namespaces/metal">
571 <table width="100%">
572 <tr>
573 <td><a tal:attributes="href view/getOpenBugsURL">Open</a></td>
574@@ -38,5 +38,4 @@
575 <td tal:content="context/all_bugtasks/count">42</td>
576 </tr>
577 </table>
578-
579 </div>
580
581=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt'
582--- lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt 2009-09-11 13:35:43 +0000
583+++ lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt 2009-09-13 20:39:15 +0000
584@@ -36,11 +36,12 @@
585 });
586 });
587 </script>
588-
589- <p tal:condition="view/show_manage_tags_link"
590- style="text-align:right">
591- <a tal:attributes="href context/fmt:url/+manage-official-tags">
592- Edit official tags <span class="sprite edit" />
593- </a>
594- </p>
595+ <ul>
596+ <li tal:condition="view/show_manage_tags_link">
597+ <a class="sprite edit"
598+ tal:attributes="href context/fmt:url/+manage-official-tags">
599+ Edit official tags
600+ </a>
601+ </li>
602+ </ul>
603 </div>
604
605=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-recently-touched-bugs.pt'
606--- lib/lp/bugs/templates/bugtarget-portlet-recently-touched-bugs.pt 2009-07-17 17:59:07 +0000
607+++ lib/lp/bugs/templates/bugtarget-portlet-recently-touched-bugs.pt 2009-09-13 20:53:27 +0000
608@@ -6,15 +6,10 @@
609 tal:define="recently_updated_bugtasks view/getMostRecentlyUpdatedBugTasks"
610 tal:condition="recently_updated_bugtasks">
611 <h2>Latest bugs touched</h2>
612- <div class="portletBody portletContent">
613-
614- <table>
615- <tbody>
616- <tal:per_task repeat="bugtask recently_updated_bugtasks"
617- replace="structure bugtask/@@+listing-detailed"/>
618- </tbody>
619- </table>
620-
621- </div>
622-
623+ <table>
624+ <tbody>
625+ <tal:per_task repeat="bugtask recently_updated_bugtasks"
626+ replace="structure bugtask/@@+listing-detailed"/>
627+ </tbody>
628+ </table>
629 </div>
630
631=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-search.pt'
632--- lib/lp/bugs/templates/bugtarget-portlet-search.pt 2009-07-17 17:59:07 +0000
633+++ lib/lp/bugs/templates/bugtarget-portlet-search.pt 2009-09-13 20:53:27 +0000
634@@ -2,25 +2,25 @@
635 xmlns:tal="http://xml.zope.org/namespaces/tal"
636 xmlns:metal="http://xml.zope.org/namespaces/metal"
637 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
638+ tal:define="bugs_url context/target/fmt:url/+bugs"
639 class="portlet" id="portlet-search">
640 <h2>Search</h2>
641- <div class="portletBody"
642- tal:define="bugs_url string:${context/target/fmt:url}/+bugs">
643- <b>Enter bug ID or keywords:</b><br /><br />
644- <form name="bugtask_search" method="GET"
645- tal:attributes="action bugs_url">
646- <input
647- id="field.searchtext"
648- name="field.searchtext"
649- size="6"
650- style="width: 90%;"
651- />
652- <input type="submit" name="search" value="Search" />
653- </form>
654- <br />
655- <a href="#"
656- tal:content="string:Show all open bugs"
657- tal:attributes="href bugs_url">Show all Mozilla Firefox bugs</a>
658- </div>
659-
660+ <form name="bugtask_search" method="GET" tal:attributes="action bugs_url">
661+ <ul>
662+ <li>
663+ <label for="field.searchtext">Enter bug ID or keywords:</label>
664+ </li>
665+ <li>
666+ <input id="field.searchtext" name="field.searchtext" />
667+ </li>
668+ <li>
669+ <input type="submit" name="search" value="Search" />
670+ </li>
671+ </ul>
672+ </form>
673+ <ul>
674+ <li>
675+ <a tal:attributes="href bugs_url">Show all open bugs</a>
676+ </li>
677+ </ul>
678 </div>
679
680=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt'
681--- lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt 2009-07-17 17:59:07 +0000
682+++ lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt 2009-09-13 20:39:15 +0000
683@@ -1,13 +1,11 @@
684 <div xmlns:tal="http://xml.zope.org/namespaces/tal"
685 xmlns:metal="http://xml.zope.org/namespaces/metal"
686 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
687- class="portletBody"
688 tal:define="official_tags view/official_tags;
689 other_tags view/other_tags"
690 tal:condition="python: official_tags or other_tags">
691 <div class="section" tal:condition="official_tags">
692 <h2>Official tags</h2>
693-
694 <table width="100%">
695 <tr tal:repeat="bug_tag_info official_tags">
696 <td width="100%">
697@@ -20,11 +18,9 @@
698 </tr>
699 </table>
700 </div>
701-
702 <div class="section" tal:condition="other_tags">
703 <h2 tal:condition="official_tags">Other tags</h2>
704 <h2 tal:condition="not: official_tags">Tags</h2>
705-
706 <table width="100%">
707 <tr tal:repeat="bug_tag_info other_tags">
708 <td width="100%">
709@@ -38,4 +34,3 @@
710 </table>
711 </div>
712 </div>
713-