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

[Paul Hummer]

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.

[Brad Crittenden (bac)]

review: Approve (code)

=== 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 @@
 .distromirrorstatusTWODAYSBEHIND {color: red;}
 .distromirrorstatusONEWEEKBEHIND {color: red;}
 .distromirrorstatusUNKNOWN {color: grey;}
+
+tr.bug-branch-summary td { padding: 0px 6px; }
+tr.bug-branch-summary td.first { padding-left: 0px; }

=== 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 @@
     >>> nopriv_browser.open(bmp_url)
     >>> print_bugs_and_specs(nopriv_browser)
     Linked bug reports and blueprints
-    Bug #...: Bug for linking (Undecided – New)
+    Bug #...: Bug for linking Undecided New
 
 
 Target branch edge cases

=== 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 @@
     >>> browser.getControl('Bug #').value = "9"
     >>> browser.getControl('Continue').click()
     >>> printBugBranchLinks(browser)
-    Bug #9: Thunderbird crashes (Unknown – Unknown)
+    Bug #9: Thunderbird crashes Unknown Unknown
 
 Attempting to link to the same bug again gives no error.
 
@@ -91,7 +91,7 @@
     >>> browser.open(
     ...     'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
     >>> printBugBranchLinks(browser)
-    Bug #9: Thunderbird crashes (Unknown – Unknown)
+    Bug #9: Thunderbird crashes Unknown Unknown
 
 ... but an anonymous user cannot.
 
@@ -130,7 +130,7 @@
 
     >>> browser.getLink('~name12/gnome-terminal/scanned').click()
     >>> printBugBranchLinks(browser)
-    Bug #11: Make Jokosher use autoaudiosink (Undecided – New)
+    Bug #11: Make Jokosher use autoaudiosink Undecided New
 
 
 Quick branch registration

=== 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 @@
       show_edit - show the edit form
   </tal:comment>
 
-  <tal:bug-tasks repeat="bug view/linked_bugs">
-    <div tal:condition="bug/required:launchpad.View"
-         tal:define="bugtask bug/bugtask;
-                     show_edit show_edit|nothing;"
-         tal:attributes="id string:buglink-${bug/id}">
-      <div class="bug-branch-summary">
-      <tal:link replace="structure bugtask/fmt:link" />
-      (<span tal:content="bugtask/importance/title"
-             tal:attributes="class string:importance${bugtask/importance/name}">
-         Critical
-       </span>
-       &ndash;
-       <span tal:content="bugtask/status/title"
-             tal:attributes="class string:status${bugtask/status/name}">
-         Confirmed
-       </span>)
-       <tal:show-edit condition="show_edit|nothing">
-         <a title="Remove link"
-            class="delete-buglink"
-            tal:attributes="href string:+bug/${bug/id}/+delete;
-                            id string:delete-buglink-${bug/id}">
-           <img src="/@@/remove"/>
-         </a>
-       </tal:show-edit>
-       </div>
-    </div>
-  </tal:bug-tasks>
+  <table>
+    <tal:bug-tasks repeat="bug view/linked_bugs">
+      <tr tal:condition="bug/required:launchpad.View"
+           tal:define="bugtask bug/bugtask;
+                       show_edit show_edit|nothing;"
+           tal:attributes="id string:buglink-${bug/id}"
+           class="bug-branch-summary">
+        <td tal:content="structure bugtask/fmt:link" class="first"/>
+        <td>
+          <span tal:content="bugtask/importance/title"
+                tal:attributes="class string:importance${bugtask/importance/name}"
+                >Critical</span>
+        </td>
+        <td>
+          <span tal:content="bugtask/status/title"
+                tal:attributes="class string:status${bugtask/status/name}"
+                >Triaged</span>
+        </td>
+        <td tal:condition="show_edit|nothing">
+          <a title="Remove link"
+             class="delete-buglink"
+             tal:attributes="href string:+bug/${bug/id}/+delete;
+                             id string:delete-buglink-${bug/id}">
+            <img src="/@@/remove"/>
+          </a>
+        </td>
+      </tr>
+    </tal:bug-tasks>
+  </table>
 
 </metal:branch-bug-links>