From 6414adce24c7209b41ad78787f64259873cb2779 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 24 Mar 2014 09:54:46 -0400
Subject: [PATCH] CRM-14378 - Cleanup attachment js

---
 templates/CRM/Custom/Form/CustomField.tpl |  9 +++--
 templates/CRM/Form/attachment.tpl         | 12 +++----
 templates/CRM/Form/attachmentjs.tpl       | 40 ++++++++++-------------
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/templates/CRM/Custom/Form/CustomField.tpl b/templates/CRM/Custom/Form/CustomField.tpl
index 3c130ef783..0c0e0701e7 100644
--- a/templates/CRM/Custom/Form/CustomField.tpl
+++ b/templates/CRM/Custom/Form/CustomField.tpl
@@ -71,21 +71,20 @@
 
                 {if $element.data_type eq 'File'}
                     {if $element.element_value.data}
-                      <div id="attachStatusMesg_{$element_name}" class="status hiddenElement"></div>
-                      <div id="attachFile_{$element_name}">
+                      <div class="crm-attachment-wrapper crm-entity" id="file_{$element_name}">
                         <span class="html-adjust"><br />
                             &nbsp;{ts}Attached File{/ts}: &nbsp;
                             {if $element.element_value.displayURL}
-                                <a href="{$element.element_value.displayURL}" class='crm-image-popup'>
+                                <a href="{$element.element_value.displayURL}" class='crm-image-popup crm-attachment'>
                                   <img src="{$element.element_value.displayURL}"
                                        height = "{$element.element_value.imageThumbHeight}"
                                        width="{$element.element_value.imageThumbWidth}">
                                 </a>
                             {else}
-                                <a href="{$element.element_value.fileURL}">{$element.element_value.fileName}</a>
+                                <a class="crm-attachment" href="{$element.element_value.fileURL}">{$element.element_value.fileName}</a>
                             {/if}
                             {if $element.element_value.deleteURL}
-                                   <a href="#" onclick="showDeleteAttachment('{$element.element_value.fileName}', '{$element.element_value.deleteURLArgs}', {$element.element_value.fid}, '#attachStatusMesg_{$element_name}', '#attachFile_{$element_name}'); return false;" title="{ts}Delete this file{/ts}"><span class="icon red-icon delete-icon" style="margin:0px 0px -5px 20px" title="{ts}Delete this file{/ts}"></span></a>
+                                   <a href="#" class="crm-hover-button delete-attachment" data-filename="{$element.element_value.fileName}" data-args="{$element.element_value.deleteURLArgs}" title="{ts}Delete File{/ts}"><span class="icon delete-icon"></span></a>
                             {/if}
                         </span>
                       </div>
diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl
index bad33ac24e..f8b0315873 100644
--- a/templates/CRM/Form/attachment.tpl
+++ b/templates/CRM/Form/attachment.tpl
@@ -49,7 +49,7 @@
       {capture assign=attachTitle}{ts}Attachment(s){/ts}{/capture}
     {/if}
     {if !$noexpand}
-    <div class="crm-accordion-wrapper {if $context NEQ 'pcpCampaign'}collapsed{/if}">
+    <div class="crm-accordion-wrapper {if $context NEQ 'pcpCampaign' AND !$currentAttachmentInfo}collapsed{/if}">
        <div class="crm-accordion-header">
           {$attachTitle}
       </div><!-- /.crm-accordion-header -->
@@ -102,12 +102,11 @@
             <td class="label">{ts}Current Attachment(s){/ts}</td>
             <td class="view-value">
           {foreach from=$currentAttachmentInfo key=attKey item=attVal}
-                <div id="attachStatusMesg" class="status hiddenElement"></div>
-                <div id="attachFileRecord_{$attVal.fileID}">
-                  <strong><a href="{$attVal.url}">{$attVal.cleanName}</a></strong>
+                <div class="crm-attachment-wrapper crm-entity" id="file_{$attVal.fileID}">
+                  <strong><a class="crm-attachment" href="{$attVal.url}">{$attVal.cleanName}</a></strong>
                   {if $attVal.description}&nbsp;-&nbsp;{$attVal.description}{/if}
                   {if $attVal.deleteURLArgs}
