CRM-15759 - Extend in-place editing to more places

diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl
index 424e9dd3a16351c59c6b8b2d335370c5d2b38f46..ea4f4c316c73cf65d0651b864e8c8dca44509ab9 100644 (file)
--- a/templates/CRM/Admin/Page/LocationType.tpl
+++ b/templates/CRM/Admin/Page/LocationType.tpl
@@ -53,7 +53,7 @@
     <tr id="location_type-{$row.id}" class="{cycle values="odd-row,even-row"} {$row.class} crm-entity {if NOT $row.is_active} disabled{/if}">
         <td class="crmf-name">{$row.name}</td>
         <td class="crmf-display_name crm-editable">{$row.display_name}</td>
-        <td class="crmf-vcard_name">{$row.vcard_name}</td>
+        <td class="crmf-vcard_name crm-editable">{$row.vcard_name}</td>
         <td class="crmf-description crm-editable">{$row.description}</td>
         <td id="row_{$row.id}_status" class="crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
         <td class="crmf-is_default" >{if $row.is_default eq 1}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Default{/ts}" />{/if}&nbsp;</td>
@@ -70,7 +70,7 @@
     </div>
   {/if}
   <div class="action-link">
-    <a href="{crmURL q="action=add&reset=1"}" id="newLocationType" class="button"><span><div class="icon add-icon"></div>{ts}Add Location Type{/ts}</span></a>
+    <a href="{crmURL q="action=add&reset=1"}" id="newLocationType" class="button"><span><div class="icon add-icon"></div>{ts}Add Option{/ts}</span></a>
     <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl
index 18f87fc3a1cf50623b28f26cf185aa1cd1fb7f75..be42f110b17cab951b8b5a06027cff9041737e3e 100644 (file)
--- a/templates/CRM/Admin/Page/OptionGroup.tpl
+++ b/templates/CRM/Admin/Page/OptionGroup.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">
         <tr class="columnheader">
         <th>{ts}Title{/ts}</th>

diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index 23394b221360a20bb1b25a3bc05626701052ee23..9334e25bab7eab9f9fecc232bfe6faf443b8a58d 100644 (file)
--- a/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -47,14 +47,14 @@
       </thead>
       {foreach from=$rows item=row}
        <tr id="participant_status_type-{$row.id}" class="crm-entity crm-participant_{$row.id} {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
-          <td class="crm-participant-label crm-editable" data-field="label">{$row.label}</td>
-          <td class="crm-participant-name">{$row.name} ({$row.id})</td>
-          <td class="crm-participant-class">{$row.class}</td>
-          <td class="yes-no crm-participant-is_reserved">{if $row.is_reserved}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Reserved{/ts}" />{/if}</td>
-        <td id="row_{$row.id}_status" class="crm-participant-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-          <td class="yes-no crm-participant-is_counted">{if $row.is_counted} <img src="{$config->resourceBase}i/check.gif" alt="{ts}Counted{/ts}" />{/if}</td>
-          <td class="crm-participant-weight">{$row.weight}</td>
-          <td class="crm-participant-visibility">{$row.visibility}</td>
+          <td class="crmf-label crm-editable" data-field="label">{$row.label}</td>
+          <td class="crmf-name">{$row.name} ({$row.id})</td>
+          <td class="crmf-class crm-editable" data-type="select">{$row.class}</td>
+          <td class="yes-no crmf-is_reserved">{if $row.is_reserved}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Reserved{/ts}" />{/if}</td>
+        <td id="row_{$row.id}_status" class="crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+          <td class="yes-no crmf-is_counted">{if $row.is_counted} <img src="{$config->resourceBase}i/check.gif" alt="{ts}Counted{/ts}" />{/if}</td>
+          <td class="crmf-weight">{$row.weight}</td>
+          <td class="crmf-visibility">{$row.visibility}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>
       {/foreach}

