From a61d612796bd1cc0024babbda4929751e39707df Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 22 Jun 2021 15:11:19 -0700
Subject: [PATCH] msgtplui - (REF) Use crm-icon

---
 ext/msgtplui/ang/msgtplui/Edit.html         | 16 ++++++++--------
 ext/msgtplui/ang/msgtplui/EditContent.html  | 16 ++++------------
 ext/msgtplui/ang/msgtplui/ExpandedEdit.html |  6 ++----
 ext/msgtplui/ang/msgtplui/Preview.html      |  3 +--
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/ext/msgtplui/ang/msgtplui/Edit.html b/ext/msgtplui/ang/msgtplui/Edit.html
index 68d69164a7..c68b910e84 100644
--- a/ext/msgtplui/ang/msgtplui/Edit.html
+++ b/ext/msgtplui/ang/msgtplui/Edit.html
@@ -73,17 +73,17 @@
     </div>
 
     <div class="btn-group pull-right">
-      <button type="button" class="btn btn-primary" ng-click="$ctrl.save()">
-        <i class="fa fa-check"/> {{ ts('Save') }}
+      <button crm-icon="fa-check" type="button" class="btn btn-primary" ng-click="$ctrl.save()">
+        {{:: ts('Save') }}
       </button>
-      <button type="button" class="btn btn-primary" ng-click="$ctrl.save().then($ctrl.cancel)">
-        <i class="fa fa-check-circle"/> {{ ts('Save and Done') }}
+      <button crm-icon="fa-check-circle" type="button" class="btn btn-primary" ng-click="$ctrl.save().then($ctrl.cancel)">
+        {{:: ts('Save and Done') }}
       </button>
-      <button type="button" class="btn btn-primary" ng-click="$ctrl.cancel()">
-        <i class="fa fa-times"/> {{ ts('Cancel') }}
+      <button crm-icon="fa-times" type="button" class="btn btn-primary" ng-click="$ctrl.cancel()">
+        {{:: ts('Cancel') }}
       </button>
-      <button type="button" class="btn btn-danger" crm-confirm="{type: 'delete', obj: {}, title: ts('Delete translation?'), message: ts('Are you sure want to delete this translation (%1)? This will remove any current and draft versions.', {1: $ctrl.lang})}" on-yes="$ctrl.delete()" ng-if="!!$ctrl.lang">
-        <i class="fa fa-trash"/> {{ ts('Delete') }}
+      <button crm-icon="fa-trash" type="button" class="btn btn-danger" crm-confirm="{type: 'delete', obj: {}, title: ts('Delete translation?'), message: ts('Are you sure want to delete this translation (%1)? This will remove any current and draft versions.', {1: $ctrl.lang})}" on-yes="$ctrl.delete()" ng-if="!!$ctrl.lang">
+        {{:: ts('Delete') }}
       </button>
     </div>
 
diff --git a/ext/msgtplui/ang/msgtplui/EditContent.html b/ext/msgtplui/ang/msgtplui/EditContent.html
index f7a4b8647c..641ee7dede 100644
--- a/ext/msgtplui/ang/msgtplui/EditContent.html
+++ b/ext/msgtplui/ang/msgtplui/EditContent.html
@@ -35,12 +35,8 @@
       />
       &nbsp;
       <div class="btn-group btn-group-xs pull-right" role="toolbar" aria-label="{{::ts('HTML Content: Toolbar')}}" ng-show="accordions.msg_html">
