From da12acc869e1068bdacd16238caa50f50117b445 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Thu, 3 Mar 2016 17:37:20 -0500 Subject: [PATCH] CRM-15789 - contact merge: restore that was accidentally deleted ---------------------------------------- * CRM-15789: Add icons to submit buttons https://issues.civicrm.org/jira/browse/CRM-15789 --- templates/CRM/Contact/Form/Merge.tpl | 203 ++++++++++++++------------- 1 file changed, 102 insertions(+), 101 deletions(-) diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl index 2147ce1b75..7e0ae600b3 100644 --- a/templates/CRM/Contact/Form/Merge.tpl +++ b/templates/CRM/Contact/Form/Merge.tpl @@ -24,110 +24,111 @@ +--------------------------------------------------------------------+ *}
-
-{ts}Click Merge to move data from the Duplicate Contact on the left into the Main Contact. In addition to the contact data (address, phone, email...), you may choose to move all or some of the related activity records (groups, contributions, memberships, etc.).{/ts} {help id="intro"} -
- -
- {include file="CRM/common/formButtons.tpl" location="top"} - {if $prev} {ts}Previous{/ts}{/if} - {if $next}{ts}Next{/ts} {/if} -
- -
- - - {ts}Flip between original and duplicate contacts.{/ts} - -
- -
- - - {ts}Mark this pair as not a duplicate.{/ts} - -
- - - - - - - - - {foreach from=$rows item=row key=field} - - - - - + + {/if} + {/foreach} +
 {$other_name} ({ts}duplicate{/ts}){ts}Mark All{/ts}
=={$form.toggleSelect.html} ==>		{$main_name}
{$row.title} - {if !is_array($row.other)} - {$row.other} - {elseif $row.other.fileName} - {$row.other.fileName} - {else} - {', '|implode:$row.other} - {/if} - {if $form.$field}=={$form.$field.html|crmAddClass:"select-row"}==>{/if} - {if $row.title|substr:0:5 == "Email" OR - $row.title|substr:0:7 == "Address" OR - $row.title|substr:0:2 == "IM" OR - $row.title|substr:0:6 == "OpenID" OR - $row.title|substr:0:5 == "Phone"} - - {assign var=position value=$field|strrpos:'_'} - {assign var=blockId value=$field|substr:$position+1} - {assign var=blockName value=$field|substr:14:$position-14} - - {$form.location.$blockName.$blockId.locTypeId.html}  - {if $blockName eq 'email' || $blockName eq 'phone' } - {if $row.main}(overwrite){$form.location.$blockName.$blockId.operation.html} 
{else}(add){/if} - {else} - {if $row.main}(overwrite)
{else}(add){/if} - {/if} - +
+ {ts}Click Merge to move data from the Duplicate Contact on the left into the Main Contact. In addition to the contact data (address, phone, email...), you may choose to move all or some of the related activity records (groups, contributions, memberships, etc.).{/ts} {help id="intro"} +
+ +
+ {include file="CRM/common/formButtons.tpl" location="top"} + {if $prev} {ts}Previous{/ts}{/if} + {if $next}{ts}Next{/ts} {/if} +
+ +
+ + + {ts}Flip between original and duplicate contacts.{/ts} + +
+ +
+ + + {ts}Mark this pair as not a duplicate.{/ts} + +
+ + + + + + + + + {foreach from=$rows item=row key=field} + + + - - {/foreach} + + + + + {/foreach} + + {foreach from=$rel_tables item=params key=paramName} + {if $paramName eq 'move_rel_table_users'} + + {/if} + + {else} - {/if} - - {else} - - - - {/if} - {/foreach} -
 {$other_name} ({ts}duplicate{/ts}){ts}Mark All{/ts}
