Merge lp:~ivo-kracht/launchpad/bug-436663 into lp:launchpad

[Ivo Kracht]

moving the "related bugs and blueprints" section further up on the page to make it more visible

Moved the bug- and blueprint links further up so they are much easier to see. It appears now dircetly under “To merge this branch:“ in the merge proposal.

Pre-imp call with adeuring

test:
./bin/test code -vvt xx-branchmergeproposals.txt

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/stories/branches/xx-branchmergeproposals.txt
  lib/lp/code/templates/branchmergeproposal-index.pt
  lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt

./lib/lp/code/stories/branches/xx-branchmergeproposals.txt
      16: Could not compile:
        BranchSubscriptionNotificationLevel, CodeReviewNotificationLevel)

This was not created by my changes, I did not fix it.

[Jelmer Vernooij (jelmer)]

Thanks, the code for this looks good.

It would be nice if a UI reviewer could also have a look at the UI side of this change.

review: Approve (code)

[Curtis Hovey (sinzui)]

This is good UI improvement and I want it to land. This page uses Lp 2.0 layout design, which is a separate problem and I suspect we will not fix.

review: Approve (ui)

=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2012-06-16 13:27:45 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2012-06-28 14:24:30 +0000
@@ -201,7 +201,8 @@
 
     >>> nopriv_browser.open(klingon_proposal)
     >>> nopriv_browser.getLink('Add a review or comment').click()
-    >>> nopriv_browser.getControl(name='field.comment').value = "Don't like it"
+    >>> nopriv_browser.getControl(name='field.comment').value = (
+    ...     "Don't like it")
     >>> nopriv_browser.getControl(name='field.vote').getControl(
     ...     'Disapprove').click()
     >>> nopriv_browser.getControl('Save Comment').click()
@@ -209,7 +210,8 @@
     ...     nopriv_browser.contents, 'code-review-votes')
     >>> print extract_text(pending)
     Reviewer                         Review Type  Date Requested Status
-    No Privileges Person (community)                             Disapprove ...
+    No Privileges Person (community)                             Disapprove
+    ...
 
 People can claim reviews for teams of which they are a member.
 
@@ -545,7 +547,7 @@
 
     >>> nopriv_browser.open(bmp_url)
     >>> print_bugs_and_specs(nopriv_browser)
-    Bug #...: Bug for linking Undecided New
+    Related bugs and blueprints: Bug #...: Bug for linking Undecided New
 
 
 Target branch edge cases
@@ -659,7 +661,8 @@
 Preview diff generation status
 ------------------------------
 
-    >>> update = find_tag_by_id(nopriv_browser.contents, 'diff-pending-update')
+    >>> update = find_tag_by_id(
+    ...     nopriv_browser.contents, 'diff-pending-update')
     >>> print extract_text(update)
     Updating diff...
     An updated diff will be available in a few minutes.  Reload to see the

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2012-05-15 16:51:06 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2012-06-28 14:24:30 +0000
@@ -114,18 +114,6 @@
     <tal:widget replace="structure view/description_html"/>
   </div>
 
-  <div class="yui-g" tal:condition="view/has_bug_or_spec">
-      <div id="related-bugs-and-blueprints" class="related-bugs-list"
-        tal:define="branch context/source_branch">
-        <div class="actions">
-          <metal:bug-branch-links use-macro="branch/@@+macros/bug-branch-links"/>
-        </div>
-        <div class="actions">
-          <metal:spec-branch-links use-macro="branch/@@+macros/spec-branch-links"/>
-        </div>
-      </div>
-  </div>
-
   <div class="yui-g">
     <tal:not-logged-in condition="not: view/user">
       <div align="center" id="add-comment-login-first">

=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2012-01-03 15:38:19 +0000
+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2012-06-28 14:24:30 +0000
@@ -143,5 +143,12 @@
       <th>To merge this branch:</th>
       <td>bzr merge <span class="branch-url" tal:content="context/source_branch/bzr_identity" /></td>
     </tr>
+    <tr id="related-bugs-and-blueprints" tal:condition="view/has_bug_or_spec" >
+      <th>Related bugs and blueprints:</th>
+      <td tal:define="branch context/source_branch">
+            <metal:bug-branch-links use-macro="branch/@@+macros/bug-branch-links"/>
+            <metal:spec-branch-links use-macro="branch/@@+macros/spec-branch-links"/>
+      </td>
+    </tr>
   </tbody>
 </table>