Eliminate support for old jQuery UI based crm-button-icon icon buttons

diff --git a/ang/crmMailingAB/EditCtrl/report.html b/ang/crmMailingAB/EditCtrl/report.html
index 18380923c1eeb28c1ab05bcb5d9e7bff04fa8b49..5e97ae964a5b9ef7a7436bc68346289e14ffa551 100644 (file)
--- a/ang/crmMailingAB/EditCtrl/report.html
+++ b/ang/crmMailingAB/EditCtrl/report.html
@@ -83,7 +83,7 @@
           class="crm-hover-button action-item"
           ng-href="{{statUrl(am.mailing, statType, 'report')}}"
           title="{{ts('Reports for \'%1\'', {1: statType.title})}}"
-          crm-icon="clipboard"
+          crm-icon="fa-clipboard"
           ></a>
       </td>
       <td ng-show="abtest.ab.status == 'Testing'"></td>

diff --git a/ang/crmUi.js b/ang/crmUi.js
index c6ba58b1464ef6d156cf5e3875a573b955a9f289..355939c2dcf71ec855ac2fdaadc0c26d73c7db47 100644 (file)
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -908,7 +908,7 @@
     })
 
     // Example for Font Awesome: <button crm-icon="fa-check">Save</button>
-    // Example for jQuery UI (deprecated): <button crm-icon="check">Save</button>
+    // Example for jQuery UI (deprecated): <button crm-icon="fa-check">Save</button>
     .directive('crmIcon', function() {
       return {
         restrict: 'EA',

diff --git a/css/civicrm.css b/css/civicrm.css
index 22a6b34bf7730d6ccef926affa77a89585b09094..12b14aab451a1f38296f6b3913fcbc8128db43af 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2062,15 +2062,6 @@ input.crm-form-entityref {
   padding-left: 0;
 }
 
-.crm-container .crm-button-icon {
-  background-image: url("../i/icons/jquery-ui-FFFFFF.png");
-  height: 16px;
-  width: 16px;
-  display: block;
-  position: absolute;
-  pointer-events: none;
-}
-
 .crm-container .delete-icon {
   background-position: -176px -96px;
 }

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 9a3c3f1ce572d21cec0c0012a9a4840d339c7a83..e65bd7b2a22c946265f100899d9b50b24a6b6a5c 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -517,7 +517,7 @@
             added.push(identifier);
           }
           // display:none causes the form to not submit when pressing "enter"
-          $el.parents(buttonContainers).css({height: 0, padding: 0, margin: 0, overflow: 'hidden'}).find('.crm-button-icon').hide();
+          $el.parents(buttonContainers).css({height: 0, padding: 0, margin: 0, overflow: 'hidden'});
         });
         $el.dialog('option', 'buttons', buttons);
       }

diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 9af85592f3a5585fb8d48295e3454cc6b86aa471..7af01e646bec483f29db5b938c76eeeea01635b1 100644 (file)
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -42,12 +42,9 @@
     {capture assign=iconPrefix}{$icon|truncate:3:"":true}{/capture}
     {if $icon && $iconPrefix eq 'fa-'}
       {capture assign=iconDisp}<i class="crm-i {$icon}" aria-hidden="true"></i>{/capture}
-    {elseif $icon}
-      {assign var='buttonClass' value=' crm-icon-button'}
-      {capture assign=iconDisp}<span class="crm-button-icon ui-icon-{$icon}"> </span>{/capture}
     {/if}
     {crmGetAttribute html=$html attr='disabled' assign='disabled'}
-    <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{$buttonClass}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
+    <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
       {$iconDisp}
       {$html}
     </span>