-                   <a href="#" onclick="showDeleteAttachment('{$attVal.cleanName}', '{$attVal.deleteURLArgs}', {$attVal.fileID}, '#attachStatusMesg', '#attachFileRecord_{$attVal.fileID}'); return false;" title="{ts}Delete this attachment{/ts}"><span class="icon red-icon delete-icon" style="margin:0px 0px -5px 20px" title="{ts}Delete this attachment{/ts}"></span></a>
+                   <a href="#" class="crm-hover-button delete-attachment" data-filename="{$attVal.cleanName}" data-args="{$attVal.deleteURLArgs}" title="{ts}Delete File{/ts}"><span class="icon delete-icon"></span></a>
                   {/if}
                   {if !empty($attVal.tag)}
                     <br/>
@@ -120,8 +119,7 @@
         </tr>
         <tr>
             <td class="label">&nbsp;</td>
-            <td>{$form.is_delete_attachment.html}&nbsp;{$form.is_delete_attachment.label}<br />
-                <span class="description">{ts}Click the red trash-can next to a file name to delete a specific attachment. If you want to delete ALL attachments, check the box above and click Save.{/ts}</span>
+            <td>{$form.is_delete_attachment.html}&nbsp;{$form.is_delete_attachment.label}
             </td>
         </tr>
       {/if}
diff --git a/templates/CRM/Form/attachmentjs.tpl b/templates/CRM/Form/attachmentjs.tpl
index 046d0e89b8..a3e44e60b1 100644
--- a/templates/CRM/Form/attachmentjs.tpl
+++ b/templates/CRM/Form/attachmentjs.tpl
@@ -1,27 +1,23 @@
 <script type="text/javascript">
 {literal}
-  function hideStatusAttachment( divName ) {
-    cj( divName ).hide( );
-  }
-
-  function showDeleteAttachment(fileName, postURLData, fileID, divName, divFile) {
-    var confirmMsg = '<div>{/literal}{ts escape="js"}Are you sure you want to delete attachment: {/ts}{literal}' + fileName + '&nbsp; <a href="#" onclick="deleteAttachment( \'' + postURLData + '\',' + fileID + ',\'' + divName + '\', \'' + divFile + '\' ); return false;" style="text-decoration: underline;">{/literal}</div><div>{ts escape='js'}Yes{/ts}{literal}</a>&nbsp;&nbsp;&nbsp;<a href="#" onclick="hideStatusAttachment( \'' + divName + '\' ); return false;" style="text-decoration: underline;">{/literal}{ts escape='js'}No{/ts}{literal}</a></div>';
-    cj(divName).show().html(confirmMsg);
-  }
-
-  function deleteAttachment(postURLData, fileID, divName, divFile) {
-    var postUrl = {/literal}"{crmURL p='civicrm/file/delete' h=0 }"{literal};
-    cj.ajax({
-      type: "POST",
-      data:  postURLData,
-      url: postUrl,
-      success: function (html) {
-        var resourceBase   = {/literal}"{$config->resourceBase}"{literal};
-        var successMsg = '{/literal}{ts escape="js"}The selected attachment has been deleted.{/ts}{literal}';
-        cj(divFile + ',' + divName).hide();
-        CRM.alert(successMsg, '{/literal}{ts escape="js"}Removed{/ts}{literal}', 'success');
-      }
+  cj(function($) {
+    $('a.delete-attachment').click(function() {
+      var $el = $(this),
+        $row = $el.closest('.crm-attachment-wrapper'),
+        msg = '{/literal}{ts escape="js" 1="%1"}This will immediately delete the file %1. This action cannot be undone.{/ts}{literal}';
+      CRM.confirm(null, {
+        title: $el.attr('title'),
+        message: ts(msg, {1: '<em>' + $el.data('filename') + '</em>'})
+      }).on('crmConfirmYes', function() {
+        var postUrl = {/literal}"{crmURL p='civicrm/file/delete' h=0 }"{literal};
+        var request = $.post(postUrl, $el.data('args'));
+        CRM.status({success: '{/literal}{ts escape="js"}Removed{/ts}{literal}'}, request);
+        request.done(function() {
+          $row.remove();
+        });
+      });
+      return false;
     });
-  }
+  });
 {/literal}
 </script>
-- 
2.25.1