Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-01-20-54-24

[civicrm-core.git] / templates / CRM / Contact / Form / Edit / CustomData.tpl

diff --git a/templates/CRM/Contact/Form/Edit/CustomData.tpl b/templates/CRM/Contact/Form/Edit/CustomData.tpl
index 5de1f626a5606de0d0177c030f33f54d59b8a6b0..d0ea6b03dce584881db894342edfd5d8a518702f 100644 (file)
--- a/templates/CRM/Contact/Form/Edit/CustomData.tpl
+++ b/templates/CRM/Contact/Form/Edit/CustomData.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -25,19 +25,17 @@
 *}
 
 <script type="text/javascript">var showTab = Array();</script>
-
 {foreach from=$groupTree item=cd_edit key=group_id}
-
-{if $cd_edit.is_multiple eq 1}
-  {assign var=tableID value=$cd_edit.table_id}
-  {assign var=divName value=$group_id|cat:"_$tableID"}
-  <div></div>
-  <div id="{$cd_edit.name|cat:'_$divName'}"
-       class="crm-accordion-wrapper crm-custom-accordion {if $cd_edit.collapse_display and !$skipTitle}collapsed{/if}">
-{else}
-  <div id="{$cd_edit.name}"
+  {if $cd_edit.is_multiple eq 1}
+    {assign var=tableID value=$cd_edit.table_id}
+    {assign var=divName value=$group_id|cat:"_$tableID"}
+    <div></div>
+    <div id="{$cd_edit.name|cat:'_$divName'}"
+     class="crm-accordion-wrapper crm-custom-accordion {if $cd_edit.collapse_display and !$skipTitle}collapsed{/if}">
+  {else}
+    <div id="{$cd_edit.name}"
        class="crm-accordion-wrapper crm-custom-accordion {if $cd_edit.collapse_display}collapsed{/if}">
-{/if}
+  {/if}
     <div class="crm-accordion-header">
       {$cd_edit.title}
     </div>
@@ -84,23 +82,22 @@
     }
 
     function deleteCustomValue(valueID, elementID, groupID, contactID) {
-      var postUrl = {/literal}"{crmURL p='civicrm/ajax/customvalue' h=0 }"{literal};
-      cj.ajax({
+      var postUrl = {/literal}"{crmURL p='civicrm/ajax/customvalue' h=0 }"{literal},
+      request = cj.ajax({
         type: "POST",
         data: "valueID=" + valueID + "&groupID=" + groupID + "&contactId=" + contactID + "&key={/literal}{crmKey name='civicrm/ajax/customvalue'}{literal}",
         url: postUrl,
         success: function (html) {
           cj('#' + elementID).hide();
           hideStatus(valueID, groupID);
-          CRM.alert('', '{/literal}{ts escape="js"}Record Deleted{/ts}{literal}', 'success');
           var element = cj('.ui-tabs-nav #tab_custom_' + groupID + ' a');
           cj(element).html(cj(element).attr('title') + ' (' + html + ') ');
         }
       });
+      CRM.status({success: '{/literal}{ts escape="js"}Record Deleted{/ts}{literal}'}, request);
     }
 
     {/literal}
   </script>
 
   {include file="CRM/Form/attachmentjs.tpl"}
-