Merge pull request #3443 from davecivicrm/CRM-14767

CRM-14767 - include option to enter address parts when adding address in...

diff --git a/templates/CRM/Contact/Form/Edit/Address/street_address.tpl b/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
index 0c80b5b247dd91332c21a71a0e39181bd89149a9..9b51e387918b28948a6d3ab0346fc1672fac0875 100644 (file)
--- a/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
@@ -24,37 +24,37 @@
  +--------------------------------------------------------------------+
 *}
 {if !empty($form.address.$blockId.street_address)}
-    <tr id="streetAddress_{$blockId}">
-        <td colspan="2">
-           {$form.address.$blockId.street_address.label} {help id="id-street-address" file="CRM/Contact/Form/Contact.hlp"}<br />
-           {$form.address.$blockId.street_address.html}
-        {if $parseStreetAddress eq 1 && $action eq 2}
-           &nbsp;&nbsp;<a href="#" title="{ts}Edit Address Elements{/ts}" onClick="processAddressFields( 'addressElements' , '{$blockId}', 1 );return false;">{ts}Edit Address Elements{/ts}</a>
-           {help id="id-edit-street-elements" file="CRM/Contact/Form/Contact.hlp"}
-        {/if}
-        </td>
-    </tr>
+   <tr id="streetAddress_{$blockId}">
+       <td colspan="2">
+                       {$form.address.$blockId.street_address.label} {help id="id-street-address" file="CRM/Contact/Form/Contact.hlp"}<br />
+                       {$form.address.$blockId.street_address.html}
+                 {if $parseStreetAddress eq 1 && ($action eq 1 || $action eq 2)}
+          &nbsp;&nbsp;<a href="#" title="{ts}Edit Address Elements{/ts}" onClick="processAddressFields( 'addressElements' , '{$blockId}', 1 );return false;">{ts}Edit Address Elements{/ts}</a>
+          {help id="id-edit-street-elements" file="CRM/Contact/Form/Contact.hlp"}
+      {/if}
+       </td>
+       </tr>
 
-    {if $parseStreetAddress eq 1 && $action eq 2}
-           <tr id="addressElements_{$blockId}" class=hiddenElement>
-               <td>
-                  {$form.address.$blockId.street_number.label}<br />
-                  {$form.address.$blockId.street_number.html}
-                </td>
+  {if $parseStreetAddress eq 1 && ($action eq 1 || $action eq 2)}
+               <tr id="addressElements_{$blockId}" class=hiddenElement>
+      <td>
+         {$form.address.$blockId.street_number.label}<br />
+         {$form.address.$blockId.street_number.html}
+       </td>
 
-               <td>
-                  {$form.address.$blockId.street_name.label}<br />
-                  {$form.address.$blockId.street_name.html}<br />
-               </td>
+      <td>
+         {$form.address.$blockId.street_name.label}<br />
+         {$form.address.$blockId.street_name.html}<br />
+      </td>
 
-               <td colspan="2">
-                  {$form.address.$blockId.street_unit.label}<br />
-                  {$form.address.$blockId.street_unit.html}
-                  <a href="#" title="{ts}Edit Street Address{/ts}" onClick="processAddressFields( 'streetAddress', '{$blockId}', 1 );return false;">{ts}Edit Complete Street Address{/ts}</a>
-                  {help id="id-edit-complete-street" file="CRM/Contact/Form/Contact.hlp"}
-               </td>
-           </tr>
-    {/if}
+      <td colspan="2">
+       {$form.address.$blockId.street_unit.label}<br />
+        {$form.address.$blockId.street_unit.html}
+        <a href="#" title="{ts}Edit Street Address{/ts}" onClick="processAddressFields( 'streetAddress', '{$blockId}', 1 );return false;">{ts}Edit Complete Street Address{/ts}</a>
+        {help id="id-edit-complete-street" file="CRM/Contact/Form/Contact.hlp"}
+      </td>
+    </tr>
+       {/if}
 
 {if $parseStreetAddress eq 1}
 {literal}