Merge lp:~wallyworld/launchpad/link-bugs-in-merge-proposal into lp:launchpad

[Ian Booth]

Move the linked bugs section on the branch merge proposal page to be just below the branch summary section, above the review comments.

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 ...)

[Ian Booth (wallyworld)]

Screenshot of new merge proposal screen:

https://devpad.canonical.com/~ianb/linkedbug.png

[Ian Booth (wallyworld)]

Oops wrong server - use this one:

https://people.canonical.com/~ianb/linkedbug.png

[Ian Booth (wallyworld)]

UI review suggested moving Linked Bugs section to below the Description, above the Comments

This has been done. I think it needs a horizontal separator line though, between the Linked Bugs and the "Add a Comment" button.

See https://devpad.canonical.com/~ianb/linkedbug2.png

[Paul Hummer (rockstar)]

Much better! Thanks for the changes!

review: Approve (ui)

[Ian Booth (wallyworld)]

This was a duplicate review request. Paul Hummer has approved the changes.

review: Approve (ui)

[Tim Penhey (thumper)]

review: Approve

[Tim Penhey (thumper)]

The tal:condition="view/has_bug_or_spec" expression on the div before the title should be moved to the out-most div that has the class yui-g. That way we don't get extra whitespace if there are no bugs or blueprints.

[Ian Booth (wallyworld)]

As per discussion with Tim, the related bugs section has been made to line up with the description text and the section header has been removed.

See screenshot: http://people.canonical.com/~ianb/linkedbug3.png

[Tim Penhey (thumper)]

Picture?

[Tim Penhey (thumper)]

Sorry, didn't see the picture as the mail didn't thread properly. This looks good to me.

review: Approve

[Tim Penhey (thumper)]

Ian, did Paul get back to you about this?

[Ian Booth (wallyworld)]

Yes. I pinged him this morning and he said it was all ok. I've already
submitted the job to ec2

On 15/09/10 14:31, Tim Penhey wrote:
> Ian, did Paul get back to you about this?

[Ian Booth (wallyworld)]

Running through ec2 and a doc test failed (xx-branchmergeproposals.txt) due to the removal of the "Linked Bugs" header text from the page. Doc test now fixed (one line deletion).

=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-05-27 02:19:27 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-09-15 06:04:51 +0000
@@ -543,7 +543,6 @@
 
     >>> nopriv_browser.open(bmp_url)
     >>> print_bugs_and_specs(nopriv_browser)
-    Linked bug reports and blueprints
     Bug #...: Bug for linking Undecided New
 
 

=== 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-15 06:04:51 +0000
@@ -46,6 +46,10 @@
     #proposal-summary td {
       padding-left: 0.5em;
     }
+    .related-bugs-list {
+      padding-left: 20px;
+      padding-bottom: 10px;
+    }
     /* A page-specific fix for inline text are editing to line up box. */
     #edit-description .yui-ieditor-input { top: 0; }
     #edit-commit_message .yui-ieditor-input { top: 0; }
@@ -138,6 +142,18 @@
   </tal:has-description>
   </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">
@@ -176,36 +192,19 @@
   </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>