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
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in 2010-03-02 04:29:04 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in 2010-04-07 14:59:29 +0000
@@ -1385,3 +1385,6 @@
1385.distromirrorstatusTWODAYSBEHIND {color: red;}1385.distromirrorstatusTWODAYSBEHIND {color: red;}
1386.distromirrorstatusONEWEEKBEHIND {color: red;}1386.distromirrorstatusONEWEEKBEHIND {color: red;}
1387.distromirrorstatusUNKNOWN {color: grey;}1387.distromirrorstatusUNKNOWN {color: grey;}
1388
1389tr.bug-branch-summary td { padding: 0px 6px; }
1390tr.bug-branch-summary td.first { padding-left: 0px; }
13881391
=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-03-15 20:28:52 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-04-07 14:59:29 +0000
@@ -544,7 +544,7 @@
544 >>> nopriv_browser.open(bmp_url)544 >>> nopriv_browser.open(bmp_url)
545 >>> print_bugs_and_specs(nopriv_browser)545 >>> print_bugs_and_specs(nopriv_browser)
546 Linked bug reports and blueprints546 Linked bug reports and blueprints
547 Bug #...: Bug for linking (Undecided – New)547 Bug #...: Bug for linking Undecided New
548548
549549
550Target branch edge cases550Target branch edge cases
551551
=== modified file 'lib/lp/code/stories/branches/xx-bug-branch-links.txt'
--- lib/lp/code/stories/branches/xx-bug-branch-links.txt 2010-02-22 22:11:07 +0000
+++ lib/lp/code/stories/branches/xx-bug-branch-links.txt 2010-04-07 14:59:29 +0000
@@ -56,7 +56,7 @@
56 >>> browser.getControl('Bug #').value = "9"56 >>> browser.getControl('Bug #').value = "9"
57 >>> browser.getControl('Continue').click()57 >>> browser.getControl('Continue').click()
58 >>> printBugBranchLinks(browser)58 >>> printBugBranchLinks(browser)
59 Bug #9: Thunderbird crashes (Unknown – Unknown)59 Bug #9: Thunderbird crashes Unknown Unknown
6060
61Attempting to link to the same bug again gives no error.61Attempting to link to the same bug again gives no error.
6262
@@ -91,7 +91,7 @@
91 >>> browser.open(91 >>> browser.open(
92 ... 'http://code.launchpad.dev/~name12/gnome-terminal/klingon')92 ... 'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
93 >>> printBugBranchLinks(browser)93 >>> printBugBranchLinks(browser)
94 Bug #9: Thunderbird crashes (Unknown – Unknown)94 Bug #9: Thunderbird crashes Unknown Unknown
9595
96... but an anonymous user cannot.96... but an anonymous user cannot.
9797
@@ -130,7 +130,7 @@
130130
131 >>> browser.getLink('~name12/gnome-terminal/scanned').click()131 >>> browser.getLink('~name12/gnome-terminal/scanned').click()
132 >>> printBugBranchLinks(browser)132 >>> printBugBranchLinks(browser)
133 Bug #11: Make Jokosher use autoaudiosink (Undecided – New)133 Bug #11: Make Jokosher use autoaudiosink Undecided New
134134
135135
136Quick branch registration136Quick branch registration
137137
=== modified file 'lib/lp/code/templates/branch-macros.pt'
--- lib/lp/code/templates/branch-macros.pt 2009-11-13 01:40:52 +0000
+++ lib/lp/code/templates/branch-macros.pt 2010-04-07 14:59:29 +0000
@@ -100,33 +100,35 @@
100 show_edit - show the edit form100 show_edit - show the edit form
101 </tal:comment>101 </tal:comment>
102102
103 <tal:bug-tasks repeat="bug view/linked_bugs">103 <table>
104 <div tal:condition="bug/required:launchpad.View"104 <tal:bug-tasks repeat="bug view/linked_bugs">
105 tal:define="bugtask bug/bugtask;105 <tr tal:condition="bug/required:launchpad.View"
106 show_edit show_edit|nothing;"106 tal:define="bugtask bug/bugtask;
107 tal:attributes="id string:buglink-${bug/id}">107 show_edit show_edit|nothing;"
108 <div class="bug-branch-summary">108 tal:attributes="id string:buglink-${bug/id}"
109 <tal:link replace="structure bugtask/fmt:link" />109 class="bug-branch-summary">
110 (<span tal:content="bugtask/importance/title"110 <td tal:content="structure bugtask/fmt:link" class="first"/>
111 tal:attributes="class string:importance${bugtask/importance/name}">111 <td>
112 Critical112 <span tal:content="bugtask/importance/title"
113 </span>113 tal:attributes="class string:importance${bugtask/importance/name}"
114 &ndash;114 >Critical</span>
115 <span tal:content="bugtask/status/title"115 </td>
116 tal:attributes="class string:status${bugtask/status/name}">116 <td>
117 Confirmed117 <span tal:content="bugtask/status/title"
118 </span>)118 tal:attributes="class string:status${bugtask/status/name}"
119 <tal:show-edit condition="show_edit|nothing">119 >Triaged</span>
120 <a title="Remove link"120 </td>
121 class="delete-buglink"121 <td tal:condition="show_edit|nothing">
122 tal:attributes="href string:+bug/${bug/id}/+delete;122 <a title="Remove link"
123 id string:delete-buglink-${bug/id}">123 class="delete-buglink"
124 <img src="/@@/remove"/>124 tal:attributes="href string:+bug/${bug/id}/+delete;
125 </a>125 id string:delete-buglink-${bug/id}">
126 </tal:show-edit>126 <img src="/@@/remove"/>
127 </div>127 </a>
128 </div>128 </td>
129 </tal:bug-tasks>129 </tr>
130 </tal:bug-tasks>
131 </table>
130132
131</metal:branch-bug-links>133</metal:branch-bug-links>
132134