From 18afc30cef13dd06cec8e1b1591a3b147913225b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 2 Jan 2015 21:14:42 -0500
Subject: [PATCH] CRM-15759 - Apply crmEditable behavior based on events
 instead of a template

---
 js/jquery/jquery.crmeditable.js                       | 4 ++++
 templates/CRM/ACL/Page/ACL.tpl                        | 1 -
 templates/CRM/Admin/Page/ContactType.tpl              | 1 -
 templates/CRM/Admin/Page/Extensions.tpl               | 1 -
 templates/CRM/Admin/Page/Job.tpl                      | 1 -
 templates/CRM/Admin/Page/JobLog.tpl                   | 1 -
 templates/CRM/Admin/Page/LocationType.tpl             | 1 -
 templates/CRM/Admin/Page/MessageTemplates.tpl         | 1 -
 templates/CRM/Admin/Page/Options.tpl                  | 1 -
 templates/CRM/Admin/Page/ParticipantStatusType.tpl    | 1 -
 templates/CRM/Admin/Page/PaymentProcessor.tpl         | 1 -
 templates/CRM/Admin/Page/PaymentProcessorType.tpl     | 1 -
 templates/CRM/Admin/Page/RelationshipType.tpl         | 1 -
 templates/CRM/Admin/Page/Reminders.tpl                | 1 -
 templates/CRM/Admin/Page/Tag.tpl                      | 1 -
 templates/CRM/Badge/Page/Layout.tpl                   | 1 -
 templates/CRM/Campaign/Form/Search/Campaign.tpl       | 2 +-
 templates/CRM/Campaign/Form/Search/Petition.tpl       | 2 +-
 templates/CRM/Campaign/Form/Search/Survey.tpl         | 2 +-
 templates/CRM/Campaign/Page/Campaign.tpl              | 1 -
 templates/CRM/Campaign/Page/Petition.tpl              | 1 -
 templates/CRM/Campaign/Page/Survey.tpl                | 1 -
 templates/CRM/Campaign/Page/SurveyType.tpl            | 1 -
 templates/CRM/Contribute/Page/ContributionPage.tpl    | 1 -
 templates/CRM/Contribute/Page/ContributionRecur.tpl   | 1 -
 templates/CRM/Contribute/Page/ContributionType.tpl    | 1 -
 templates/CRM/Contribute/Page/ManagePremiums.tpl      | 1 -
 templates/CRM/Custom/Page/Field.tpl                   | 1 -
 templates/CRM/Custom/Page/Group.tpl                   | 1 -
 templates/CRM/Custom/Page/Option.tpl                  | 1 -
 templates/CRM/Event/Page/ManageEvent.tpl              | 1 -
 templates/CRM/Financial/Form/Search.tpl               | 1 +
 templates/CRM/Financial/Page/FinancialAccount.tpl     | 1 -
 templates/CRM/Financial/Page/FinancialType.tpl        | 1 -
 templates/CRM/Financial/Page/FinancialTypeAccount.tpl | 1 -
 templates/CRM/Group/Form/Search.tpl                   | 3 +--
 templates/CRM/Mailing/Page/Component.tpl              | 1 -
 templates/CRM/Member/Page/MembershipStatus.tpl        | 1 -
 templates/CRM/Member/Page/MembershipType.tpl          | 1 -
 templates/CRM/Price/Page/Field.tpl                    | 1 -
 templates/CRM/Price/Page/Option.tpl                   | 1 -
 templates/CRM/Price/Page/Set.tpl                      | 1 -
 templates/CRM/Report/Form.tpl                         | 1 -
 templates/CRM/Report/Page/Options.tpl                 | 1 -
 templates/CRM/SMS/Page/Provider.tpl                   | 1 -
 templates/CRM/UF/Page/Field.tpl                       | 1 -
 templates/CRM/UF/Page/Group.tpl                       | 1 -
 templates/CRM/common/crmeditable.tpl                  | 4 +++-
 48 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/js/jquery/jquery.crmeditable.js b/js/jquery/jquery.crmeditable.js
index 79f8d74515..ac87b2a999 100644
--- a/js/jquery/jquery.crmeditable.js
+++ b/js/jquery/jquery.crmeditable.js
@@ -226,4 +226,8 @@
     });
   };
 