diff --git a/templates/CRM/Admin/Page/PaymentProcessor.tpl b/templates/CRM/Admin/Page/PaymentProcessor.tpl
index 754d20c826ed5b36b62ac80647caa468c1b1ee52..14fec223b228410596f67dafd8dd9cd60ca54194 100644 (file)
--- a/templates/CRM/Admin/Page/PaymentProcessor.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessor.tpl
@@ -49,12 +49,12 @@
         </tr>
         {foreach from=$rows item=row}
         <tr id="payment_processor-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
-            <td class="crm-payment_processor-name">{$row.name}</td>
-            <td class="crm-payment_processor-payment_processor_type">{$row.payment_processor_type}</td>
-            <td class="crm-payment_processor-description">{$row.description}</td>
-            <td class="crm-payment_processor-financialAccount">{$row.financialAccount}</td>
-            <td id="row_{$row.id}_status" class="crm-payment_processor-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-            <td class="crm-payment_processor-is_default">{if $row.is_default eq 1}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Default{/ts}" />{/if}&nbsp;</td>
+            <td class="crmf-name">{$row.name}</td>
+            <td class="crmf-payment_processor_type">{$row.payment_processor_type}</td>
+            <td class="crmf-description">{$row.description}</td>
+            <td class="crmf-financial_account_id">{$row.financialAccount}</td>
+            <td class="crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+            <td class="crmf-is_default">{if $row.is_default eq 1}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Default{/ts}" />{/if}&nbsp;</td>
           <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>
         {/foreach}

diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index 94c29e95f791f0d6abc192763458f7d38605a974..bec02ff2bdcddad277b24c7bb9dfbe065182b395 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -140,20 +140,9 @@
 
 {literal}
 <script type="text/javascript">