-        <button type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull(ts('HTML Content'), 'msg_html', {language: 'html'})">
-          <span class="fa fa-expand" aria-hidden="true"></span>
-        </button>
-        <button type="button" class="btn btn-default" title="{{::ts('Open preview')}}" ng-click="$ctrl.openPreview({formatName: 'msg_html'})">
-          <span class="fa fa-eye" aria-hidden="true"></span>
-        </button>
+        <button crm-icon="fa-expand" type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull(ts('HTML Content'), 'msg_html', {language: 'html'})"></button>
+        <button crm-icon="fa-eye" type="button" class="btn btn-default" title="{{::ts('Open preview')}}" ng-click="$ctrl.openPreview({formatName: 'msg_html'})"></button>
         <!--<button type="button" class="btn btn-default" title="{{::ts('Insert token')}}" ng-click="$ctrl.insertToken('msg_html')" crm-icon="fa-plus">-->
         <!--  {{::ts('Token')}}-->
         <!--</button>-->
@@ -67,12 +63,8 @@
       />
       &nbsp;
       <div class="btn-group btn-group-xs pull-right" role="toolbar" aria-label="{{::ts('Text Content: Toolbar')}}" ng-show="accordions.msg_text">
-        <button type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull(ts('Text Content'), 'msg_text', {language: 'smarty'})">
-          <span class="fa fa-expand" aria-hidden="true"></span>
-        </button>
-        <button type="button" class="btn btn-default" title="{{::ts('Open preview')}}" ng-click="$ctrl.openPreview({formatName: 'msg_text'})">
-          <span class="fa fa-eye" aria-hidden="true"></span>
-        </button>
+        <button crm-icon="fa-expand" type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull(ts('Text Content'), 'msg_text', {language: 'smarty'})"></button>
+        <button crmicon="fa-eye" type="button" class="btn btn-default" title="{{::ts('Open preview')}}" ng-click="$ctrl.openPreview({formatName: 'msg_text'})"></button>
         <!--<button type="button" class="btn btn-default" title="{{::ts('Insert token')}}" ng-click="$ctrl.insertToken('msg_text')" crm-icon="fa-plus">-->
         <!--  {{::ts('Token')}}-->
         <!--</button>-->
diff --git a/ext/msgtplui/ang/msgtplui/ExpandedEdit.html b/ext/msgtplui/ang/msgtplui/ExpandedEdit.html
index 204cc21ac0..bd334b2586 100644
--- a/ext/msgtplui/ang/msgtplui/ExpandedEdit.html
+++ b/ext/msgtplui/ang/msgtplui/ExpandedEdit.html
@@ -11,8 +11,7 @@
         </div>
         <div class="navbar-form navbar-right">
           <div class="form-group">
-            <button type="button" class="btn btn-default" ng-click="model.openPreview({formatName: model.field})">
-              <span class="fa fa-eye" aria-hidden="true"></span>
+            <button crm-icon="fa-eye" type="button" class="btn btn-default" ng-click="model.openPreview({formatName: model.field})">
               {{::ts('Preview')}}
             </button>
 
@@ -24,8 +23,7 @@
                    on-crm-ui-select="$broadcast('insert:expanded', selection)"
             />
 
-            <button type="button" class="btn btn-default" ng-click="expandedEditDlg.close()">
-              <span class="fa fa-times" aria-hidden="true"></span>
+            <button crm-icon="fa-times" type="button" class="btn btn-default" ng-click="expandedEditDlg.close()">
               {{::ts('Close')}}
             </button>
 
diff --git a/ext/msgtplui/ang/msgtplui/Preview.html b/ext/msgtplui/ang/msgtplui/Preview.html
index d40a1fc78e..efb6c29402 100644
--- a/ext/msgtplui/ang/msgtplui/Preview.html
+++ b/ext/msgtplui/ang/msgtplui/Preview.html
@@ -11,8 +11,7 @@
         </div>
         <div class="navbar-form navbar-right">
           <div class="form-group">
-            <button type="button" class="btn btn-default" ng-click="previewMsgDlg.close()">
-              <span class="fa fa-times" aria-hidden="true"></span>
+            <button crm-icon="fa-times" type="button" class="btn btn-default" ng-click="previewMsgDlg.close()">
               {{::ts('Close')}}
             </button>
           </div>
-- 
2.25.1