+  $(document).on('crmLoad', function(e) {
+    $('.crm-editable', e.target).crmEditable();
+  })
+
 })(jQuery);
diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl
index bb3f4f11a4..9f8b650a31 100644
--- a/templates/CRM/ACL/Page/ACL.tpl
+++ b/templates/CRM/ACL/Page/ACL.tpl
@@ -78,7 +78,6 @@
           </div>
         {/if}
       </div>
-      {include file="CRM/common/crmeditable.tpl"}
     {else}
       <div class="messages status no-popup">
         <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
diff --git a/templates/CRM/Admin/Page/ContactType.tpl b/templates/CRM/Admin/Page/ContactType.tpl
index 4011d337fb..8ee95e215e 100644
--- a/templates/CRM/Admin/Page/ContactType.tpl
+++ b/templates/CRM/Admin/Page/ContactType.tpl
@@ -35,7 +35,6 @@
     {strip}
     {* handle enable/disable actions*}
     {include file="CRM/common/enableDisableApi.tpl"}
-    {include file="CRM/common/crmeditable.tpl"}
     {include file="CRM/common/jsortable.tpl"}
     <table id="options" class="display">
     <thead>
diff --git a/templates/CRM/Admin/Page/Extensions.tpl b/templates/CRM/Admin/Page/Extensions.tpl
index 8589fb3db8..b986472756 100644
--- a/templates/CRM/Admin/Page/Extensions.tpl
+++ b/templates/CRM/Admin/Page/Extensions.tpl
@@ -40,7 +40,6 @@
     {include file="CRM/Admin/Page/Extensions/About.tpl"}
 
     {include file="CRM/common/enableDisableApi.tpl"}
-    {include file="CRM/common/crmeditable.tpl"}
     {include file="CRM/common/jsortable.tpl"}
 
     <div id="mainTabContainer" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
diff --git a/templates/CRM/Admin/Page/Job.tpl b/templates/CRM/Admin/Page/Job.tpl
index a1f2f6a8f7..2cdad726b3 100644
--- a/templates/CRM/Admin/Page/Job.tpl
+++ b/templates/CRM/Admin/Page/Job.tpl
@@ -45,7 +45,6 @@
     {strip}
         {* handle enable/disable actions*}
        {include file="CRM/common/enableDisableApi.tpl"}
-       {include file="CRM/common/crmeditable.tpl"}
         <br/><table class="selector row-highlight">
         <tr class="columnheader">
             <th >{ts}Name (Frequency)/Description{/ts}</th>
diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl
index 568ee41712..76cdd9f3a0 100644
--- a/templates/CRM/Admin/Page/JobLog.tpl
+++ b/templates/CRM/Admin/Page/JobLog.tpl
@@ -40,7 +40,6 @@
         {strip}
         {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
         <table class="selector row-highlight">
         <tr class="columnheader">
             <th >{ts}Date{/ts}</th>
diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl
index ea4f4c316c..311fb54039 100644
--- a/templates/CRM/Admin/Page/LocationType.tpl
+++ b/templates/CRM/Admin/Page/LocationType.tpl
@@ -35,7 +35,6 @@
     {strip}
   {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
     {include file="CRM/common/jsortable.tpl"}
     <table id="options" class="display">
     <thead>
diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index de06af1952..1f3032518a 100644
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -98,7 +98,6 @@
 
     {* create two selector tabs, first being the ‘user’ one, the second being the ‘workflow’ one *}
     {include file="CRM/common/enableDisableApi.tpl"}
-    {include file="CRM/common/crmeditable.tpl"}
     {include file="CRM/common/jsortable.tpl"}
     {foreach from=$rows item=template_row key=type}
       <div id="{if $type eq 'userTemplates'}user{else}workflow{/if}" class='ui-tabs-panel ui-widget-content ui-corner-bottom'>
diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl
index 38ed85193b..715945d1b6 100644
--- a/templates/CRM/Admin/Page/Options.tpl
+++ b/templates/CRM/Admin/Page/Options.tpl
@@ -149,7 +149,6 @@
         {/foreach}
         </tbody>
         </table>
-        {include file="CRM/common/crmeditable.tpl"}
         {/strip}
 
 </div>
diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index 9334e25bab..dcca544598 100644
--- a/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -32,7 +32,6 @@
   {strip}
     {* handle enable/disable actions*}
     {include file="CRM/common/enableDisableApi.tpl"}
-    {include file="CRM/common/crmeditable.tpl"}
     <table cellpadding="0" cellspacing="0" border="0">
       <thead class="sticky">
         <th>{ts}Label{/ts}</th>
diff --git a/templates/CRM/Admin/Page/PaymentProcessor.tpl b/templates/CRM/Admin/Page/PaymentProcessor.tpl
index 14fec223b2..ae7d63b47f 100644
--- a/templates/CRM/Admin/Page/PaymentProcessor.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessor.tpl
@@ -36,7 +36,6 @@
         {strip}
         {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
         <table class="selector row-highlight">
         <tr class="columnheader">
             <th >{ts}Name{/ts}</th>
diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
index ec3e915fd2..4697f1280c 100644
--- a/templates/CRM/Admin/Page/PaymentProcessorType.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
@@ -37,7 +37,6 @@
     <div class="form-item">
         {strip}
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
         <table cellpadding="0" cellspacing="0" border="0">
         <tr class="columnheader">
             <th>{ts}Name{/ts}</th>
diff --git a/templates/CRM/Admin/Page/RelationshipType.tpl b/templates/CRM/Admin/Page/RelationshipType.tpl
index a1ba56c7bd..c7134402bd 100644
--- a/templates/CRM/Admin/Page/RelationshipType.tpl
+++ b/templates/CRM/Admin/Page/RelationshipType.tpl
@@ -45,7 +45,6 @@
     {strip}
   {* handle enable/disable actions*}
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
     {include file="CRM/common/jsortable.tpl"}
         <table id="options" class="display">
         <thead>
diff --git a/templates/CRM/Admin/Page/Reminders.tpl b/templates/CRM/Admin/Page/Reminders.tpl
index 46317fef03..a3e42a9245 100755
--- a/templates/CRM/Admin/Page/Reminders.tpl
+++ b/templates/CRM/Admin/Page/Reminders.tpl
@@ -28,7 +28,6 @@
 {strip}
   {if $rows and is_array($rows)}
     {include file="CRM/common/enableDisableApi.tpl"}
-    {include file="CRM/common/crmeditable.tpl"}
     {include file="CRM/common/jsortable.tpl"}
   {/if}
   <table id="scheduleReminders" class="display">
diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl
index 270b54f7ad..ebc155aca2 100644
--- a/templates/CRM/Admin/Page/Tag.tpl
+++ b/templates/CRM/Admin/Page/Tag.tpl
@@ -168,4 +168,3 @@ CRM.$(function($) {
 {/literal}
 
 {/if}
-{include file="CRM/common/crmeditable.tpl"}
diff --git a/templates/CRM/Badge/Page/Layout.tpl b/templates/CRM/Badge/Page/Layout.tpl
index 30d1cdbe98..7a1592fa91 100644
--- a/templates/CRM/Badge/Page/Layout.tpl
+++ b/templates/CRM/Badge/Page/Layout.tpl
@@ -36,7 +36,6 @@
       {strip}
       {* handle enable/disable actions*}
         {include file="CRM/common/enableDisableApi.tpl"}
-        {include file="CRM/common/crmeditable.tpl"}
         {include file="CRM/common/jsortable.tpl"}
         <table id="options" class="display">
           <thead>
diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index bec02ff2bd..7bb20d4e5a 100755
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -39,7 +39,6 @@
 {* load campaign selector *}
 
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
 
   {literal}
     <script type="text/javascript">
@@ -214,6 +213,7 @@
       "oLanguage": {"sEmptyTable": noRecordFoundMsg,
         "sZeroRecords": noRecordFoundMsg },
       "fnDrawCallback": function () {
+        // FIXME: trigger crmLoad and crmEditable would happen automatically
         $('.crm-editable').crmEditable();
       },
       "fnRowCallback": function (nRow, aData, iDisplayIndex) {
diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl
index 329ceae333..506ee4cec2 100755
--- a/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -42,7 +42,6 @@
        {* load petition selector *}
 
        {include file="CRM/common/enableDisableApi.tpl"}
-       {include file="CRM/common/crmeditable.tpl"}
 
        {literal}
        <script type="text/javascript">
@@ -199,6 +198,7 @@ function loadPetitionList( )
              "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
                  "sZeroRecords" : noRecordFoundMsg },
              "fnDrawCallback": function() {
+               // FIXME: trigger crmLoad and crmEditable would happen automatically
                CRM.$('.crm-editable').crmEditable();
              },
              "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl
index 484b400d5e..776c9bd835 100755
--- a/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -41,7 +41,6 @@
 
   {* load survey selector *}
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
 
   {literal}
   <script type="text/javascript">
@@ -213,6 +212,7 @@ function loadSurveyList( )
              "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
                  "sZeroRecords" : noRecordFoundMsg },
              "fnDrawCallback": function() {
+               // FIXME: trigger crmLoad and crmEditable would happen automatically
                CRM.$('.crm-editable').crmEditable();
              },
              "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
diff --git a/templates/CRM/Campaign/Page/Campaign.tpl b/templates/CRM/Campaign/Page/Campaign.tpl
index ea77e6cb48..380819411c 100644
--- a/templates/CRM/Campaign/Page/Campaign.tpl
+++ b/templates/CRM/Campaign/Page/Campaign.tpl
@@ -29,7 +29,6 @@
       <a href="{$addCampaignUrl}" class="button"><span>&raquo; {ts}Add Campaign{/ts}</span></a>
   </div>
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
   <div id="campaignType">
     <table id="options" class="display">
       <thead>
diff --git a/templates/CRM/Campaign/Page/Petition.tpl b/templates/CRM/Campaign/Page/Petition.tpl
index b4c12e28cf..c9c2f9c8ae 100644
--- a/templates/CRM/Campaign/Page/Petition.tpl
+++ b/templates/CRM/Campaign/Page/Petition.tpl
@@ -30,7 +30,6 @@
     <a href="{$addSurveyUrl}" class="button"><span>&raquo; {ts}Add Survey{/ts}</span></a>
   </div>
  {include file="CRM/common/enableDisableApi.tpl"}
- {include file="CRM/common/crmeditable.tpl"}
  {include file="CRM/common/jsortable.tpl"}
   <div id="surveyList">
     <table id="options" class="display">
diff --git a/templates/CRM/Campaign/Page/Survey.tpl b/templates/CRM/Campaign/Page/Survey.tpl
index b4c12e28cf..c9c2f9c8ae 100644
--- a/templates/CRM/Campaign/Page/Survey.tpl
+++ b/templates/CRM/Campaign/Page/Survey.tpl
@@ -30,7 +30,6 @@
     <a href="{$addSurveyUrl}" class="button"><span>&raquo; {ts}Add Survey{/ts}</span></a>
   </div>
  {include file="CRM/common/enableDisableApi.tpl"}
- {include file="CRM/common/crmeditable.tpl"}
  {include file="CRM/common/jsortable.tpl"}
   <div id="surveyList">
     <table id="options" class="display">
diff --git a/templates/CRM/Campaign/Page/SurveyType.tpl b/templates/CRM/Campaign/Page/SurveyType.tpl
index 129ba414fb..4ddc6759d7 100644
--- a/templates/CRM/Campaign/Page/SurveyType.tpl
+++ b/templates/CRM/Campaign/Page/SurveyType.tpl
@@ -11,7 +11,6 @@
         {strip}
   {* handle enable/disable actions*}
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
         <table class="row-highlight">
          <thead>
          <tr>
diff --git a/templates/CRM/Contribute/Page/ContributionPage.tpl b/templates/CRM/Contribute/Page/ContributionPage.tpl
index fa5b7222d0..acb160672c 100644
--- a/templates/CRM/Contribute/Page/ContributionPage.tpl
+++ b/templates/CRM/Contribute/Page/ContributionPage.tpl
@@ -46,7 +46,6 @@
              {include file="CRM/common/pagerAToZ.tpl"}
              {* handle enable/disable actions *}
              {include file="CRM/common/enableDisableApi.tpl"}
-             {include file="CRM/common/crmeditable.tpl"}
        {include file="CRM/common/jsortable.tpl"}
              <table id="options" class="display">
                <thead>
diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl
index 35a75c0880..95c8bb56de 100644
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -25,7 +25,6 @@
 *}
 
 {include file="CRM/common/enableDisableApi.tpl"}
-{include file="CRM/common/crmeditable.tpl"}
 
 {if $action eq 4} {* when action is view *}
     {if $recur}
diff --git a/templates/CRM/Contribute/Page/ContributionType.tpl b/templates/CRM/Contribute/Page/ContributionType.tpl
index 6b667a4bbb..4e1aa0b9fa 100644
--- a/templates/CRM/Contribute/Page/ContributionType.tpl
+++ b/templates/CRM/Contribute/Page/ContributionType.tpl
@@ -37,7 +37,6 @@
         {strip}
   {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
         <table cellpadding="0" cellspacing="0" border="0">
            <thead class="sticky">
             <th>{ts}Name{/ts}</th>
diff --git a/templates/CRM/Contribute/Page/ManagePremiums.tpl b/templates/CRM/Contribute/Page/ManagePremiums.tpl
index 1688f8979f..1cd96434ea 100644
--- a/templates/CRM/Contribute/Page/ManagePremiums.tpl
+++ b/templates/CRM/Contribute/Page/ManagePremiums.tpl
@@ -43,7 +43,6 @@
     {strip}
   {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
   {include file="CRM/common/jsortable.tpl"}
         <table id="options" class="display">
           <thead>
diff --git a/templates/CRM/Custom/Page/Field.tpl b/templates/CRM/Custom/Page/Field.tpl
index 42181e1029..eb11ac23b5 100644
--- a/templates/CRM/Custom/Page/Field.tpl
+++ b/templates/CRM/Custom/Page/Field.tpl
@@ -82,5 +82,4 @@
     </div>
 {/if}
 
-{include file="CRM/common/crmeditable.tpl"}
 
diff --git a/templates/CRM/Custom/Page/Group.tpl b/templates/CRM/Custom/Page/Group.tpl
index 79e1537075..db9d7fd604 100644
--- a/templates/CRM/Custom/Page/Group.tpl
+++ b/templates/CRM/Custom/Page/Group.tpl
@@ -41,7 +41,6 @@
      {strip}
    {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
       <table id="options" class="row-highlight">
         <thead>
           <tr>
diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index a519726585..787a7f3755 100644
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -39,7 +39,6 @@
         {strip}
         {* handle enable/disable actions*}
          {include file="CRM/common/enableDisableApi.tpl"}
-         {include file="CRM/common/crmeditable.tpl"}
         <table class="selector row-highlight">
           <tr class="columnheader">
             <th>{ts}Label{/ts}</th>
diff --git a/templates/CRM/Event/Page/ManageEvent.tpl b/templates/CRM/Event/Page/ManageEvent.tpl
index 424ab4fb40..4e90daea85 100644
--- a/templates/CRM/Event/Page/ManageEvent.tpl
+++ b/templates/CRM/Event/Page/ManageEvent.tpl
@@ -61,7 +61,6 @@
   {include file="CRM/common/pagerAToZ.tpl"}
   {* handle enable/disable actions*}
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
   {include file="CRM/common/jsortable.tpl"}
     <table id="options" class="display">
       <thead>
diff --git a/templates/CRM/Financial/Form/Search.tpl b/templates/CRM/Financial/Form/Search.tpl
index 2994bfcec6..e6bd46aee6 100644
--- a/templates/CRM/Financial/Form/Search.tpl
+++ b/templates/CRM/Financial/Form/Search.tpl
@@ -149,6 +149,7 @@ CRM.$(function($) {
         return nRow;
       },
       "fnDrawCallback": function(oSettings) {
+        // FIXME: trigger crmLoad and crmEditable would happen automatically
         $('.crm-editable', '#crm-batch-selector-{/literal}{$batchStatus}{literal}').crmEditable();
         $("#toggleSelect").prop('checked', false);
         if (checkedRows.length) {
diff --git a/templates/CRM/Financial/Page/FinancialAccount.tpl b/templates/CRM/Financial/Page/FinancialAccount.tpl
index f184be30b5..163374ae06 100644
--- a/templates/CRM/Financial/Page/FinancialAccount.tpl
+++ b/templates/CRM/Financial/Page/FinancialAccount.tpl
@@ -46,7 +46,6 @@
       {strip}
       {* handle enable/disable actions*}
        {include file="CRM/common/enableDisableApi.tpl"}
-       {include file="CRM/common/crmeditable.tpl"}
       <table id="crm-financial_accounts" class="display">
          <thead class="sticky">
           <th>{ts}Name{/ts}</th>
diff --git a/templates/CRM/Financial/Page/FinancialType.tpl b/templates/CRM/Financial/Page/FinancialType.tpl
index 7e87ffd29f..320d62322e 100644
--- a/templates/CRM/Financial/Page/FinancialType.tpl
+++ b/templates/CRM/Financial/Page/FinancialType.tpl
@@ -41,7 +41,6 @@
   {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
    {include file="CRM/common/jsortable.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
         <table cellpadding="0" cellspacing="0" border="0">
            <thead class="sticky">
             <th>{ts}Name{/ts}</th>
diff --git a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
index c398ddb366..f728f97902 100644
--- a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
+++ b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
@@ -38,7 +38,6 @@
     {strip}
     {* handle enable/disable actions*}
      {include file="CRM/common/enableDisableApi.tpl"}
-     {include file="CRM/common/crmeditable.tpl"}
       <table cellpadding="0" cellspacing="0" border="0">
         <thead class="sticky">
           <th>{ts}Relationship{/ts}</th>
diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl
index 4a9233fd3d..86ac0d5891 100644
--- a/templates/CRM/Group/Form/Search.tpl
+++ b/templates/CRM/Group/Form/Search.tpl
@@ -89,7 +89,6 @@
 
 {* handle enable/disable actions*}
 {include file="CRM/common/enableDisableApi.tpl"}
-{include file="CRM/common/crmeditable.tpl"}
 
 {literal}
 <script type="text/javascript">
@@ -188,6 +187,7 @@ CRM.$(function($) {
           return nRow;
         },
         "fnDrawCallback": function() {
+          // FIXME: trigger crmLoad and crmEditable would happen automatically
           $('.crm-editable').crmEditable();
         },
         "fnServerData": function ( sSource, aoData, fnCallback ) {
@@ -307,7 +307,6 @@ CRM.$(function($) {
             });
             $( rowID ).after( appendHTML );
             $( rowID ).next().trigger('crmLoad');
-            $('.crm-editable').crmEditable();
           }
       });
     }
diff --git a/templates/CRM/Mailing/Page/Component.tpl b/templates/CRM/Mailing/Page/Component.tpl
index 6017e8a556..40570eddaa 100644
--- a/templates/CRM/Mailing/Page/Component.tpl
+++ b/templates/CRM/Mailing/Page/Component.tpl
@@ -33,7 +33,6 @@
        {strip}
        {* handle enable/disable actions*}
        {include file="CRM/common/enableDisableApi.tpl"}
-       {include file="CRM/common/crmeditable.tpl"}
        <table cellpadding="0" cellspacing="0" border="0">
         <thead class="sticky">
         <th>{ts}Name{/ts}</th>
diff --git a/templates/CRM/Member/Page/MembershipStatus.tpl b/templates/CRM/Member/Page/MembershipStatus.tpl
index f30d3b3ad3..0c2c4f209e 100644
--- a/templates/CRM/Member/Page/MembershipStatus.tpl
+++ b/templates/CRM/Member/Page/MembershipStatus.tpl
@@ -39,7 +39,6 @@
         {strip}
         {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
         <table cellpadding="0" cellspacing="0" border="0">
         <thead class="sticky">
             <th>{ts}Status{/ts}</th>
diff --git a/templates/CRM/Member/Page/MembershipType.tpl b/templates/CRM/Member/Page/MembershipType.tpl
index ebd06686f1..a4460740e8 100644
--- a/templates/CRM/Member/Page/MembershipType.tpl
+++ b/templates/CRM/Member/Page/MembershipType.tpl
@@ -35,7 +35,6 @@
   {strip}
   {* handle enable/disable actions*}
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
     <table id="options" class="row-highlight">
       <thead>
       <tr>
diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl
index 03542ce814..11a97de176 100644
--- a/templates/CRM/Price/Page/Field.tpl
+++ b/templates/CRM/Price/Page/Field.tpl
@@ -53,7 +53,6 @@
   {strip}
   {* handle enable/disable actions*}
   {include file="CRM/common/enableDisableApi.tpl"}
-  {include file="CRM/common/crmeditable.tpl"}
     <table id="options" class="row-highlight">
       <thead>
        <tr>
diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl
index 7b6e5401e3..465caa2835 100644
--- a/templates/CRM/Price/Page/Option.tpl
+++ b/templates/CRM/Price/Page/Option.tpl
@@ -49,7 +49,6 @@
       {strip}
         {* handle enable/disable actions*}
         {include file="CRM/common/enableDisableApi.tpl"}
-        {include file="CRM/common/crmeditable.tpl"}
         <table id="options" class="row-highlight">
           <thead>
           <tr>
diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl
index 21292be06e..d6539b3130 100644
--- a/templates/CRM/Price/Page/Set.tpl
+++ b/templates/CRM/Price/Page/Set.tpl
@@ -54,7 +54,6 @@
         {strip}
   {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
   {include file="CRM/common/jsortable.tpl"}
         <table id="price_set" class="display crm-price-set-listing">
         <thead>
diff --git a/templates/CRM/Report/Form.tpl b/templates/CRM/Report/Form.tpl
index f958bbb1cc..4eef84cec0 100644
--- a/templates/CRM/Report/Form.tpl
+++ b/templates/CRM/Report/Form.tpl
@@ -24,7 +24,6 @@
  +--------------------------------------------------------------------+
 *}
 {if $outputMode neq 'print'}
-  {include file="CRM/common/crmeditable.tpl"}
 {/if}
 {* this div is being used to apply special css *}
 {if $section eq 1}
diff --git a/templates/CRM/Report/Page/Options.tpl b/templates/CRM/Report/Page/Options.tpl
index 8d4a5bd45e..7d0d2fc229 100644
--- a/templates/CRM/Report/Page/Options.tpl
+++ b/templates/CRM/Report/Page/Options.tpl
@@ -37,7 +37,6 @@
     {strip}
       {* handle enable/disable actions*}
       {include file="CRM/common/enableDisableApi.tpl"}
-      {include file="CRM/common/crmeditable.tpl"}
       <table id="options" class="row-highlight">
         <thead>
         <tr>
diff --git a/templates/CRM/SMS/Page/Provider.tpl b/templates/CRM/SMS/Page/Provider.tpl
index 181afdcc0e..84bcc587b6 100644
--- a/templates/CRM/SMS/Page/Provider.tpl
+++ b/templates/CRM/SMS/Page/Provider.tpl
@@ -37,7 +37,6 @@
     {strip}
         {* handle enable/disable actions*}
        {include file="CRM/common/enableDisableApi.tpl"}
-       {include file="CRM/common/crmeditable.tpl"}
         <br/><table class="selector row-highlight">
         <tr class="columnheader">
             <th >{ts}Provider Details{/ts}</th>
diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl
index 4ae3954a82..6bdddfde92 100644
--- a/templates/CRM/UF/Page/Field.tpl
+++ b/templates/CRM/UF/Page/Field.tpl
@@ -44,7 +44,6 @@
         {strip}
         {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
         <table id="options" class="row-highlight">
             <thead>
             <tr>
diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index 70fa31afb5..f1b79d1541 100644
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -65,7 +65,6 @@
 
         {* handle enable/disable actions*}
         {include file="CRM/common/enableDisableApi.tpl"}
-        {include file="CRM/common/crmeditable.tpl"}
         {include file="CRM/common/jsortable.tpl"}
         <div id="user-profiles">
            <div class="crm-content-block">
diff --git a/templates/CRM/common/crmeditable.tpl b/templates/CRM/common/crmeditable.tpl
index 8aae1e3830..b68d6c141c 100644
--- a/templates/CRM/common/crmeditable.tpl
+++ b/templates/CRM/common/crmeditable.tpl
@@ -1,7 +1,9 @@
+{* @deprecated *}
+
 <script>
 {literal}
 CRM.$(function($) {
-  $('.crm-editable').crmEditable ();
+  CRM.console('warn', 'Warning: A CiviCRM extension is attempting to use the deprecated crmeditable.tpl. The extension needs to be updated to remove references to this template.');
 });
 </script>
 {/literal}
-- 
2.25.1