Merge lp:~thumper/launchpad/bmp-registration-slot into lp:launchpad

[Tim Penhey]

Move the proposal registrant into the registrant slot.

[Tim Penhey (thumper)]

Moves the proposal of the merge proposal into the registrant slot.

[Michael Hudson-Doyle (mwhudson)]

Fine.

review: Approve

=== modified file 'lib/lp/code/stories/branches/xx-branch-merge-proposals.txt'
--- lib/lp/code/stories/branches/xx-branch-merge-proposals.txt	2009-10-21 13:51:46 +0000
+++ lib/lp/code/stories/branches/xx-branch-merge-proposals.txt	2009-10-21 23:21:17 +0000
@@ -284,7 +284,6 @@
     The proposal's merged revision has been updated.
     >>> print_summary(sample_browser)
     Status: Merged
-    ...
     Merged at revision: 42
     ...
     >>> sample_browser.getLink('~name12/gnome-terminal/klingon').click()

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2009-10-13 15:56:13 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2009-10-21 23:21:17 +0000
@@ -30,6 +30,12 @@
   </script>
 </metal:block>
 
+<tal:registering metal:fill-slot="registering">
+  Proposed by
+  <tal:registrant replace="structure context/registrant/fmt:link"/>
+  <tal:modified replace="context/date_created/fmt:displaydate" />
+</tal:registering>
+
 
 <metal:side fill-slot="side"
             tal:define="context_menu context/menu:context">

=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2009-10-21 13:51:46 +0000
+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2009-10-21 23:21:17 +0000
@@ -20,13 +20,6 @@
         </a>
       </td>
     </tr>
-    <tr>
-      <th>Proposed by:</th>
-      <td>
-        <tal:registrant replace="structure context/registrant/fmt:link"/>
-        <tal:modified replace="context/date_created/fmt:displaydate" />
-      </td>
-    </tr>
     <tal:comment condition="nothing">
       Only show the reviewed section if the state is not superseded.
       Only show the reviewed revision if not rejected.