launchpad-reviewers team mailing list archive

[Ian Booth <ian.booth@xxxxxxxxxxxxx>]

You have been requested to review the proposed merge of lp:~wallyworld/launchpad/link-bugs-in-merge-proposal into lp:launchpad/devel.

Move the linked bugs section on the branch merge proposal page to be just below the branch summary section, above the review comments. I looked at putting the linked bugs in the unused space to the right of the branch summary details but this caused the branch and bug links in both sections to wrap. I added some horizontal white space just above the newly placed linked bugs section to make the page look better. The white space was added by wrapping the linked bugs div inside a <div class="first"> but I'm expecting there may be a better way - if so, I'll change it.

Tests:
    - no changes or new tests required.
    - ran the doc and windmill and unit tests for "branchmergeproposal" and
      "branchmergeproposals" (bin/test -t ...)

-- 
https://code.launchpad.net/~wallyworld/launchpad/link-bugs-in-merge-proposal/+merge/34826
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wallyworld/launchpad/link-bugs-in-merge-proposal into lp:launchpad/devel.

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2010-07-15 13:57:39 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2010-09-09 02:14:43 +0000
@@ -139,6 +139,24 @@
   </div>
 
   <div class="yui-g">
+      <div class="first">
+        <div tal:condition="view/has_bug_or_spec">
+          <div id="related-bugs-and-blueprints"
+            tal:define="branch context/source_branch">
+            <h2>Linked bug reports and blueprints</h2>
+            <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>
+  </div>
+
+  <div class="yui-g">
     <tal:not-logged-in condition="not: view/user">
       <div align="center" id="add-comment-login-first">
         To post a comment you must <a href="+login">log in</a>.
@@ -176,36 +194,20 @@
   </tal:logged-in>
 
   <div class="yui-g">
-    <div class="yui-u first">
-      <div id="source-revisions"
-           tal:condition="not: context/queue_status/enumvalue:MERGED">
-
-        <tal:history-available condition="context/source_branch/revision_count"
-                               define="branch context/source_branch;
-                                       revisions view/unlanded_revisions">
-          <h2>Unmerged revisions</h2>
-          <metal:landing-target use-macro="branch/@@+macros/branch-revisions"/>
-        </tal:history-available>
-
-        <tal:remote-branch condition="context/source_branch/branch_type/enumvalue:REMOTE">
-          <h2>Unmerged revisions</h2>
-          <p>Recent revisions are not available due to the source branch being remote.</p>
-        </tal:remote-branch>
-      </div>
-    </div>
-
-    <div class="yui-u" tal:condition="view/has_bug_or_spec">
-      <div id="related-bugs-and-blueprints"
-        tal:define="branch context/source_branch">
-        <h2>Linked bug reports and blueprints</h2>
-        <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 id="source-revisions"
+         tal:condition="not: context/queue_status/enumvalue:MERGED">
+
+      <tal:history-available condition="context/source_branch/revision_count"
+                             define="branch context/source_branch;
+                                     revisions view/unlanded_revisions">
+        <h2>Unmerged revisions</h2>
+        <metal:landing-target use-macro="branch/@@+macros/branch-revisions"/>
+      </tal:history-available>
+
+      <tal:remote-branch condition="context/source_branch/branch_type/enumvalue:REMOTE">
+        <h2>Unmerged revisions</h2>
+        <p>Recent revisions are not available due to the source branch being remote.</p>
+      </tal:remote-branch>
     </div>
   </div>