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
=== modified file 'lib/lp/bugs/templates/bugtarget-macros-filebug.pt'
--- lib/lp/bugs/templates/bugtarget-macros-filebug.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtarget-macros-filebug.pt 2009-09-11 16:35:17 +0000
@@ -20,8 +20,7 @@
20 <tr tal:condition="view/widgets/packagename|nothing">20 <tr tal:condition="view/widgets/packagename|nothing">
21 <td style="padding-bottom: 1.5em" colspan="2"21 <td style="padding-bottom: 1.5em" colspan="2"
22 tal:attributes="class view/getPackageNameFieldCSSClass">22 tal:attributes="class view/getPackageNameFieldCSSClass">
23 <ul style="list-style: none"23 <ul tal:define="select_packagename view/shouldSelectPackageName">
24 tal:define="select_packagename view/shouldSelectPackageName">
25 <li>24 <li>
26 <input type="radio" name="packagename_option" value="none"25 <input type="radio" name="packagename_option" value="none"
27 id="no-package"26 id="no-package"
@@ -138,139 +137,137 @@
138137
139138
140<metal:not_uses_malone define-macro="not_uses_malone">139<metal:not_uses_malone define-macro="not_uses_malone">
141
142 <tal:not_uses_malone tal:condition="not: view/contextUsesMalone">140 <tal:not_uses_malone tal:condition="not: view/contextUsesMalone">
143
144 <tal:has-context define="product_or_distro view/getProductOrDistroFromContext"141 <tal:has-context define="product_or_distro view/getProductOrDistroFromContext"
145 condition="product_or_distro">142 condition="product_or_distro">
146143 <div class="highlight-message">
147 <div class="highlight-message"><a tal:replace="structure product_or_distro/fmt:link">Alsa Utils</a>144 <a tal:replace="structure product_or_distro/fmt:link">Alsa Utils</a>
148 <strong>does not use</strong> Launchpad as its bug tracker.145 <strong>does not use</strong> Launchpad as its bug tracker.
149 <a tal:attributes="href context/menu:overview/edit/fmt:url"146 <a tal:attributes="href context/menu:overview/edit/fmt:url"
150 tal:condition="context/required:launchpad.Edit"> Change this&nbsp;147 tal:condition="context/required:launchpad.Edit">
151 <span class="sprite edit"></span></a>148 Change this&nbsp;<span class="sprite edit"></span>
149 </a>
152 </div>150 </div>
153 <span tal:condition="view/frontpage_form">151 <span tal:condition="view/frontpage_form">
154 You can <a href="+filebug">refine and resubmit</a> your bug report.152 You can <a href="+filebug">refine and resubmit</a> your bug
153 report.
155 </span>154 </span>
156
157 <tal:upstream condition="view/contextIsProduct">155 <tal:upstream condition="view/contextIsProduct">
158
159 <tal:defines define="bugtracker product_or_distro/getExternalBugTracker">156 <tal:defines define="bugtracker product_or_distro/getExternalBugTracker">
160157 <h3>
161 <h3>Are you sure this bug is in <acronym class="explain" style="color: inherit"158 Are you sure this bug is in <acronym class="explain"
162 title="the original developer of the software">upstream</acronym>159 style="color: inherit" title="the original developer of
163 <span tal:replace="product_or_distro/displayname" />?</h3>160 the software">upstream</acronym> <span
164161 tal:replace="product_or_distro/displayname" />?
165 <ul>162 </h3>
166 <li tal:condition="product_or_distro/distrosourcepackages">163 <tal:distro-source-pacakges
164 condition="product_or_distro/distrosourcepackages">
165 <p>
167 If you are using a package installed by your Linux166 If you are using a package installed by your Linux
168 distribution, <b>the bug should be reported in that167 distribution, <b>the bug should be reported in that
169 distribution</b>, instead. Launchpad knows that <span168 distribution</b>, instead. Launchpad knows that <span
170 tal:replace="product_or_distro/displayname" /> is present in169 tal:replace="product_or_distro/displayname" /> is
171 the following distribution packages:170 present in the following distribution packages:
172 <ul class="source package" tal:repeat="dsp product_or_distro/distrosourcepackages">171 </p>
173 <li><a tal:attributes="href dsp/fmt:url"><span tal:replace="dsp/distribution/displayname" /> <span tal:replace="dsp/sourcepackagename" /></a>172 <ul class="source package" tal:repeat="dsp product_or_distro/distrosourcepackages">
174 </li>173 <li>
175 </ul>174 <a tal:attributes="href dsp/fmt:url"
175 tal:content="string:${dsp/distribution/displayname} ${dsp/sourcepackagename}" />
176 </li>
177 </ul>
178 <p>
176 You can report bugs by visiting the package's page.179 You can report bugs by visiting the package's page.
177 </li>180 </p>
178181 </tal:distro-source-pacakges>
179 <br />182 <tal:not-distro-source-packages
180 <li tal:condition="not: product_or_distro/distrosourcepackages">If183 condition="not: product_or_distro/distrosourcepackages">
181 the bug you are reporting is in a package installed by a <a184 <p>
182 href="/distros">distribution registered in Launchpad</a>, you should file the bug185 If the bug you are reporting is in a package installed
183 against that specific distribution.186 by a <a href="/distros">distribution registered in
184187 Launchpad</a>, you should file the bug against that
185 <tal:XXX condition="nothing">188 specific distribution.
186 # XXX: Graham Binns 2007-07-12 bug=125574:189 </p>
187 # The formatting of this next paragraph seems a little190 <tal:XXX condition="nothing">
188 # odd when seen in the context of a product that does not191 XXX: Graham Binns 2007-07-12 bug=125574:
189 # use Malone and does not specify another bug tracker.192 The formatting of this next paragraph seems a little odd
190 # For an example of this, see193 when seen in the context of a product that does not use
191 # http://bugs.launchpad.dev/thunderbird/+filebug.194 Malone and does not specify another bug tracker. For an
192 </tal:XXX>195 example of this, see
193 <p class="helpwanted message">Launchpad doesn't know of196 http://bugs.launchpad.dev/thunderbird/+filebug.
194 any distribution packages that include upstream <span197 </tal:XXX>
198 <p class="helpwanted message">
199 Launchpad doesn't know of any distribution packages that
200 include upstream <span
195 tal:replace="product_or_distro/displayname" />. You can201 tal:replace="product_or_distro/displayname" />. You can
196 help by <a tal:attributes="href202 help by <a tal:attributes="href
197 string:${product_or_distro/development_focus/fmt:url}/+ubuntupkg">linking203 product_or_distro/development_focus/fmt:url/+ubuntupkg">linking
198 them for us.</a></p>204 them for us.</a>
199 </li>205 </p>
200206 </tal:not-distro-source-packages>
201 <tal:has-bugtracker condition="bugtracker">207 <tal:has-bugtracker condition="bugtracker">
202 <br />208 <p id="bugtarget-upstream-bugtracker-info">
203 <li id="bugtarget-upstream-bugtracker-info">209 Bugs in <abbr title="the original developer of the
204 Bugs in210 software" class="explain">upstream</abbr>
205 <abbr title="the original developer of the software"211 <span tal:replace="product_or_distro/displayname">
206 class="explain">upstream</abbr>212 Alsa Utils
207 <span tal:replace="product_or_distro/displayname">213 </span>
208 Alsa Utils214 <tal:action
209 </span>215 define="via_email
210 <tal:action216 bugtracker/bugtrackertype/enumvalue:EMAILADDRESS">
211 define="via_email217 <tal:via-email condition="via_email">
212 bugtracker/bugtrackertype/enumvalue:EMAILADDRESS">218 should be sent to
213 <tal:via-email condition="via_email">219 <a tal:replace="structure bugtracker/fmt:external-link" />
214 should be sent to220 </tal:via-email>
215 <a tal:replace="structure bugtracker/fmt:external-link" />221 <tal:not-via-email condition="not:via_email">
216 </tal:via-email>222 should be reported in its official bug tracker,
217 <tal:not-via-email condition="not:via_email">223 <a tal:replace="structure bugtracker/fmt:external-title-link" />
218 should be reported in its official bug tracker,224 </tal:not-via-email>
219 <a tal:replace="structure bugtracker/fmt:external-title-link" />225 </tal:action>
220 </tal:not-via-email>226 </p>
221 </tal:action>227 </tal:has-bugtracker>
222 </li>
223 </tal:has-bugtracker>
224
225 </ul>
226
227 <tal:XXX condition="nothing">228 <tal:XXX condition="nothing">
228 # XXX: kiko 2007-03-14:229 XXX: kiko 2007-03-14:
229 # We shouldn't be using feedback@launchpad.net, but we have no230 We shouldn't be using feedback@launchpad.net, but we have
230 # way of allowing people to go around changing product bugtracker231 no way of allowing people to go around changing product
231 # details, so for now it will have to do.232 bugtracker details, so for now it will have to do.
232 </tal:XXX>233 </tal:XXX>
233 <p tal:condition="not: bugtracker" class="helpwanted message">234 <tal:not-has-bugtracker condition="not: bugtracker">
235 <p class="helpwanted message">
234 Launchpad doesn't know what bug tracker <span236 Launchpad doesn't know what bug tracker <span
235 tal:replace="product_or_distro/displayname">Alsa Utils</span>237 tal:replace="product_or_distro/displayname">Alsa
236 uses. Do you know? <a href="mailto: feedback@launchpad.net">Tell us about it.</a>238 Utils</span> uses. Do you know? <a href="mailto:
237 </p>239 feedback@launchpad.net">Tell us about it.</a>
240 </p>
241 </tal:not-has-bugtracker>
238 </tal:defines>242 </tal:defines>
239
240 </tal:upstream>243 </tal:upstream>
241
242
243 <tal:distro condition="not: view/contextIsProduct">244 <tal:distro condition="not: view/contextIsProduct">
244
245 To file a bug for this distribution, visit its official bug245 To file a bug for this distribution, visit its official bug
246 tracker.246 tracker.
247
248 </tal:distro>247 </tal:distro>
249 </tal:has-context>248 </tal:has-context>
250
251 <tal:project condition="view/contextIsProject">249 <tal:project condition="view/contextIsProject">
252
253 <p class="informational message"250 <p class="informational message"
254 condition="not: context/required:launchpad.Edit"251 condition="not: context/required:launchpad.Edit">
255 >252 There are no projects registered for <span
256 There are no projects registered for253 tal:replace="context/displayname">project displayname</span>
257 <span tal:replace="context/displayname">project displayname</span>
258 that use Launchpad to track bugs.254 that use Launchpad to track bugs.
259 </p>255 </p>
260256 <tal:not-has-products tal:condition="not: context/products">
261 <tal:admin-warning condition="context/required:launchpad.Edit">257 <tal:admin-warning condition="context/required:launchpad.Edit">
262 <p tal:condition="not: context/products" class="warning message">258 <p class="warning message">
263 There are no projects registered for259 There are no projects registered for <span
264 <span tal:replace="context/displayname">project displayname</span>.260 tal:replace="context/displayname">project
265 <br />261 displayname</span>.
266 You need to <a href="+newproduct">register another project that is262 <br />
267 part of <tal:project replace="context/displayname" /></a> or263 You need to <a href="+newproduct" tal:attributes="href
268 associate an existing project with it.264 context/fmt:url/+newproduct">register another project that
269 </p>265 is part of <tal:project replace="context/displayname"
270 </tal:admin-warning>266 /></a> or associate an existing project with it.
271267 </p>
268 </tal:admin-warning>
269 </tal:not-has-products>
272 <tal:has-products condition="context/products">270 <tal:has-products condition="context/products">
273
274 <tal:plural condition="python:context.products.count() > 1">271 <tal:plural condition="python:context.products.count() > 1">
275 <p id="product-list-summary">272 <p id="product-list-summary">
276 There are <tal:count replace="context/products/count" /> projects273 There are <tal:count replace="context/products/count" /> projects
@@ -285,55 +282,47 @@
285 <p>282 <p>
286 The projects that are part of283 The projects that are part of
287 <tal:project replace="context/displayname" />284 <tal:project replace="context/displayname" />
288 are listed below, along with285 are listed below, along with the source packages with
289 the source packages with which they are registered and their286 which they are registered and their external bug trackers.
290 external bug trackers. If you can't find an appropriate place287 If you can't find an appropriate place to file your bug,
291 to file your bug, please try contacting the administrator of288 please try contacting the administrator of <tal:project
292 <tal:project replace="context/displayname" />.289 replace="context/displayname" />.
293 </p>290 </p>
294 </tal:plural>291 </tal:plural>
295 <tal:singular condition="python:context.products.count() == 1">292 <tal:singular condition="python:context.products.count() == 1">
296 <p id="product-list-summary">293 <p id="product-list-summary">
297 There is 1 project registered as part of294 There is 1 project registered as part of <tal:project
298 <tal:project replace="context/displayname">Project</tal:project>295 replace="context/displayname">Project</tal:project> but it
299 but it does not use Launchpad as its bug tracker.296 does not use Launchpad as its bug tracker.
300 </p>297 </p>
301 <p>298 <p>
302 The details of the project are shown below, along with any source299 The details of the project are shown below, along with any
303 packages with which it is registered and its external bug tracker,300 source packages with which it is registered and its
304 if it uses one. If you can't find an appropriate place to file301 external bug tracker, if it uses one. If you can't find an
305 your bug, please contact the administrator of302 appropriate place to file your bug, please contact the
306 <tal:project replace="context/displayname">Project</tal:project>.303 administrator of <tal:project
304 replace="context/displayname">Project</tal:project>.
307 </p>305 </p>
308 </tal:singular>306 </tal:singular>
309
310 <ul class="product-bug-options" tal:repeat="product context/products">307 <ul class="product-bug-options" tal:repeat="product context/products">
311 <li condition="product/official_malone">308 <li condition="product/official_malone">
312 <tal:link replace="structure product/fmt:link" />309 <tal:link replace="structure product/fmt:link" />
313310 <ul class="bulleted">
314 <ul>
315 <tal:external-tracker311 <tal:external-tracker
316 define="bugtracker product/getExternalBugTracker">312 define="bugtracker product/getExternalBugTracker">
317
318 <li tal:condition="bugtracker">313 <li tal:condition="bugtracker">
319 External bug tracker:314 External bug tracker: <a tal:replace="structure
320 <a tal:attributes="href bugtracker/baseurl"315 bugtracker/fmt:external-title-link" />.
321 tal:content="bugtracker/title">
322 Bug Tracker
323 </a>.
324 </li>316 </li>
325
326 <li tal:condition="not: bugtracker">317 <li tal:condition="not: bugtracker">
327 <tal:product replace="product/displayname">318 <tal:product replace="product/displayname">
328 Project319 Project
329 </tal:product>320 </tal:product>
330 does not use an external bug tracker or has not registered321 does not use an external bug tracker or has not registered
331 it with launchpad.322 it with launchpad.
332 </li>323 </li>
333 </tal:external-tracker>324 </tal:external-tracker>
334
335 <tal:packages define="packages product/distrosourcepackages">325 <tal:packages define="packages product/distrosourcepackages">
336
337 <li tal:condition="packages">326 <li tal:condition="packages">
338 <ul tal:repeat="package packages">327 <ul tal:repeat="package packages">
339 <li class="source package">328 <li class="source package">
@@ -343,34 +332,29 @@
343 replace="package/distribution/displayname" />332 replace="package/distribution/displayname" />
344 <tal:packagename replace="package/sourcepackagename" />333 <tal:packagename replace="package/sourcepackagename" />
345 </a>334 </a>
346 (<a335 (<a tal:attributes="href
347 tal:attributes="href string:${package/fmt:url}/+filebug"336 package/fmt:url/+filebug">File a bug here</a>)
348 >File a bug here</a>)
349 </li>337 </li>
350 </ul>338 </ul>
351 </li>339 </li>
352
353 <li tal:condition="not: packages">340 <li tal:condition="not: packages">
354 <tal:product replace="product/displayname">341 <tal:product replace="product/displayname">
355 Project342 Project
356 </tal:product>343 </tal:product>
357 is not registered with any source packages. You can help by344 is not registered with any source packages. You can
358 <a tal:attributes="href string:${product/development_focus/fmt:url}/+ubuntupkg">linking them for us.</a>345 help by <a tal:attributes="href
346 product/development_focus/fmt:url/+ubuntupkg">linking
347 them for us.</a>
359 </li>348 </li>
360
361 </tal:packages>349 </tal:packages>
362 </ul>350 </ul>
363 </li>351 </li>
364 </ul>352 </ul>
365
366 </tal:has-products>353 </tal:has-products>
367
368 </tal:project>354 </tal:project>
369 </tal:not_uses_malone>355 </tal:not_uses_malone>
370
371</metal:not_uses_malone>356</metal:not_uses_malone>
372357
373
374<metal:bug_reporting_guidelines define-macro="bug_reporting_guidelines">358<metal:bug_reporting_guidelines define-macro="bug_reporting_guidelines">
375 <tr tal:define="guidelines view/bug_reporting_guidelines"359 <tr tal:define="guidelines view/bug_reporting_guidelines"
376 tal:condition="guidelines">360 tal:condition="guidelines">
@@ -384,7 +368,7 @@
384</metal:bug_reporting_guidelines>368</metal:bug_reporting_guidelines>
385369
386<metal:similar-bugs define-macro="display-similar-bugs">370<metal:similar-bugs define-macro="display-similar-bugs">
387 <ul id="similar-bugs" style="list-style: none; margin-left: 0; margin-bottom: 0">371 <ul id="similar-bugs">
388 <li tal:repeat="bug view/similar_bugs" class="similar-bug">372 <li tal:repeat="bug view/similar_bugs" class="similar-bug">
389 <table tal:define="bugtask python:view.getRelevantBugTask(bug)">373 <table tal:define="bugtask python:view.getRelevantBugTask(bug)">
390 <tbody>374 <tbody>
@@ -411,51 +395,42 @@
411 >Bug title here</a>395 >Bug title here</a>
412 </label>396 </label>
413 </div>397 </div>
414
415 <div class="lesser" style="margin-bottom: 0.2em">398 <div class="lesser" style="margin-bottom: 0.2em">
416 <span class="lesser">399 <span class="lesser">
417 <tal:bugtask-status tal:condition="bugtask">400 <tal:bugtask-status tal:condition="bugtask">
418 <span tal:attributes="class string:status${bugtask/status/name}"401 <span tal:attributes="class string:status${bugtask/status/name}"
419 ><tal:status content="bugtask/status/title" /></span>402 ><tal:status content="bugtask/status/title" /></span>
420 </tal:bugtask-status>403 </tal:bugtask-status>
421
422 <tal:no-bugtask condition="not: bugtask">404 <tal:no-bugtask condition="not: bugtask">
423 <tal:closed condition="bug/is_complete">Closed</tal:closed>405 <tal:closed condition="bug/is_complete">Closed</tal:closed>
424 <tal:open condition="not:bug/is_complete">Open</tal:open>406 <tal:open condition="not:bug/is_complete">Open</tal:open>
425 </tal:no-bugtask>407 </tal:no-bugtask>
426
427 (<tal:comments replace="bug/comment_count" />408 (<tal:comments replace="bug/comment_count" />
428 <tal:one_comment condition="python: bug.comment_count == 1"409 <tal:one_comment condition="python: bug.comment_count == 1"
429 replace="string: comment"410 replace="string: comment"
430 /><tal:plural_comments411 /><tal:plural_comments
431 condition="python: bug.comment_count != 1"412 condition="python: bug.comment_count != 1"
432 replace="string: comments" />)413 replace="string: comments" />)
433
434 last updated414 last updated
435 <tal:last-updated415 <tal:last-updated
436 content="bug/date_last_updated/fmt:approximatedate">416 content="bug/date_last_updated/fmt:approximatedate">
437 2007-07-03417 2007-07-03
438 </tal:last-updated>418 </tal:last-updated>
439
440 <a class="view-bug-link" tal:attributes="href bug/fmt:url"419 <a class="view-bug-link" tal:attributes="href bug/fmt:url"
441 >view this bug</a>420 >view this bug</a>
442 </span>421 </span>
443 </div>422 </div>
444
445 <div class="duplicate-details"423 <div class="duplicate-details"
446 tal:attributes="id string:details-for-bug-${bug/id}">424 tal:attributes="id string:details-for-bug-${bug/id}">
447
448 <div class="lesser" style="margin-bottom: 0.5em;"425 <div class="lesser" style="margin-bottom: 0.5em;"
449 tal:define="description bug/description/fmt:shorten/500/fmt:obfuscate-email/fmt:text-to-html"426 tal:define="description bug/description/fmt:shorten/500/fmt:obfuscate-email/fmt:text-to-html"
450 tal:content="structure description" />427 tal:content="structure description" />
451
452 <div class="lesser">428 <div class="lesser">
453 <form action="."429 <form action="."
454 tal:attributes="action view/action_url"430 tal:attributes="action view/action_url"
455 method="post"431 method="post"
456 accept-charset="UTF-8"432 accept-charset="UTF-8"
457 class="this-is-my-bug-form">433 class="this-is-my-bug-form">
458
459 <span style="padding-left: 1.5em">434 <span style="padding-left: 1.5em">
460 <input type="hidden"435 <input type="hidden"
461 name="field.bug_already_reported_as"436 name="field.bug_already_reported_as"
@@ -470,13 +445,11 @@
470 tal:attributes="445 tal:attributes="
471 id string:bug-already-reported-as-${bug/id};"446 id string:bug-already-reported-as-${bug/id};"
472 />447 />
473
474 <input type="submit"448 <input type="submit"
475 name="field.actions.this_is_my_bug"449 name="field.actions.this_is_my_bug"
476 tal:attributes="id string:this-is-my-bug-${bug/id}"450 tal:attributes="id string:this-is-my-bug-${bug/id}"
477 value="Yes, this is the bug I'm trying to report"451 value="Yes, this is the bug I'm trying to report"
478 />452 />
479
480 <div tal:attributes="id string:duplicate-overlay-bug-${bug/id}"453 <div tal:attributes="id string:duplicate-overlay-bug-${bug/id}"
481 ></div>454 ></div>
482 </span>455 </span>
@@ -489,45 +462,26 @@
489 </table>462 </table>
490 </li>463 </li>
491 </ul>464 </ul>
492
493 <p tal:define="error_message view/widget_errors/bug_already_reported_as|nothing"465 <p tal:define="error_message view/widget_errors/bug_already_reported_as|nothing"
494 tal:condition="error_message" tal:content="error_message" class="error message" />466 tal:condition="error_message" tal:content="error_message" class="error message" />
495
496</metal:similar-bugs>467</metal:similar-bugs>
497468
498<metal:similar-bugs-and-filebug-form469<metal:similar-bugs-and-filebug-form
499 define-macro="show-similar-bugs-and-filebug-form">470 define-macro="show-similar-bugs-and-filebug-form">
500
501 <tal:similar-bugs condition="view/show_duplicate_list">471 <tal:similar-bugs condition="view/show_duplicate_list">
502 <metal:similar-bugs472 <metal:similar-bugs
503 use-macro="context/@@+filebug-macros/display-similar-bugs" />473 use-macro="context/@@+filebug-macros/display-similar-bugs" />
504474 <tal:comment replace="nothing">
505 <ul style="list-style: none; margin-left: 0">475 We hide this next paragraph if the context doesn't use malone
506 <li style="margin-top: 1em">476 because in that situation we're showing the form after an error
507 <tal:comment replace="nothing">477 message and in that context the message makes no sense.
508 We hide this next paragraph if the context doesn't use478 </tal:comment>
509 malone because in that situation we're showing the form479 <p style="margin-top: 1em" tal:condition="view/contextUsesMalone">
510 after an error message and in that context the message480 <input id="bug-not-already-reported" type="button"
511 makes no sense.481 name="field.bug_already_reported_as"
512 </tal:comment>482 value="No, I need to report a new bug" />
513 <table tal:condition="view/contextUsesMalone">483 </p>
514 <tbody>
515 <tr>
516 <td colspan="2">
517 <input
518 id="bug-not-already-reported"
519 type="button"
520 name="field.bug_already_reported_as"
521 value="No, I need to report a new bug" />
522 </td>
523 </tr>
524 </tbody>
525 </table>
526 </li>
527 </ul>
528
529 </tal:similar-bugs>484 </tal:similar-bugs>
530
531 <tal:submit-new-bug>485 <tal:submit-new-bug>
532 <div id="bug_reporting_form">486 <div id="bug_reporting_form">
533 <metal:form use-macro="context/@@launchpad_form/form">487 <metal:form use-macro="context/@@launchpad_form/form">
@@ -544,7 +498,6 @@
544 </metal:form>498 </metal:form>
545 </div>499 </div>
546 </tal:submit-new-bug>500 </tal:submit-new-bug>
547
548</metal:similar-bugs-and-filebug-form>501</metal:similar-bugs-and-filebug-form>
549502
550</tal:root>503</tal:root>
551504
=== modified file 'lib/lp/bugs/templates/bugtarget-macros-search.pt'
--- lib/lp/bugs/templates/bugtarget-macros-search.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtarget-macros-search.pt 2009-09-13 20:19:53 +0000
@@ -2,9 +2,6 @@
2 xmlns:tal="http://xml.zope.org/namespaces/tal"2 xmlns:tal="http://xml.zope.org/namespaces/tal"
3 xmlns:metal="http://xml.zope.org/namespaces/metal"3 xmlns:metal="http://xml.zope.org/namespaces/metal"
4 omit-tag="">4 omit-tag="">
5<metal:block define-macro="sortwidget_label">
6 <label for="orderby">Sorted by:</label>
7</metal:block>
85
9<metal:block define-macro="sortwidget">6<metal:block define-macro="sortwidget">
10 <tal:comment condition="nothing">7 <tal:comment condition="nothing">
@@ -59,11 +56,10 @@
59 tal:attributes="selected python:orderby == '-users_affected_count'"56 tal:attributes="selected python:orderby == '-users_affected_count'"
60 >by number of users affected</option>57 >by number of users affected</option>
61 </select>58 </select>
62
63</metal:block>59</metal:block>
6460
65<metal:block define-macro="simple-search-form">61<metal:block define-macro="simple-search-form">
66<form method="get" name="search" class="primary search" action=""62<form method="get" name="search" class="primary search"
67 tal:attributes="action search_url|string:">63 tal:attributes="action search_url|string:">
68 <tal:searchbox replace="structure view/widgets/searchtext" />64 <tal:searchbox replace="structure view/widgets/searchtext" />
69 <metal:widget use-macro="context/@@+bugtarget-macros-search/sortwidget" />65 <metal:widget use-macro="context/@@+bugtarget-macros-search/sortwidget" />
@@ -82,13 +78,12 @@
82 <div metal:define-slot="extra-search-widgets">78 <div metal:define-slot="extra-search-widgets">
83 </div>79 </div>
84</form>80</form>
8581<tal:comment condition="nothing">
86 <tal:comment condition="nothing">82 bugtarget-bugs.pt is the only template that uses this form in a page
87 bugtarget-bugs.pt is the only template that uses this form in a page83 where the search field should be auto-focused. If another template
88 where the search field should be auto-focused. If another template84 ever falls into this category, the auto-focusing code should be moved
89 ever falls into this category, the auto-focusing code should be moved85 here from bugtarget-bugs.pt, but made optional and off by default.
90 here from bugtarget-bugs.pt, but made optional and off by default.86</tal:comment>
91 </tal:comment>
92
93</metal:block>87</metal:block>
88
94</tal:root>89</tal:root>
9590
=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt 2009-09-13 20:29:46 +0000
@@ -1,5 +1,5 @@
1<div class="portletBody portletContent">1<div xmlns:tal="http://xml.zope.org/namespaces/tal"
22 xmlns:metal="http://xml.zope.org/namespaces/metal">
3<table width="100%">3<table width="100%">
4 <tr>4 <tr>
5 <td><a tal:attributes="href view/getOpenBugsURL">Open</a></td>5 <td><a tal:attributes="href view/getOpenBugsURL">Open</a></td>
@@ -38,5 +38,4 @@
38 <td tal:content="context/all_bugtasks/count">42</td>38 <td tal:content="context/all_bugtasks/count">42</td>
39 </tr>39 </tr>
40</table>40</table>
41
42</div>41</div>
4342
=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt 2009-09-11 13:35:43 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt 2009-09-13 20:39:15 +0000
@@ -36,11 +36,12 @@
36 });36 });
37 });37 });
38 </script>38 </script>
3939 <ul>
40 <p tal:condition="view/show_manage_tags_link"40 <li tal:condition="view/show_manage_tags_link">
41 style="text-align:right">41 <a class="sprite edit"
42 <a tal:attributes="href context/fmt:url/+manage-official-tags">42 tal:attributes="href context/fmt:url/+manage-official-tags">
43 Edit official tags <span class="sprite edit" />43 Edit official tags
44 </a>44 </a>
45 </p>45 </li>
46 </ul>
46</div>47</div>
4748
=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-recently-touched-bugs.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-recently-touched-bugs.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-recently-touched-bugs.pt 2009-09-13 20:53:27 +0000
@@ -6,15 +6,10 @@
6 tal:define="recently_updated_bugtasks view/getMostRecentlyUpdatedBugTasks"6 tal:define="recently_updated_bugtasks view/getMostRecentlyUpdatedBugTasks"
7 tal:condition="recently_updated_bugtasks">7 tal:condition="recently_updated_bugtasks">
8 <h2>Latest bugs touched</h2>8 <h2>Latest bugs touched</h2>
9 <div class="portletBody portletContent">9 <table>
1010 <tbody>
11 <table>11 <tal:per_task repeat="bugtask recently_updated_bugtasks"
12 <tbody>12 replace="structure bugtask/@@+listing-detailed"/>
13 <tal:per_task repeat="bugtask recently_updated_bugtasks"13 </tbody>
14 replace="structure bugtask/@@+listing-detailed"/>14 </table>
15 </tbody>
16 </table>
17
18 </div>
19
20</div>15</div>
2116
=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-search.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-search.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-search.pt 2009-09-13 20:53:27 +0000
@@ -2,25 +2,25 @@
2 xmlns:tal="http://xml.zope.org/namespaces/tal"2 xmlns:tal="http://xml.zope.org/namespaces/tal"
3 xmlns:metal="http://xml.zope.org/namespaces/metal"3 xmlns:metal="http://xml.zope.org/namespaces/metal"
4 xmlns:i18n="http://xml.zope.org/namespaces/i18n"4 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
5 tal:define="bugs_url context/target/fmt:url/+bugs"
5 class="portlet" id="portlet-search">6 class="portlet" id="portlet-search">
6 <h2>Search</h2>7 <h2>Search</h2>
7 <div class="portletBody"8 <form name="bugtask_search" method="GET" tal:attributes="action bugs_url">
8 tal:define="bugs_url string:${context/target/fmt:url}/+bugs">9 <ul>
9 <b>Enter bug ID or keywords:</b><br /><br />10 <li>
10 <form name="bugtask_search" method="GET"11 <label for="field.searchtext">Enter bug ID or keywords:</label>
11 tal:attributes="action bugs_url">12 </li>
12 <input13 <li>
13 id="field.searchtext"14 <input id="field.searchtext" name="field.searchtext" />
14 name="field.searchtext"15 </li>
15 size="6"16 <li>
16 style="width: 90%;"17 <input type="submit" name="search" value="Search" />
17 />18 </li>
18 <input type="submit" name="search" value="Search" />19 </ul>
19 </form>20 </form>
20 <br />21 <ul>
21 <a href="#"22 <li>
22 tal:content="string:Show all open bugs"23 <a tal:attributes="href bugs_url">Show all open bugs</a>
23 tal:attributes="href bugs_url">Show all Mozilla Firefox bugs</a>24 </li>
24 </div>25 </ul>
25
26</div>26</div>
2727
=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt 2009-09-13 20:39:15 +0000
@@ -1,13 +1,11 @@
1<div xmlns:tal="http://xml.zope.org/namespaces/tal"1<div xmlns:tal="http://xml.zope.org/namespaces/tal"
2 xmlns:metal="http://xml.zope.org/namespaces/metal"2 xmlns:metal="http://xml.zope.org/namespaces/metal"
3 xmlns:i18n="http://xml.zope.org/namespaces/i18n"3 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
4 class="portletBody"
5 tal:define="official_tags view/official_tags;4 tal:define="official_tags view/official_tags;
6 other_tags view/other_tags"5 other_tags view/other_tags"
7 tal:condition="python: official_tags or other_tags">6 tal:condition="python: official_tags or other_tags">
8 <div class="section" tal:condition="official_tags">7 <div class="section" tal:condition="official_tags">
9 <h2>Official tags</h2>8 <h2>Official tags</h2>
10
11 <table width="100%">9 <table width="100%">
12 <tr tal:repeat="bug_tag_info official_tags">10 <tr tal:repeat="bug_tag_info official_tags">
13 <td width="100%">11 <td width="100%">
@@ -20,11 +18,9 @@
20 </tr>18 </tr>
21 </table>19 </table>
22 </div>20 </div>
23
24 <div class="section" tal:condition="other_tags">21 <div class="section" tal:condition="other_tags">
25 <h2 tal:condition="official_tags">Other tags</h2>22 <h2 tal:condition="official_tags">Other tags</h2>
26 <h2 tal:condition="not: official_tags">Tags</h2>23 <h2 tal:condition="not: official_tags">Tags</h2>
27
28 <table width="100%">24 <table width="100%">
29 <tr tal:repeat="bug_tag_info other_tags">25 <tr tal:repeat="bug_tag_info other_tags">
30 <td width="100%">26 <td width="100%">
@@ -38,4 +34,3 @@
38 </table>34 </table>
39 </div>35 </div>
40</div>36</div>
41