Merge pull request #7220 from ucam-dar/CRM-17556

CRM-17556 Dedupe improvements

diff --cc CRM/Contact/Form/Merge.php
Simple merge

diff --cc CRM/Dedupe/Merger.php
Simple merge

diff --cc css/civicrm.css
Simple merge

diff --cc templates/CRM/Contact/Form/Merge.tpl
index 614fd1b6f7954a0f06943029bd216365ea049202,d703ce8e676b27e9c59c54c384cc0078c7f1bd39..34f33d67b02d666137e3185bf6e161a8dfa984e1
--- 1/templates/CRM/Contact/Form/Merge.tpl
--- 2/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@@ -28,8 -28,24 +28,22 @@@
  {ts}Click <strong>Merge</strong> 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"}
  </div>
  
+ <div class="message status">
+   <div class="icon inform-icon"></div>
+   <strong>{ts}WARNING: The duplicate contact record WILL BE DELETED after the merge is complete.{/ts}</strong>
+ </div>
+ 
+ {if $user}
+   <div class="message status">
+     <div class="icon inform-icon"></div>
+     <strong>{ts 1=$config->userFramework}WARNING: There are %1 user accounts associated with both the original and duplicate contacts. Ensure that the %1 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 unlinked from the associated contact record (which will be deleted).
+ You will need to manually delete that user (click on the link to open the %1 user account in new screen). You may need to give thought to how you handle any content or contents associated with that user.{/ts}</strong>
+   </div>
+ {/if}
+ 
  <div class="crm-submit-buttons">
    {include file="CRM/common/formButtons.tpl" location="top"}
 -  {if $prev}<a href="{$prev}" class="crm-hover-button action-item"><i class="crm-i fa-chevron-left"></i> {ts}Previous{/ts}</a>{/if}
 -  {if $next}<a href="{$next}" class="crm-hover-button action-item">{ts}Next{/ts} <i class="crm-i fa-chevron-right"></i></a>{/if}
  </div>
  
  <div class="action-link">