Launchpad itself

Merge lp:~rockstar/launchpad/branch-bug-display into lp:launchpad

  1. branch-bug-display
  2. Merge into devel
Proposed by Paul Hummer
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~rockstar/launchpad/branch-bug-display
Merge into: lp:launchpad
Diff against target: 120 lines (+36/-31)
4 files modified
lib/canonical/launchpad/icing/style-3-0.css.in (+3/-0)
lib/lp/code/stories/branches/xx-branchmergeproposals.txt (+1/-1)
lib/lp/code/stories/branches/xx-bug-branch-links.txt (+3/-3)
lib/lp/code/templates/branch-macros.pt (+29/-27)
To merge this branch: bzr merge lp:~rockstar/launchpad/branch-bug-display
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+22887@code.launchpad.net

Description of the change

This branch just fixes trivial bug 424894. Basically, we were using a div to
display bug links, and it made it hard to scan down the list to see statuses
and importances, etc. I swapped it to using a table now. I don't think any
tests should fail, but I'll definitely be landing this through ec2.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
2--- lib/canonical/launchpad/icing/style-3-0.css.in 2010-03-02 04:29:04 +0000
3+++ lib/canonical/launchpad/icing/style-3-0.css.in 2010-04-07 14:59:29 +0000
4@@ -1385,3 +1385,6 @@
5 .distromirrorstatusTWODAYSBEHIND {color: red;}
6 .distromirrorstatusONEWEEKBEHIND {color: red;}
7 .distromirrorstatusUNKNOWN {color: grey;}
8+
9+tr.bug-branch-summary td { padding: 0px 6px; }
10+tr.bug-branch-summary td.first { padding-left: 0px; }
11
12=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
13--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-03-15 20:28:52 +0000
14+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-04-07 14:59:29 +0000
15@@ -544,7 +544,7 @@
16 >>> nopriv_browser.open(bmp_url)
17 >>> print_bugs_and_specs(nopriv_browser)
18 Linked bug reports and blueprints
19- Bug #...: Bug for linking (Undecided – New)
20+ Bug #...: Bug for linking Undecided New
21
22
23 Target branch edge cases
24
25=== modified file 'lib/lp/code/stories/branches/xx-bug-branch-links.txt'
26--- lib/lp/code/stories/branches/xx-bug-branch-links.txt 2010-02-22 22:11:07 +0000
27+++ lib/lp/code/stories/branches/xx-bug-branch-links.txt 2010-04-07 14:59:29 +0000
28@@ -56,7 +56,7 @@
29 >>> browser.getControl('Bug #').value = "9"
30 >>> browser.getControl('Continue').click()
31 >>> printBugBranchLinks(browser)
32- Bug #9: Thunderbird crashes (Unknown – Unknown)
33+ Bug #9: Thunderbird crashes Unknown Unknown
34
35 Attempting to link to the same bug again gives no error.
36
37@@ -91,7 +91,7 @@
38 >>> browser.open(
39 ... 'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
40 >>> printBugBranchLinks(browser)
41- Bug #9: Thunderbird crashes (Unknown – Unknown)
42+ Bug #9: Thunderbird crashes Unknown Unknown
43
44 ... but an anonymous user cannot.
45
46@@ -130,7 +130,7 @@
47
48 >>> browser.getLink('~name12/gnome-terminal/scanned').click()
49 >>> printBugBranchLinks(browser)
50- Bug #11: Make Jokosher use autoaudiosink (Undecided – New)
51+ Bug #11: Make Jokosher use autoaudiosink Undecided New
52
53
54 Quick branch registration
55
56=== modified file 'lib/lp/code/templates/branch-macros.pt'
57--- lib/lp/code/templates/branch-macros.pt 2009-11-13 01:40:52 +0000
58+++ lib/lp/code/templates/branch-macros.pt 2010-04-07 14:59:29 +0000
59@@ -100,33 +100,35 @@
60 show_edit - show the edit form
61 </tal:comment>
62
63- <tal:bug-tasks repeat="bug view/linked_bugs">
64- <div tal:condition="bug/required:launchpad.View"
65- tal:define="bugtask bug/bugtask;
66- show_edit show_edit|nothing;"
67- tal:attributes="id string:buglink-${bug/id}">
68- <div class="bug-branch-summary">
69- <tal:link replace="structure bugtask/fmt:link" />
70- (<span tal:content="bugtask/importance/title"
71- tal:attributes="class string:importance${bugtask/importance/name}">
72- Critical
73- </span>
74- &ndash;
75- <span tal:content="bugtask/status/title"
76- tal:attributes="class string:status${bugtask/status/name}">
77- Confirmed
78- </span>)
79- <tal:show-edit condition="show_edit|nothing">
80- <a title="Remove link"
81- class="delete-buglink"
82- tal:attributes="href string:+bug/${bug/id}/+delete;
83- id string:delete-buglink-${bug/id}">
84- <img src="/@@/remove"/>
85- </a>
86- </tal:show-edit>
87- </div>
88- </div>
89- </tal:bug-tasks>
90+ <table>
91+ <tal:bug-tasks repeat="bug view/linked_bugs">
92+ <tr tal:condition="bug/required:launchpad.View"
93+ tal:define="bugtask bug/bugtask;
94+ show_edit show_edit|nothing;"
95+ tal:attributes="id string:buglink-${bug/id}"
96+ class="bug-branch-summary">
97+ <td tal:content="structure bugtask/fmt:link" class="first"/>
98+ <td>
99+ <span tal:content="bugtask/importance/title"
100+ tal:attributes="class string:importance${bugtask/importance/name}"
101+ >Critical</span>
102+ </td>
103+ <td>
104+ <span tal:content="bugtask/status/title"
105+ tal:attributes="class string:status${bugtask/status/name}"
106+ >Triaged</span>
107+ </td>
108+ <td tal:condition="show_edit|nothing">
109+ <a title="Remove link"
110+ class="delete-buglink"
111+ tal:attributes="href string:+bug/${bug/id}/+delete;
112+ id string:delete-buglink-${bug/id}">
113+ <img src="/@@/remove"/>
114+ </a>
115+ </td>
116+ </tr>
117+ </tal:bug-tasks>
118+ </table>
119
120 </metal:branch-bug-links>
121