=={$form.toggleSelect.html} ==>		{$main_name}
{$row.title} + {if !is_array($row.other)} + {$row.other} + {elseif $row.other.fileName} + {$row.other.fileName} + {else} + {', '|implode:$row.other} {/if} - {*NYSS 5546*} - - {if !is_array($row.main)} - {$row.main} - {elseif $row.main.fileName} - {$row.main.fileName} - {else} - {', '|implode:$row.main} - {/if} - -
{if $form.$field}=={$form.$field.html|crmAddClass:"select-row"}==>{/if} + {if $row.title|substr:0:5 == "Email" OR + $row.title|substr:0:7 == "Address" OR + $row.title|substr:0:2 == "IM" OR + $row.title|substr:0:6 == "OpenID" OR + $row.title|substr:0:5 == "Phone"} + + {assign var=position value=$field|strrpos:'_'} + {assign var=blockId value=$field|substr:$position+1} + {assign var=blockName value=$field|substr:14:$position-14} + + {$form.location.$blockName.$blockId.locTypeId.html}  + {if $blockName eq 'email' || $blockName eq 'phone' } + {if $row.main}(overwrite){$form.location.$blockName.$blockId.operation.html} 
{else}(add){/if} + {else} + {if $row.main}(overwrite)
{else}(add){/if} + {/if} - {foreach from=$rel_tables item=params key=paramName} - {if $paramName eq 'move_rel_table_users'} + {/if} + {*NYSS 5546*} + + {if !is_array($row.main)} + {$row.main} + {elseif $row.main.fileName} + {$row.main.fileName} + {else} + {', '|implode:$row.main} + {/if} + +
{ts}Move related...{/ts}{if $otherUfId}{$otherUfName}=={$form.$paramName.html|crmAddClass:"select-row"}==>{else}{if $mainUfId}{$mainUfName}{/if}
{ts}Move related...{/ts}{if $otherUfId}{$otherUfName}=={$form.$paramName.html|crmAddClass:"select-row"}==>{else}{if $mainUfId}{$mainUfName}{/if}
{ts}Move related...{/ts}{$params.title}=={$form.$paramName.html|crmAddClass:"select-row"}==>{$params.title}{if $form.operation.$paramName.add.html} {$form.operation.$paramName.add.html}{/if}
-
- - -
-
-

{ts}WARNING: The duplicate contact record WILL BE DELETED after the merge is complete.{/ts}

- {if $user} -

{ts 1=$config->userFramework}There are %1 user accounts associated with both the original and duplicate contacts. Ensure that the Drupal User you want to retain is on the right - if necessary use the 'Flip between original and duplicate contacts.' option at top to swap the positions of the two records before doing the merge. -The user record associated with the duplicate contact will not be deleted, but will be un-linked from the associated contact record (which will be deleted). -You will need to manually delete that user (click on the link to open Drupal User account in new screen). You may need to give thought to how you handle any content or contents associated with that user.{/ts}

- {/if} -
- -
- {include file="CRM/common/formButtons.tpl" location="bottom"} +
{ts}Move related...{/ts}{$params.title}=={$form.$paramName.html|crmAddClass:"select-row"}==>{$params.title}{if $form.operation.$paramName.add.html} {$form.operation.$paramName.add.html}{/if}
+
+ + +
+
+

{ts}WARNING: The duplicate contact record WILL BE DELETED after the merge is complete.{/ts}

+ {if $user} +

{ts 1=$config->userFramework}There are %1 user accounts associated with both the original and duplicate contacts. Ensure that the Drupal User you want to retain is on the right - if necessary use the 'Flip between original and duplicate contacts.' option at top to swap the positions of the two records before doing the merge. + The user record associated with the duplicate contact will not be deleted, but will be un-linked from the associated contact record (which will be deleted). + You will need to manually delete that user (click on the link to open Drupal User account in new screen). You may need to give thought to how you handle any content or contents associated with that user.{/ts}

+ {/if} +
+ +
+ {include file="CRM/common/formButtons.tpl" location="bottom"} +
{literal} -- 2.25.1