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

[Ivo Kracht]

seperate form for the "Add new address" section

I moved the “Add a new address“ section into a seperate html form. It should now activate the “Add“ button when something is typed into the textbox.

Pre-imp call with adeuring

As far as I (and Abel Deuring) can see there are no tests that check this so I don't list any. I ran all story tests though and there where no errors or failures.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/templates/person-editemails.pt

[Richard Harding (rharding)]

Thanks for the change. Looks good.

review: Approve

=== modified file 'lib/lp/registry/templates/person-editemails.pt'
--- lib/lp/registry/templates/person-editemails.pt	2009-09-16 23:54:18 +0000
+++ lib/lp/registry/templates/person-editemails.pt	2012-06-26 14:45:44 +0000
@@ -28,8 +28,7 @@
             <metal:block use-macro="context/@@launchpad_form/widget_row" />
           </tal:widget>
           <tr>
-            <td></td>
-            <td>
+            <td colspan="2">
               <input
                  tal:replace="structure view/action_set_preferred/render" />
               <input tal:replace="structure
@@ -52,11 +51,18 @@
           </tr>
         </tal:block>
 
+      </table>
+    </metal:widgets>
+    <metal:widgets fill-slot="buttons" />
+  </div>
+
+  <div metal:use-macro="context/@@launchpad_form/form">
+    <metal:widgets fill-slot="widgets">
+      <table class="form">
         <tal:widget define="widget nocall:view/widgets/newemail">
           <metal:block use-macro="context/@@launchpad_form/widget_row" />
           <tr>
-            <td></td>
-            <td>
+            <td colspan="2">
               <input tal:replace="structure view/action_add_email/render" />
             </td>
           </tr>