+(function($) {
 
-  {/literal}
-  {* load selector when force *}
-  {if $force and !$buildSelector}
-  {literal}
-  CRM.$(function($) {
-    searchCampaigns({/literal}'{$qfKey}'{literal});
-  });
-
-  {/literal}
-  {/if}
-  {literal}
-
-  function searchCampaigns(qfKey) {
+  window.searchCampaigns = function searchCampaigns(qfKey) {
     var dataUrl = {/literal}"{crmURL h=0 q='search=1&snippet=4&type=campaign'}"{literal};
 
     //lets carry qfKey to retain form session.
@@ -161,16 +150,16 @@
       dataUrl = dataUrl + '&qfKey=' + qfKey;
     }
 
-    CRM.$.get(dataUrl, null, function (campaignList) {
-      CRM.$('#campaignList').html(campaignList).trigger('crmLoad');
+    $.get(dataUrl, null, function (campaignList) {
+      $('#campaignList').html(campaignList).trigger('crmLoad');
 
       //collapse the search form.
       var searchFormName = '#search_form_' + {/literal}'{$searchFor}'{literal};
-      CRM.$(searchFormName + '.crm-accordion-wrapper:not(.collapsed)').crmAccordionToggle();
+      $(searchFormName + '.crm-accordion-wrapper:not(.collapsed)').crmAccordionToggle();
     }, 'html');
-  }
+  };
 
-  function loadCampaignList() {
+  window.loadCampaignList = function() {
     var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=campaignList' }"{literal};
 
     //build the search qill.
@@ -184,7 +173,7 @@
     var count = 0;
     var searchQill = [];
     for (param in searchParams) {
-      if (val = CRM.$('#' + param).val()) {
+      if (val = $('#' + param).val()) {
         if (param == 'status_id') {
           val = campaignStatus[val];
         }
@@ -195,7 +184,7 @@
       }
     }
     noRecordFoundMsg += searchQill.join('<span class="font-italic"> ...AND... </span></div><div class="qill">');
-    CRM.$('table.campaigns', '#campaignList').dataTable({
+    $('table.campaigns', '#campaignList').dataTable({
       "bFilter": false,
       "bAutoWidth": false,
       "bProcessing": false,
@@ -204,14 +193,14 @@
       "aoColumns": [
         {sClass: 'crm-campaign-id                   hiddenElement' },
         {sClass: 'crm-campaign-name                 hiddenElement' },
-        {sClass: 'crm-campaign-title'                              },
-        {sClass: 'crm-campaign-description'                        },
+        {sClass: 'crmf-title crm-editable'                              },
+        {sClass: 'crmf-description crm-editable'                        },
         {sClass: 'crm-campaign-start_date'                         },
         {sClass: 'crm-campaign-end_date'                           },
         {sClass: 'crm-campaign-campaign-type_id     hiddenElement' },
-        {sClass: 'crm-campaign-campaign-type'                      },
+        {sClass: 'crmf-campaign_type_id crm-editable'                      },
         {sClass: 'crm-campaign-campaign-status_id   hiddenElement' },
-        {sClass: 'crm-campaign-campaign-status'                    },
+        {sClass: 'crmf-status_id crm-editable'                    },
         {sClass: 'crm-campaign-campaign-is_active   hiddenElement' },
         {sClass: 'crm-campaign-campaign-isAactive'                 },
         {sClass: 'crm-campaign-action', bSortable: false}
@@ -225,20 +214,22 @@
       "oLanguage": {"sEmptyTable": noRecordFoundMsg,
         "sZeroRecords": noRecordFoundMsg },
       "fnDrawCallback": function () {
-        CRM.$().crmtooltip();
+        $('.crm-editable').crmEditable();
       },
       "fnRowCallback": function (nRow, aData, iDisplayIndex) {
         //insert the id for each row for enable/disable.
         var rowId = 'campaign-' + aData[0];
-        CRM.$(nRow).attr('id', rowId).addClass('crm-entity');
+        $(nRow).attr('id', rowId).addClass('crm-entity');
         //handled disabled rows.
         var isActive = Boolean(Number(aData[10]));
         if (!isActive) {
-          CRM.$(nRow).addClass('disabled');
+          $(nRow).addClass('disabled');
         }
 
-        //add id for yes/no column.
-        CRM.$(nRow).children().eq(11).attr('id', rowId + '_status');
+        // Crm-editable
+        $(nRow).children().eq(3).data('type', 'textarea');
+        $(nRow).children().eq(7).data('type', 'select');
+        $(nRow).children().eq(9).data('type', 'select');
 
         return nRow;
       },
@@ -256,7 +247,7 @@
           if (param == 'campaign_title') {
             fldName = 'title';
           }
-          if (val = CRM.$('#' + param).val()) {
+          if (val = $('#' + param).val()) {
             aoData[dataLength++] = {name: fldName, value: val};
           }
           searchCriteria[count++] = fldName;
@@ -268,7 +259,7 @@
         //lets transfer search criteria.
         aoData[dataLength++] = {name: 'searchCriteria', value: searchCriteria.join(',')};
 
-        CRM.$.ajax({
+        $.ajax({
           "dataType": 'json',
           "type": "POST",
           "url": sSource,
@@ -277,7 +268,19 @@
         });
       }
     });
-  }
+  };
 
+  {/literal}
+  {* load selector when force *}
+  {if $force and !$buildSelector}
+  {literal}
+  $(function($) {
+    searchCampaigns({/literal}'{$qfKey}'{literal});
+  });
+
+  {/literal}
+  {/if}
+  {literal}
+})(CRM.$);
 </script>
 {/literal}

diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl
index 67a9fe7f41320cc2427887e7eb9642bd75f092a7..329ceae333c336269efafd32c169d09fa9bf3e94 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -178,17 +178,18 @@ function loadPetitionList( )
              "bProcessing": false,
              "bLengthChange": false,
              "aaSorting": [],
-             "aoColumns":[{sClass:'crm-petition-id                          hiddenElement' },
-                 {sClass:'crm-petition-title'                                     },
-           {sClass:'crm-petition-campaign_id                 hiddenElement' },
-           {sClass:'crm-petition-campaign'                                  },
-           {sClass:'crm-petition-activity_type_id            hiddenElement' },
-           {sClass:'crm-petition-activity_type               hiddenElement' },
-           {sClass:'crm-petition-is_default'                                },
-           {sClass:'crm-petition-is_active                   hiddenElement' },
-           {sClass:'crm-petition-isActive'                                  },
-           {sClass:'crm-petition-action',                    bSortable:false}
-           ],
+             "aoColumns":[
+                 {sClass:'crm-petition-id                          hiddenElement' },
+                 {sClass:'crmf-title crm-editable'                                     },
+                 {sClass:'crm-petition-campaign_id                 hiddenElement' },
+                 {sClass:'crmf-campaign_id'                                  },
+                 {sClass:'crm-petition-activity_type_id            hiddenElement' },
+                 {sClass:'crm-petition-activity_type               hiddenElement' },
+                 {sClass:'crm-petition-is_default'                                },
+                 {sClass:'crm-petition-is_active                   hiddenElement' },
+                 {sClass:'crm-petition-isActive'                                  },
+                 {sClass:'crm-petition-action',                    bSortable:false}
+             ],
              "sPaginationType": "full_numbers",
              "sDom"       : 'rt<"crm-datatable-pager-bottom"ip>',
              "bServerSide": true,
@@ -197,7 +198,9 @@ function loadPetitionList( )
              "asStripClasses" : [ "odd-row", "even-row" ],
              "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
                  "sZeroRecords" : noRecordFoundMsg },
-             "fnDrawCallback": function() { CRM.$().crmtooltip(); },
+             "fnDrawCallback": function() {
+               CRM.$('.crm-editable').crmEditable();
+             },
              "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
          //insert the id for each row for enable/disable.
          var rowId = 'survey-' + aData[0];

diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl
index 8c9b32209d34bf5700210653be67cf4a52ef6209..484b400d5e3db7d6abc2c21561c96e7ea7653f66 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -189,7 +189,7 @@ function loadSurveyList( )
              "bLengthChange": false,
              "aaSorting": [],
              "aoColumns":[{sClass:'crm-survey-id                          hiddenElement' },
-                          {sClass:'crm-survey-title'                                     },
+                          {sClass:'crmf-title crm-editable'                                     },
                           {sClass:'crm-survey-campaign_id                 hiddenElement' },
                           {sClass:'crm-survey-campaign'                                  },
                           {sClass:'crm-survey-activity_type_id            hiddenElement' },
@@ -212,7 +212,9 @@ function loadSurveyList( )
              "asStripClasses" : [ "odd-row", "even-row" ],
              "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
                  "sZeroRecords" : noRecordFoundMsg },
-             "fnDrawCallback": function() { CRM.$().crmtooltip(); },
+             "fnDrawCallback": function() {
+               CRM.$('.crm-editable').crmEditable();
+             },
              "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
          //insert the id for each row for enable/disable.
          var rowId = 'survey-' + aData[0];

diff --git a/templates/CRM/Custom/Page/Field.tpl b/templates/CRM/Custom/Page/Field.tpl
index 33fd40d5629bf9b5de4ff3e1f65bc390315b1cda..42181e10291c087e4536968adcc77fb4a33c6e62 100644 (file)
--- a/templates/CRM/Custom/Page/Field.tpl
+++ b/templates/CRM/Custom/Page/Field.tpl
@@ -51,14 +51,14 @@
         </thead>
         <tbody>
         {foreach from=$customField item=row}
-        <tr id="CustomField-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {if NOT $row.is_active} disabled{/if}">
-            <td><span class="crm-editable crmf-label">{$row.label}</span></td>
+        <tr id="CustomField-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"}{if NOT $row.is_active} disabled{/if}">
+            <td class="crm-editable" data-field="label">{$row.label}</td>
             <td>{$row.data_type}</td>
             <td>{$row.html_type}</td>
             <td class="nowrap">{$row.weight}</td>
-            <td>{if $row.is_required eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-            <td>{if $row.is_searchable eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-            <td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+            <td class="crm-editable" data-type="boolean" data-field="is_required">{if $row.is_required eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+            <td class="crm-editable" data-type="boolean" data-field="is_searchable">{if $row.is_searchable eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+            <td>{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
             <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>
         {/foreach}

diff --git a/templates/CRM/Custom/Page/Group.tpl b/templates/CRM/Custom/Page/Group.tpl
index 3e17c5b227b6ff6b6c05ddf03a50dbff208e0341..79e1537075bd3844d34d3e5e76efd2d5634aa0bf 100644 (file)
--- a/templates/CRM/Custom/Page/Group.tpl
+++ b/templates/CRM/Custom/Page/Group.tpl
@@ -57,7 +57,7 @@
         <tbody>
         {foreach from=$rows item=row}
         <tr id="CustomGroup-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
-          <td><span class="crmf-title crm-editable">{$row.title}</span></td>
+          <td class="crmf-title crm-editable">{$row.title}</td>
           <td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td>{if $row.extends eq 'Contact'}{ts}All Contact Types{/ts}{else}{$row.extends_display}{/if}</td>
           <td>{$row.extends_entity_column_value}</td>

diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index ac974cba435a0ca9be5c44a713dff2b054c07574..a51972658565012bfb2c3a102621035284330925 100644 (file)
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -50,10 +50,10 @@
             <th>&nbsp;</th>
           </tr>
           {foreach from=$customOption item=row key=id}
-            <tr id="OptionValue-{$id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class} crm-custom_option {if NOT $row.is_active} disabled{/if}">
-              <td><span class="crm-custom_option-label crm-editable crmf-label">{$row.label}</span></td>
-              <td><span class="crm-custom_option-value disabled-crm-editable" data-field="value" data-action="update">{$row.value}</span></td>
-              <td class="crm-custom_option-default_value crmf-value">{$row.default_value}</td>
+            <tr id="OptionValue-{$id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class} crm-custom_option{if !$row.is_active} disabled{/if}">
+              <td class="crm-custom_option-label crm-editable crmf-label">{$row.label}</td>
+              <td class="crm-custom_option-value disabled-crm-editable" data-field="value" data-action="update">{$row.value}</td>
+              <td class="crm-custom_option-default_value crmf-default_value">{$row.default_value}</td>
               <td class="nowrap crm-custom_option-weight crmf-weight">{$row.weight}</td>
               <td id="row_{$id}_status" class="crm-custom_option-is_active crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
               <td>{$row.action|replace:'xx':$id}</td>
@@ -63,7 +63,7 @@
         {/strip}
 
         <div class="action-link">
-            <a href="{crmURL q="reset=1&action=add&fid=$fid&gid=$gid"}" class="button action-item"><span><div class="icon add-icon"></div> {ts 1=$fieldTitle}Add Option for '%1'{/ts}</span></a>
+            <a href="{crmURL q="reset=1&action=add&fid=$fid&gid=$gid"}" class="button action-item"><span><div class="icon add-icon"></div> {ts}Add Option{/ts}</span></a>
             <a href="{crmURL p="civicrm/admin/custom/group/field" q="reset=1&action=browse&gid=$gid"}" class="button action-item cancel"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
         </div>
       </div>

diff --git a/templates/CRM/Financial/Page/FinancialType.tpl b/templates/CRM/Financial/Page/FinancialType.tpl
index 10db43e545b9ad6603761ce524d2e0226dc829a0..7e87ffd29f1001579a216eaf67fc9f2f8d52fc7e 100644 (file)
--- a/templates/CRM/Financial/Page/FinancialType.tpl
+++ b/templates/CRM/Financial/Page/FinancialType.tpl
@@ -56,8 +56,8 @@
         <tr id="financial_type-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
           <td class="crm-editable" data-field="name">{$row.name}</td>
           <td class="crm-editable" data-field="description" data-type="textarea">{$row.description}</td>
-     <td>{$row.financial_account}</td>
-          <td>{if $row.is_deductible eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+          <td>{$row.financial_account}</td>
+          <td class="crm-editable" data-field="is_deductible" data-type="boolean">{if $row.is_deductible eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td>{if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>

diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl
index bded6047f558a60a9fd7b9647197fd54140dce57..4a9233fd3d0ce79619f410ba85342d6f7a09a1c4 100644 (file)
--- a/templates/CRM/Group/Form/Search.tpl
+++ b/templates/CRM/Group/Form/Search.tpl
@@ -178,7 +178,8 @@ CRM.$(function($) {
           $(nRow).addClass(cl).attr({id: 'row_' + id, 'data-id': id, 'data-entity': 'group'});
           $('td:eq(0)', nRow).wrapInner('<span class="crm-editable crmf-title" />');
           $('td:eq(1)', nRow).addClass('right');
-          $('td:eq(3)', nRow).wrapInner('<span class="crm-editable crmf-description" data-type="textarea" />');
+          $('td:eq(3)', nRow).wrapInner('<div class="crm-editable crmf-description" data-type="textarea" />');
+          $('td:eq(5)', nRow).wrapInner('<div class="crm-editable crmf-visibility" data-type="select" />');
           if (parentsOnly) {
             if ($(nRow).hasClass('crm-group-parent')) {
               $(nRow).find('td:first').prepend('{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span>{literal}');
@@ -295,9 +296,9 @@ CRM.$(function($) {
               }
               appendHTML += '<td class="right">' + val.count + "</td>";
               appendHTML += "<td>" + val.created_by + "</td>";
-              appendHTML += '<td><span class="crm-editable crmf-description" data-type="textarea">' + (val.group_description || '') + "</span></td>";
+              appendHTML += '<td class="crm-editable crmf-description" data-type="textarea">' + (val.group_description || '') + "</td>";
               appendHTML += "<td>" + val.group_type + "</td>";
-              appendHTML += "<td>" + val.visibility + "</td>";
+              appendHTML += '<td class="crm-editable crmf-visibility" data-type="select">' + val.visibility + "</td>";
               if (showOrgInfo) {
                 appendHTML += "<td>" + val.org_info + "</td>";
               }

diff --git a/templates/CRM/Member/Page/MembershipStatus.tpl b/templates/CRM/Member/Page/MembershipStatus.tpl
index 408c10ff8ff2c4f617e1b1eff6b09aae176109fe..f30d3b3ad389c75b9fe98271b600effb1f489e25 100644 (file)
--- a/templates/CRM/Member/Page/MembershipStatus.tpl
+++ b/templates/CRM/Member/Page/MembershipStatus.tpl
@@ -47,19 +47,19 @@
             <th>{ts}End Event{/ts}</th>
             <th>{ts}Member{/ts}</th>
             <th>{ts}Admin{/ts}</th>
-          <th>{ts}Weight{/ts}</th>
-          <th>{ts}Enabled?{/ts}</th>
+          <th>{ts}Order{/ts}</th>
+          <th>{ts}Reserved?{/ts}</th>
           <th></th>
         </thead>
         {foreach from=$rows item=row}
-        <tr id="membership_status-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class} {if NOT $row.is_active} disabled{/if} crm-membership-status">
-          <td class="crm-membership-status-label crm-editable" data-field="label">{$row.label}</td>
-          <td class="crm-membership-status-start_event">{$row.start_event}</td>
-          <td class="crm-membership-status-end_event">{$row.end_event}</td>
-          <td class="crm-membership-status-is_current_member">{if $row.is_current_member eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-          <td class="crm-membership-status-is_admin">{if $row.is_admin eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-          <td class="nowrap crm-membership-status-weight">{$row.weight}</td>
-          <td id="row_{$row.id}_status" class="crm-membership-status-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+        <tr id="membership_status-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class} {if NOT $row.is_active} disabled{/if} crmf">
+          <td class="crmf-label crm-editable" >{$row.label}</td>
+          <td class="crmf-start_event crm-editable" data-type="select" data-empty-option="{ts}- none -{/ts}">{$row.start_event}</td>
+          <td class="crmf-end_event crm-editable" data-type="select" data-empty-option="{ts}- none -{/ts}">{$row.end_event}</td>
+          <td class="crmf-is_current_member crm-editable" data-type="boolean">{if $row.is_current_member eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+          <td class="crmf-is_admin crm-editable" data-type="boolean">{if $row.is_admin eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+          <td class="nowrap crmf-weight">{$row.weight}</td>
+          <td class="crmf-is_reserved">{if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>
           </tr>
         {/foreach}

diff --git a/templates/CRM/Member/Page/MembershipType.tpl b/templates/CRM/Member/Page/MembershipType.tpl
index 17cb60ad738437ddbb593356f55bb0fc83b00586..ebd06686f13861d997785593b2d7113dfd86edec 100644 (file)
--- a/templates/CRM/Member/Page/MembershipType.tpl
+++ b/templates/CRM/Member/Page/MembershipType.tpl
@@ -55,17 +55,17 @@
       </thead>
       {foreach from=$rows item=row}
         <tr id="membership_type-{$row.id}" class="crm-entity {cycle values='odd-row,even-row'} {$row.class} crm-membership-type {if NOT $row.is_active} disabled{/if}">
-          <td class="crm-membership-type-type_name crm-editable" data-field="name">{$row.name}</td>
-          <td class="crm-memberhip-type-period_type">{$row.period_type}</td>
-          <td class="crm-membership-type-fixed_period_start_day">{$row.fixed_period_start_day}</td>
-          <td class="crm-membership-type-minimum_fee" align="right">{$row.minimum_fee|crmMoney}</td>
-          <td class="crm-membership-type-duration_interval_unit">{$row.duration_interval} {$row.duration_unit}</td>
-          <td class="crm-membership-type-auto-renew">{if $row.auto_renew EQ 2}{ts}Required{/ts}{elseif $row.auto_renew EQ 1}{ts}Optional{/ts}{else}{ts}No{/ts}{/if}</td>
-          <td class="crm-membership-type-relationship_type_name">{$row.relationshipTypeName}</td>
-          <td class="crm-membership-type-max_related" align="right">{$row.maxRelated}</td>
-          <td class="crm-membership-type-visibility">{$row.visibility}</td>
-          <td class="nowrap crm-membership_type-order">{$row.weight}</td>
-          <td class="crm-membership-type-status_{$row.id}" id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+          <td class="crmf-name crm-editable" data-field="name">{$row.name}</td>
+          <td class="crmf-period_type crm-editable" data-type="select">{$row.period_type}</td>
+          <td class="crmf-fixed_period_start_day">{$row.fixed_period_start_day}</td>
+          <td class="crmf-minimum_fee" align="right">{$row.minimum_fee|crmMoney}</td>
+          <td class="crmf-duration_interval_unit">{$row.duration_interval} {$row.duration_unit}</td>
+          <td class="crmf-auto_renew">{if $row.auto_renew EQ 2}{ts}Required{/ts}{elseif $row.auto_renew EQ 1}{ts}Optional{/ts}{else}{ts}No{/ts}{/if}</td>
+          <td class="crmf-relationship_type">{$row.relationshipTypeName}</td>
+          <td class="crmf-max_related" align="right">{$row.maxRelated}</td>
+          <td class="crmf-visibility crm-editable" data-type="select">{$row.visibility}</td>
+          <td class="nowrap crmf-weight">{$row.weight}</td>
+          <td class="crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>
       {/foreach}

diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl
index 6533b9f92d90351b9428761d29321a730c632dae..03542ce8140d40cc4eba96edd1d9d5ae9750e5c3 100644 (file)
--- a/templates/CRM/Price/Page/Field.tpl
+++ b/templates/CRM/Price/Page/Field.tpl
@@ -77,7 +77,7 @@
         <td class="crm-editable" data-field="label">{$row.label}</td>
         <td>{$row.html_type_display}</td>
         <td class="nowrap">{$row.weight}</td>
-        <td>{if $row.is_required eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+        <td class="crm-editable" data-field="is_required" data-type="boolean">{if $row.is_required eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
         <td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
         <td>{if $row.active_on}{$row.active_on|date_format:"%Y-%m-%d %T"}{/if}</td>
         <td>{if $row.expire_on}{$row.expire_on|date_format:"%Y-%m-%d %T"}{/if}</td>

diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl
index 6f278218a6408dfdf5d472f2bbf58574c11e0b97..21292be06ec3bc2aefa51748261d17b8700e24c1 100644 (file)
--- a/templates/CRM/Price/Page/Set.tpl
+++ b/templates/CRM/Price/Page/Set.tpl
@@ -67,10 +67,10 @@
         </thead>
         {foreach from=$rows item=row}
       <tr id="price_set-{$row.id}" class="crm-entity crm-price-set_{$row.id} {cycle values="even-row,odd-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
-            <td class="crm-price-set-title crm-editable" data-field="title">{$row.title}</td>
-          <td class="crm-price-set-extends">{$row.extends}</td>
-          <td id="row_{$row.id}_status" class="crm-price-set-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-            <td>{$row.action|replace:'xx':$row.id}</td>
+          <td class="crmf-title crm-editable">{$row.title}</td>
+          <td class="crmf-extends">{$row.extends}</td>
+          <td class="crmf-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+          <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>
         {/foreach}
         </table>

diff --git a/templates/CRM/Report/Page/Options.tpl b/templates/CRM/Report/Page/Options.tpl
index 4efd1cab007999079164a103b3870c5c50e0ab70..8d4a5bd45e900e71cc1175e5693d4737502841b2 100644 (file)
--- a/templates/CRM/Report/Page/Options.tpl
+++ b/templates/CRM/Report/Page/Options.tpl
@@ -65,7 +65,7 @@
               <td class="crm-report-optionList-default_value">{$row.default_value}</td>
             {/if}
             <td class="crm-report-optionList-is_reserved">{if $row.is_reserved eq 1}{ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-            <td class="crm-report-optionList-is_active" id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+            <td class="crm-report-optionList-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
             <td class="crm-report-optionList-component_name">{$row.component_name}</td>
             <td class="crm-report-optionList-action">{$row.action}</td>
           </tr>

diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl
index c7d4bb7837bb0c3aa253c0b1a111448ad6cd6908..4ae3954a82bb69682dbc65f8fb2f8885c53f0219 100644 (file)
--- a/templates/CRM/UF/Page/Field.tpl
+++ b/templates/CRM/UF/Page/Field.tpl
@@ -65,13 +65,13 @@
             <tr id="UFField-{$row.id}"class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
                 <td><span class="crmf-label crm-editable">{$row.label}</span>({$row.field_type})</td>
                 {if in_array("Profile",$otherModules) or in_array("Search Profile",$otherModules) }
-                <td>{$row.visibility_display}</td>
-                <td class="crmf-is_searchable">{if $row.is_searchable   eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-                <td class="crmf-in_selector">{if $row.in_selector     eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+                <td class="crm-editable crmf-visibility" data-type="select">{$row.visibility_display}</td>
+                <td class="crm-editable crmf-is_searchable" data-type="boolean">{if $row.is_searchable eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+                <td class="crm-editable crmf-in_selector" data-type="boolean">{if $row.in_selector eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 {/if}
                 <td class="nowrap">{$row.weight}</td>
-                <td class="crmf-is_required">{if $row.is_required     eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-                <td>{if $row.is_view         eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+                <td class="crm-editable crmf-is_required" data-type="boolean">{if $row.is_required eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+                <td class="crm-editable crmf-is_view" data-type="boolean">{if $row.is_view eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 <td>{if $row.is_reserved     eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 <td>{$row.action|replace:'xx':$row.id}</td>
             </tr>

diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index e00c341a6170bdf4173c4c81e15145471c8924ad..70fa31afb54689d4a02cd4a5da5e8a28089adedf 100644 (file)
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -85,13 +85,13 @@
             {foreach from=$rows item=row}
             {if !$row.is_reserved }
               <tr id="UFGroup-{$row.id}" class="crm-entity {$row.class}{if NOT $row.is_active} disabled{/if}">
-                <td><span class="crmf-title crm-editable">{$row.title}</span></td>
+                <td class="crmf-title crm-editable">{$row.title}</td>
                 <td>
                   {if $row.created_id && $row.created_by}
                     <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.created_id`"}">{ts}{$row.created_by}{/ts}</a>
                   {/if}
                 </td>
-                <td>{$row.description}</td>
+                <td class="crmf-description crm-editable" data-type="textarea">{$row.description}</td>
                 <td>{$row.group_type}</td>
                 <td>{$row.id}</td>
                 <td>{$row.module}</td>