Launchpad itself

Merge lp://qastaging/~intellectronica/launchpad/bugs-homepage-searchbox into lp://qastaging/launchpad

  1. bugs-homepage-searchbox
  2. Merge into devel
Proposed by Eleanor Berger
Status: Merged
Approved by: Deryck Hodge
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://qastaging/~intellectronica/launchpad/bugs-homepage-searchbox
Merge into: lp://qastaging/launchpad
Diff against target: 93 lines (+34/-33)
2 files modified
lib/lp/bugs/templates/bugtarget-bugs.pt (+34/-28)
lib/lp/registry/stories/product/xx-product-launchpad-usage.txt (+0/-5)
To merge this branch: bzr merge lp://qastaging/~intellectronica/launchpad/bugs-homepage-searchbox
Reviewer Review Type Date Requested Status
Deryck Hodge (community) code Approve
Edwin Grubbs code ui Pending
Review via email: mp+15007@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Eleanor Berger (intellectronica) wrote :

This branch reformats the details section of the bug target index to make it easier to fit with the search box on the same line. In addition, it now hides the bug tracker if the project uses Launchpad. A test demonstrating that removed feature is removed as well.

Revision history for this message
Deryck Hodge (deryck) wrote :

Looks good to me. Cheers,

deryck

review: Approve (code)

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-bugs.pt'
2--- lib/lp/bugs/templates/bugtarget-bugs.pt 2009-09-22 17:32:58 +0000
3+++ lib/lp/bugs/templates/bugtarget-bugs.pt 2009-11-18 21:15:25 +0000
4@@ -136,39 +136,45 @@
5
6 <div class="portlet" style="float: right; border: none">
7 <ul>
8- <li id="bugtracker">
9- <strong>Bug tracker:</strong>
10- <tal:bugtracker replace="structure view/bugtracker" />
11+ <li id="bugtracker" tal:condition="not: view/uses_launchpad_bugtracker">
12+ <strong>Bug tracker:</strong><br />
13+ <span style="margin-left: 1em">
14+ <tal:bugtracker replace="structure view/bugtracker" />
15+ </span>
16 </li>
17 <li tal:define="bug_supervisor context/bug_supervisor">
18- Bug supervisor:
19- <tal:none condition="not:bug_supervisor">None set</tal:none>
20- <a tal:condition="bug_supervisor"
21- tal:replace="structure bug_supervisor/fmt:link">Bob Johnson</a>
22- <tal:edit-bug-supervisor
23- condition="context/menu:bugs/bugsupervisor|nothing">
24- <a tal:define="link context/menu:bugs/bugsupervisor"
25- tal:condition="link/enabled"
26- tal:attributes="href link/url; title link/text">
27- <img tal:attributes="alt link/text" src="/@@/edit" />
28- </a>
29- </tal:edit-bug-supervisor>
30+ Bug supervisor:<br />
31+ <span style="margin-left: 1em">
32+ <tal:none condition="not:bug_supervisor">None set</tal:none>
33+ <a tal:condition="bug_supervisor"
34+ tal:replace="structure bug_supervisor/fmt:link">Bob Johnson</a>
35+ <tal:edit-bug-supervisor
36+ condition="context/menu:bugs/bugsupervisor|nothing">
37+ <a tal:define="link context/menu:bugs/bugsupervisor"
38+ tal:condition="link/enabled"
39+ tal:attributes="href link/url; title link/text">
40+ <img tal:attributes="alt link/text" src="/@@/edit" />
41+ </a>
42+ </tal:edit-bug-supervisor>
43+ </span>
44 </li>
45 <li tal:define="securitycontact context/security_contact">
46- Security contact:
47- <tal:none condition="not:securitycontact">None set</tal:none>
48- <a tal:condition="securitycontact"
49- tal:replace="structure securitycontact/fmt:link">
50- Billy Anderson
51- </a>
52- <tal:edit-securitycontact
53- condition="context/menu:bugs/securitycontact|nothing">
54- <a tal:define="link context/menu:bugs/securitycontact"
55- tal:condition="link/enabled"
56- tal:attributes="href link/url; title link/text">
57- <img tal:attributes="alt link/text" src="/@@/edit" />
58+ Security contact:<br />
59+ <span style="margin-left: 1em">
60+ <tal:none condition="not:securitycontact">None set</tal:none>
61+ <a tal:condition="securitycontact"
62+ tal:replace="structure securitycontact/fmt:link">
63+ Billy Anderson
64 </a>
65- </tal:edit-securitycontact>
66+ <tal:edit-securitycontact
67+ condition="context/menu:bugs/securitycontact|nothing">
68+ <a tal:define="link context/menu:bugs/securitycontact"
69+ tal:condition="link/enabled"
70+ tal:attributes="href link/url; title link/text">
71+ <img tal:attributes="alt link/text" src="/@@/edit" />
72+ </a>
73+ </tal:edit-securitycontact>
74+ </span>
75 </li>
76 <li>
77 </li>
78
79=== modified file 'lib/lp/registry/stories/product/xx-product-launchpad-usage.txt'
80--- lib/lp/registry/stories/product/xx-product-launchpad-usage.txt 2009-09-23 14:58:12 +0000
81+++ lib/lp/registry/stories/product/xx-product-launchpad-usage.txt 2009-11-18 21:15:25 +0000
82@@ -12,11 +12,6 @@
83 >>> print extract_text(uses)
84 Uses Launchpad for: Answers and Bug Tracking.
85
86- >>> anon_browser.open('http://bugs.launchpad.dev/firefox')
87- >>> print extract_text(
88- ... find_tag_by_id(anon_browser.contents, 'bugtracker'))
89- Bug tracker: Launchpad
90-
91 Only the product registrant and the admins have access to this page.
92
93 >>> anon_browser.getLink('Change details')