Merge pull request #336 from kurund/memcache-fixes

[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 69dcaed4374557bb75d2f1fd4e0f4807c37e88bb..1f8aa892ebb6cba657ac0eae3488052491206304 100644 (file)
--- a/templates/CRM/Contact/Form/Edit/CustomData.tpl
+++ b/templates/CRM/Contact/Form/Edit/CustomData.tpl
@@ -49,7 +49,7 @@
                </tr>
                <tr>
                <div class="crm-submit-buttons">
-               <a href="javascript:showDelete( {$tableID}, '{$cd_edit.name}_{$group_id|cat:"_$tableID"}', {$group_id}, {$contactId} );" class="button delete-button" title="{ts 1=$cv_edit.title}Delete this %1 record{/ts}">
+               <a href="#" onclick="showDelete( {$tableID}, '{$cd_edit.name}_{$group_id|cat:"_$tableID"}', {$group_id}, {$contactId} ); return false;" class="button delete-button" title="{ts 1=$cv_edit.title}Delete this %1 record{/ts}">
         <span><div class="icon delete-icon"></div>{ts}Delete{/ts}</span>
                    </a>
                         </div>  <!-- crm-submit-buttons -->
@@ -72,7 +72,7 @@
      }
 
      function showDelete( valueID, elementID, groupID, contactID ) {
-         var confirmMsg = '{/literal}{ts escape='js'}Are you sure you want to delete this record?{/ts}{literal} &nbsp; <a href="javascript:deleteCustomValue( ' + valueID + ',\'' + elementID + '\',' + groupID + ',' + contactID + ' );" style="text-decoration: underline;">{/literal}{ts escape='js'}Yes{/ts}{literal}</a>&nbsp;&nbsp;&nbsp;<a href="javascript:hideStatus( ' + valueID + ', ' +  groupID + ' );" style="text-decoration: underline;">{/literal}{ts escape='js'}No{/ts}{literal}</a>';
+         var confirmMsg = '{/literal}{ts escape='js'}Are you sure you want to delete this record?{/ts}{literal} &nbsp; <a href="#" onclick="deleteCustomValue( ' + valueID + ',\'' + elementID + '\',' + groupID + ',' + contactID + ' ); return false;" style="text-decoration: underline;">{/literal}{ts escape='js'}Yes{/ts}{literal}</a>&nbsp;&nbsp;&nbsp;<a href="#" onclick="hideStatus( ' + valueID + ', ' +  groupID + ' ); return false;" style="text-decoration: underline;">{/literal}{ts escape='js'}No{/ts}{literal}</a>';
          cj( 'tr#statusmessg_' + groupID + '_' + valueID ).show( ).children().find('span').html( confirmMsg );
      }
 
@@ -83,15 +83,17 @@
            data:  "valueID=" + valueID + "&groupID=" + groupID +"&contactId=" + contactID + "&key={/literal}{crmKey name='civicrm/ajax/customvalue'}{literal}",
            url: postUrl,
            success: function(html){
-               cj( '#'+ elementID ).hide( );
-               var resourceBase   = {/literal}"{$config->resourceBase}"{literal};
-               var successMsg = '{/literal}{ts escape='js'}The selected record has been deleted.{/ts}{literal} &nbsp;&nbsp;<a href="javascript:hideStatus( ' + valueID + ',' + groupID + ');"><img title="{/literal}{ts escape='js'}close{/ts}{literal}" src="' +resourceBase+'i/close.png"/></a>';
-               cj( 'tr#statusmessg_'  + groupID + '_' + valueID ).show( ).children().find('span').html( successMsg );
-         var element = cj( '.ui-tabs-nav #tab_custom_' + groupID + ' a' );
-         cj(element).html(cj(element).attr('title') + ' ('+ 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+') ');
            }
          });
      }
 
   {/literal}
  </script>
+
+{include file="CRM/Form/attachmentjs.tpl"}
+