CRM-16415 ang: all jQuery UI icons gone from angular

----------------------------------------
* CRM-16415: Implement Font Awesome icon font
  https://issues.civicrm.org/jira/browse/CRM-16415

diff --git a/ang/crmAttachment/attachments.html b/ang/crmAttachment/attachments.html
index 9f9ad37602eacdf4b9ce82a71020ebc8a903ed0b..dcd7f86663957e1fb821794c209c3c98a8b1b265 100644 (file)
--- a/ang/crmAttachment/attachments.html
+++ b/ang/crmAttachment/attachments.html
@@ -11,7 +11,7 @@
       </td>
       <td>
         <a
-          crm-icon="trash"
+          crm-icon="fa-trash"
           crm-confirm="{message: ts('Deleting an attachment will completely remove it from server.')}" on-yes="att.deleteFile(file)"
           title="{{ts('Delete attachment')}}"
           class="crm-hover-button">
@@ -27,7 +27,7 @@
         <!-- item.isReady item.isUploading item.isUploaded item.isSuccess item.isCancel item.isError -->
       </td>
       <td>
-        <a crm-icon="close" ng-click="item.remove()" class="crm-hover-button" title="{{ts('Remove unsaved attachment')}}"></a>
+        <a crm-icon="fa-times" ng-click="item.remove()" class="crm-hover-button" title="{{ts('Remove unsaved attachment')}}"></a>
       </td>
     </tr>
     </tbody>

diff --git a/ang/crmCaseType.css b/ang/crmCaseType.css
index b149493706575141976bfb642494b60060843704..fa8edc12723b9d866adc11631f4403f189199296 100644 (file)
--- a/ang/crmCaseType.css
+++ b/ang/crmCaseType.css
@@ -1,13 +1,13 @@
-.crmCaseType .ui-icon-grip-dotted-vertical {
+.crmCaseType .grip-n-drag {
     vertical-align: middle;
     cursor: move;
 }
-.crmCaseType .ui-icon {
+.crmCaseType .crm-i {
     margin: 0.4em 0.2em 0 0;
     cursor: pointer;
 }
 
-.crmCaseType .ui-tabs-nav li .ui-icon {
+.crmCaseType .ui-tabs-nav li .crm-i {
     float: left;
 }
 
@@ -34,4 +34,4 @@
 
 tr.forked {
     font-weight: bold;
-}
\ No newline at end of file
+}

diff --git a/ang/crmCaseType/activityTypesTable.html b/ang/crmCaseType/activityTypesTable.html
index d603527cde6d6a100b9c4c443ac66a43c785fbd5..bceb0856db6197dee97520927559d5c5a5a04c34 100644 (file)
--- a/ang/crmCaseType/activityTypesTable.html
+++ b/ang/crmCaseType/activityTypesTable.html
@@ -14,14 +14,14 @@ Required vars: caseType
   <tbody ui-sortable ng-model="caseType.definition.activityTypes">
   <tr ng-repeat="activityType in caseType.definition.activityTypes">
     <td>
-      <span class="icon ui-icon-grip-dotted-vertical"></span>
+      <i class="crm-i fa-arrows grip-n-drag"></i>
       {{ activityType.name }}
     </td>
     <td>
       <input class="number" type="text" ng-pattern="/^[0-9]*$/" ng-model="activityType.max_instances" />
     </td>
     <td>
-      <a crm-icon="trash" class="crm-hover-button" ng-click="removeItem(caseType.definition.activityTypes, activityType)" title="{{ts('Remove')}}"></a>
+      <a crm-icon="fa-trash" class="crm-hover-button" ng-click="removeItem(caseType.definition.activityTypes, activityType)" title="{{ts('Remove')}}"></a>
     </td>
   </tr>
   </tbody>

diff --git a/ang/crmCaseType/edit.html b/ang/crmCaseType/edit.html
index f4c7e6e36bf65176d0d957dcac9a18ac44b7993b..e661be506d9f0c85f06b3b7249dd50c38da9635e 100644 (file)
--- a/ang/crmCaseType/edit.html
+++ b/ang/crmCaseType/edit.html
@@ -8,10 +8,10 @@ Required vars: caseType
     {{ts('Use this screen to define or update the Case Roles, Activity Types, and Timelines for a case type.')}} <a href="http://book.civicrm.org/user/current/case-management/setup/" target="_blank">{{ts('Learn more...')}}</a>
   </div>
   <div class="crm-submit-buttons">
-    <button crm-icon="check" ng-click="editCaseTypeForm.$setPristine(); save()" ng-disabled="editCaseTypeForm.$invalid">
+    <button crm-icon="fa-check" ng-click="editCaseTypeForm.$setPristine(); save()" ng-disabled="editCaseTypeForm.$invalid">
       {{ts('Save')}}
     </button>
-    <button crm-icon="close" ng-click="editCaseTypeForm.$setPristine(); goto('caseType')">
+    <button crm-icon="fa-times" ng-click="editCaseTypeForm.$setPristine(); goto('caseType')">
       {{ts('Cancel')}}
     </button>
   </div>
@@ -29,12 +29,12 @@ Required vars: caseType
       <li><a href="#acttab-actType">{{ts('Activity Types')}}</a></li>
       <li ng-repeat="activitySet in caseType.definition.activitySets">
         <a href="#acttab-{{$index}}">{{ activitySet.label }}</a>
-        <span class="ui-icon ui-icon-trash" title="{{ts('Remove')}}"
+        <span class="crm-i fa-trash" title="{{ts('Remove')}}"
           ng-hide="activitySet.name == 'standard_timeline'"
           ng-click="removeItem(caseType.definition.activitySets, activitySet)">{{ts('Remove')}}</span>
         <!-- Weird spacing:
         <a class="crm-hover-button" ng-click="removeItem(caseType.definition.activitySets, activitySet)">
-          <span class="ui-icon delete-icon" title="Remove">Remove</span>
+          <span class="crm-i fa-trash" title="Remove">Remove</span>
         </a>
         -->
       </li>
@@ -60,10 +60,10 @@ Required vars: caseType
   </div>
 
   <div class="crm-submit-buttons">
-    <button crm-icon="check" ng-click="editCaseTypeForm.$setPristine(); save()" ng-disabled="editCaseTypeForm.$invalid">
+    <button crm-icon="fa-check" ng-click="editCaseTypeForm.$setPristine(); save()" ng-disabled="editCaseTypeForm.$invalid">
       {{ts('Save')}}
     </button>
-    <button crm-icon="close" ng-click="editCaseTypeForm.$setPristine(); goto('caseType')">
+    <button crm-icon="fa-times" ng-click="editCaseTypeForm.$setPristine(); goto('caseType')">
       {{ts('Cancel')}}
     </button>
   </div>

diff --git a/ang/crmCaseType/list.html b/ang/crmCaseType/list.html
index 73ce281eb8baf1b55b0f540b1771199cc5f6afa3..cd4fb72ae7fb3e1a13669b91cb38561facc5f0c8 100644 (file)
--- a/ang/crmCaseType/list.html
+++ b/ang/crmCaseType/list.html
@@ -69,5 +69,5 @@ Required vars: caseTypes
 </table>
 
 <div class="crm-submit-buttons">
-  <a ng-href="#/caseType/new" class="button"><span><div class="icon ui-icon-circle-plus"></div>{{ts('New Case Type')}}</span></a>
-</div>
\ No newline at end of file
+  <a ng-href="#/caseType/new" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('New Case Type')}}</span></a>
+</div>

diff --git a/ang/crmCaseType/rolesTable.html b/ang/crmCaseType/rolesTable.html
index 98d8c80d18a3a590c649dc997c4029ee8401700c..ffce5cbf4c83263341f3a99b858ed98b1fd37f50 100644 (file)
--- a/ang/crmCaseType/rolesTable.html
+++ b/ang/crmCaseType/rolesTable.html
@@ -17,7 +17,7 @@ Required vars: caseType
            <td><input type="checkbox" ng-model="relType.creator" ng-true-value="'1'" ng-false-value="'0'"/></td>
            <td><input type="radio" ng-model="relType.manager" value="1" ng-change="onManagerChange(relType)"/></td>
            <td>
-             <a crm-icon="trash" class="crm-hover-button" ng-click="removeItem(caseType.definition.caseRoles,relType)" title="{{ts('Remove')}}"></a>
+             <a crm-icon="fa-trash" class="crm-hover-button" ng-click="removeItem(caseType.definition.caseRoles,relType)" title="{{ts('Remove')}}"></a>
            </td>
          </tr>
   </tbody>

diff --git a/ang/crmCaseType/sequenceTable.html b/ang/crmCaseType/sequenceTable.html
index 2b7372c499570c7f2084c89fdd3a7ae9f621545e..05684f6e2a946d5b9ed528346ef72b19f8b16a28 100644 (file)
--- a/ang/crmCaseType/sequenceTable.html
+++ b/ang/crmCaseType/sequenceTable.html
@@ -13,11 +13,11 @@ Required vars: activitySet
   <tbody ui-sortable ng-model="activitySet.activityTypes">
   <tr ng-repeat="activity in activitySet.activityTypes">
     <td>
-      <span class="icon ui-icon-grip-dotted-vertical"></span>
+      <i class="crm-i fa-arrows grip-n-drag"></i>
       {{ activity.name }}
     </td>
     <td>
-      <a crm-icon="trash" class="crm-hover-button" ng-click="removeItem(activitySet.activityTypes, activity)" title="{{ts('Remove')}}"></a>
+      <a crm-icon="fa-trash" class="crm-hover-button" ng-click="removeItem(activitySet.activityTypes, activity)" title="{{ts('Remove')}}"></a>
     </td>
   </tr>
   </tbody>

diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html
index 94d2cc2a7f9aa282c7e0c230da56bb097b4f8929..b329af5db8dace7cb7938b3a2d757042d167ce8b 100644 (file)
--- a/ang/crmCaseType/timelineTable.html
+++ b/ang/crmCaseType/timelineTable.html
@@ -17,7 +17,7 @@ Required vars: activitySet
   <tbody ui-sortable ng-model="activitySet.activityTypes">
   <tr ng-repeat="activity in activitySet.activityTypes">
     <td>
-      <span class="icon ui-icon-grip-dotted-vertical"></span>
+      <i class="crm-i fa-arrows grip-n-drag"></i>
       {{ activity.name }}
     </td>
     <td>
@@ -64,7 +64,7 @@ Required vars: activitySet
     </td>
     <td>
       <a class="crm-hover-button"
-         crm-icon="trash"
+         crm-icon="fa-trash"
          ng-show="isActivityRemovable(activitySet, activity)"
          ng-click="removeItem(activitySet.activityTypes, activity)"
          title="{{ts('Remove')}}">

diff --git a/ang/crmMailing/BlockMailing.html b/ang/crmMailing/BlockMailing.html
index 9aeee561745d1cb3b23c886af34b4ea1008e021b..a41d6a1be90954c83b9f110ee14d1722dcd61036 100644 (file)
--- a/ang/crmMailing/BlockMailing.html
+++ b/ang/crmMailing/BlockMailing.html
@@ -18,7 +18,7 @@ It could perhaps be thinned by 30-60% by making more directives.
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a crm-icon="disk" ng-if="checkPerm('edit message templates')" ng-click="saveTemplate(mailing)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
+        <a crm-icon="fa-floppy-o" ng-if="checkPerm('edit message templates')" ng-click="saveTemplate(mailing)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
     <div crm-ui-field="{name: 'subform.fromAddress', title: ts('From'), help: hs('from_email')}">

diff --git a/ang/crmMailing/BlockPreview.html b/ang/crmMailing/BlockPreview.html
index 7266e2fe1d45c01adede7726950612e5c4ade8df..71d7ff0baaa0bc67214268867099fe61195a601d 100644 (file)
--- a/ang/crmMailing/BlockPreview.html
+++ b/ang/crmMailing/BlockPreview.html
@@ -11,10 +11,10 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
       <em>({{ts('No content to preview')}})</em>
     </div>
     <div ng-hide="!mailing.body_html">
-      <a class="crm-hover-button action-item" crm-icon="newwin" ng-disabled="crmMailing.$invalid" ng-click="doPreview('html')">{{ts('Preview as HTML')}}</a>
+      <a class="crm-hover-button action-item" crm-icon="fa-television" ng-disabled="crmMailing.$invalid" ng-click="doPreview('html')">{{ts('Preview as HTML')}}</a>
     </div>
     <div ng-hide="!mailing.body_html && !mailing.body_text">
-      <a class="crm-hover-button action-item" crm-icon="newwin" ng-disabled="crmMailing.$invalid" ng-click="doPreview('text')">{{ts('Preview as Plain Text')}}</a>
+      <a class="crm-hover-button action-item" crm-icon="fa-file-text-o" ng-disabled="crmMailing.$invalid" ng-click="doPreview('text')">{{ts('Preview as Plain Text')}}</a>
     </div>
     <!--
     <div ng-hide="!mailing.body_html && !mailing.body_text">
@@ -36,7 +36,7 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
         placeholder="example@example.org"
         />
     </div>
-    <button crm-icon="mail-closed" title="{{crmMailing.$invalid || !testContact.email ? ts('Complete all required fields first') : ts('Send test message to %1', {1: testContact.email})}}" ng-disabled="crmMailing.$invalid || !testContact.email" ng-click="doSend({email: testContact.email})">{{ts('Send test')}}</button>
+    <button crm-icon="fa-paper-plane" title="{{crmMailing.$invalid || !testContact.email ? ts('Complete all required fields first') : ts('Send test message to %1', {1: testContact.email})}}" ng-disabled="crmMailing.$invalid || !testContact.email" ng-click="doSend({email: testContact.email})">{{ts('Send test')}}</button>
   </div>
   <div class="preview-group" ng-form>
     <div>
@@ -55,7 +55,7 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
         <option value=""></option>
       </select>
     </div>
-    <button crm-icon="mail-closed" title="{{crmMailing.$invalid || !testGroup.gid ? ts('Complete all required fields first') : ts('Send test message to group')}}"ng-disabled="crmMailing.$invalid || !testGroup.gid" crm-confirm="{resizable: true, width: '40%', height: '40%', open: previewTestGroup}" on-yes="doSend({gid: testGroup.gid})">{{ts('Send test')}}</button>
+    <button crm-icon="fa-paper-plane" title="{{crmMailing.$invalid || !testGroup.gid ? ts('Complete all required fields first') : ts('Send test message to group')}}"ng-disabled="crmMailing.$invalid || !testGroup.gid" crm-confirm="{resizable: true, width: '40%', height: '40%', open: previewTestGroup}" on-yes="doSend({gid: testGroup.gid})">{{ts('Send test')}}</button>
   </div>
   <div class="clear"></div>
 </div>

diff --git a/ang/crmMailing/BlockPreview.js b/ang/crmMailing/BlockPreview.js
index 0d2c5ba395423fdf086df533ee2a9d3c7f62f8bd..561ddf09501c13c4549eb55a955b9824a9ee0c52 100644 (file)
--- a/ang/crmMailing/BlockPreview.js
+++ b/ang/crmMailing/BlockPreview.js
@@ -48,7 +48,7 @@
             markup += '</ol>';
             markup = '<h4>' + ts('A test message will be sent to %1 people:', {1: count}) + '</h4>' + markup;
             if (!count) {
-              markup = '<div class="messages status"><div class="icon ui-icon-alert"></div> ' +
+              markup = '<div class="messages status"><i class="crm-i fa-exclamation-triangle"></i> ' +
               (data.count ? ts('None of the contacts in this group have an email address.') : ts('Group is empty.')) +
               '</div>';
             }

diff --git a/ang/crmMailing/BlockRecipients.html b/ang/crmMailing/BlockRecipients.html
index 33b0d6031d68ae9decc8bf560b4d171358506929..5852a8e97c7bc1a972c57c9d793a6c03d74ade07 100644 (file)
--- a/ang/crmMailing/BlockRecipients.html
+++ b/ang/crmMailing/BlockRecipients.html
@@ -15,5 +15,5 @@
     ng-required="true"
     multiple>
   </select>
-  <a crm-icon="wrench" ng-click="editOptions(mailing)" class="crm-hover-button" title="{{ts('Edit Recipient Options')}}"></a>
+  <a crm-icon="fa-wrench" ng-click="editOptions(mailing)" class="crm-hover-button" title="{{ts('Edit Recipient Options')}}"></a>
 </div>

diff --git a/ang/crmMailing/BlockReview.html b/ang/crmMailing/BlockReview.html
index 9ce64b092a8db4d615730955596af966e7972668..25ef8f163f1a84e87e66e905ed1a37935bd43d56 100644 (file)
--- a/ang/crmMailing/BlockReview.html
+++ b/ang/crmMailing/BlockReview.html
@@ -11,7 +11,7 @@ Required vars: mailing
       <div crm-ui-field="{title: ts('Recipients')}">
         <div ng-controller="ViewRecipCtrl">
           <div ng-controller="EditRecipCtrl">
-            <div><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a></div>
+            <div><a crm-icon="fa-users" class="crm-hover-button action-item" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a></div>
             <div ng-show="getIncludesAsString(mailing)">
               (<strong>{{ts('Include:')}}</strong> {{getIncludesAsString(mailing)}})
             </div>
@@ -22,8 +22,8 @@ Required vars: mailing
         </div>
       </div>
       <div crm-ui-field="{title: ts('Content')}">
-        <span ng-show="mailing.body_html"><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'html')">{{ts('HTML')}}</a></span>
-        <span ng-show="mailing.body_html || mailing.body_text"><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'text')">{{ts('Plain Text')}}</a></span>
+        <span ng-show="mailing.body_html"><a crm-icon="fa-television" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'html')">{{ts('HTML')}}</a></span>
+        <span ng-show="mailing.body_html || mailing.body_text"><a crm-icon="fa-file-text-o" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'text')">{{ts('Plain Text')}}</a></span>
         <!-- TODO: attachments -->
       </div>
       <div crm-ui-field="{title: ts('Attachments')}" ng-show="attachments.files.length > 0 || attachments.uploader.queue.length > 0">
@@ -44,10 +44,10 @@ Required vars: mailing
           <span crm-mailing-review-bool crm-on="mailing.override_verp=='0' && mailing.forward_replies=='1'" crm-title="ts('Forward Replies')"></span>
         </div>
         <div ng-controller="PreviewComponentCtrl">
-          <span ng-show="mailing.override_verp == '0' && mailing.auto_responder"><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Auto-Respond'), mailing.reply_id)">{{ts('Auto-Respond')}}</a></span>
-          <span><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Opt-out'), mailing.optout_id)">{{ts('Opt-out')}}</a></span>
-          <span><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Resubscribe'), mailing.resubscribe_id)">{{ts('Resubscribe')}}</a></span>
-          <span><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Unsubscribe'), mailing.unsubscribe_id)">{{ts('Unsubscribe')}}</a></span>
+          <span ng-show="mailing.override_verp == '0' && mailing.auto_responder"><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Auto-Respond'), mailing.reply_id)">{{ts('Auto-Respond')}}</a></span>
+          <span><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Opt-out'), mailing.optout_id)">{{ts('Opt-out')}}</a></span>
+          <span><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Resubscribe'), mailing.resubscribe_id)">{{ts('Resubscribe')}}</a></span>
+          <span><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Unsubscribe'), mailing.unsubscribe_id)">{{ts('Unsubscribe')}}</a></span>
         </div>
       </div>
       <div crm-ui-field="{title: ts('Publication')}">

diff --git a/ang/crmMailing/EditMailingCtrl/2step.html b/ang/crmMailing/EditMailingCtrl/2step.html
index b799f7d04dd0956935f77c19129bbad516e9c1c6..ea6bccc1688c9df162f91ec6886e21c0a0686866 100644 (file)
--- a/ang/crmMailing/EditMailingCtrl/2step.html
+++ b/ang/crmMailing/EditMailingCtrl/2step.html
@@ -57,12 +57,12 @@
 
       <span crm-ui-wizard-buttons style="float:right;">
         <button
-          crm-icon="trash"
+          crm-icon="fa-trash"
           ng-show="checkPerm('delete in CiviMail')"
           ng-disabled="block.check()"
           crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"
           on-yes="delete()">{{ts('Delete Draft')}}</button>
-        <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+        <button crm-icon="fa-floppy-o" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
       </span>
     </div>
   </div>

diff --git a/ang/crmMailing/EditMailingCtrl/unified.html b/ang/crmMailing/EditMailingCtrl/unified.html
index 2e634ffe6ea16f658dad224cecddf301de348bcd..216e61725dbc5287be0367901a5505b221937fe4 100644 (file)
--- a/ang/crmMailing/EditMailingCtrl/unified.html
+++ b/ang/crmMailing/EditMailingCtrl/unified.html
@@ -43,10 +43,10 @@
       <div crm-mailing-block-schedule crm-mailing="mailing"/>
     </div>
 
-    <button crm-icon="check" ng-disabled="block.check() || crmMailing.$invalid" ng-click="submit()">{{ts('Submit Mailing')}}</button>
-    <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+    <button crm-icon="fa-paper-plane" ng-disabled="block.check() || crmMailing.$invalid" ng-click="submit()">{{ts('Submit Mailing')}}</button>
+    <button crm-icon="fa-floppy-o" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
     <button
-      crm-icon="trash"
+      crm-icon="fa-trash"
       ng-show="checkPerm('delete in CiviMail')"
       ng-disabled="block.check()"
       crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"

diff --git a/ang/crmMailing/EditMailingCtrl/unified2.html b/ang/crmMailing/EditMailingCtrl/unified2.html
index 8d3ec0fe0ac979ebcb5cd97aaffa3e430cda12a1..4ceb20ce07c2eac67c09841897acfbf0fc9b877b 100644 (file)
--- a/ang/crmMailing/EditMailingCtrl/unified2.html
+++ b/ang/crmMailing/EditMailingCtrl/unified2.html
@@ -39,10 +39,10 @@
       <div crm-mailing-block-schedule crm-mailing="mailing"/>
     </div>
 
-    <button crm-icon="check" ng-disabled="block.check() || crmMailing.$invalid" ng-click="submit()">{{ts('Submit Mailing')}}</button>
-    <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+    <button crm-icon="fa-paper-plane" ng-disabled="block.check() || crmMailing.$invalid" ng-click="submit()">{{ts('Submit Mailing')}}</button>
+    <button crm-icon="fa-floppy-o" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
     <button
-      crm-icon="trash"
+      crm-icon="fa-trash"
       ng-show="checkPerm('delete in CiviMail')"
       ng-disabled="block.check()"
       crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"

diff --git a/ang/crmMailing/EditMailingCtrl/wizard.html b/ang/crmMailing/EditMailingCtrl/wizard.html
index f8b4fa300114fd5b6f6de0fc6a20c7398c0d9b70..d8dbd1a342cd966f2fc70b043ab97efc0579c8c8 100644 (file)
--- a/ang/crmMailing/EditMailingCtrl/wizard.html
+++ b/ang/crmMailing/EditMailingCtrl/wizard.html
@@ -59,12 +59,12 @@
 
       <span crm-ui-wizard-buttons style="float:right;">
         <button
-          crm-icon="trash"
+          crm-icon="fa-trash"
           ng-show="checkPerm('delete in CiviMail')"
           ng-disabled="block.check()"
           crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"
           on-yes="delete()">{{ts('Delete Draft')}}</button>
-        <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+        <button crm-icon="fa-floppy-o" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
       </span>
     </div>
   </div>

diff --git a/ang/crmMailing/EditMailingCtrl/workflow.html b/ang/crmMailing/EditMailingCtrl/workflow.html
index bbc2a82031d8c9517d561be48c2c108f69851720..e60779bde54eef22fe03c788ef766fc7a8aa5e54 100644 (file)
--- a/ang/crmMailing/EditMailingCtrl/workflow.html
+++ b/ang/crmMailing/EditMailingCtrl/workflow.html
@@ -66,12 +66,12 @@
 
       <span crm-ui-wizard-buttons style="float:right;">
         <button
-          crm-icon="trash"
+          crm-icon="fa-trash"
           ng-show="checkPerm('delete in CiviMail')"
           ng-disabled="block.check()"
           crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"
           on-yes="delete()">{{ts('Delete Draft')}}</button>
-        <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+        <button crm-icon="fa-floppy-o" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
       </span>
     </div>
   </div>

diff --git a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html
index dc32303ab59e28e93a502a678ed44e4bc7431edb..1e35c92bc24d5770f5ff8ddb8eef2c361e431290 100644 (file)
--- a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html
+++ b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html
@@ -4,8 +4,7 @@
 </p>
 
 <div ng-show="missing['domain.address'] && insertable">
-  <a ng-click="insertToken('domain.address')" class="button"><span><span
-    class='icon ui-icon-circle-plus'></span> {{ts('Address')}}</span></a>
+  <a ng-click="insertToken('domain.address')" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('Address')}}</span></a>
 
   <div class="clear"/>
 </div>
@@ -26,22 +25,18 @@
     <tbody>
     <tr>
       <td>
-        <a ng-click="insertToken('action.unsubscribeUrl')" class="button"><span><span
-          class='icon ui-icon-circle-plus'></span> {{ts('Unsubscribe')}}</span></a>
+        <a ng-click="insertToken('action.unsubscribeUrl')" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('Unsubscribe')}}</span></a>
       </td>
       <td>
-        <a ng-click="insertToken('action.unsubscribe')" class="button"><span><span
-          class='icon ui-icon-circle-plus'></span> {{ts('Unsubscribe')}}</span></a>
+        <a ng-click="insertToken('action.unsubscribe')" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('Unsubscribe')}}</span></a>
       </td>
     </tr>
     <tr>
       <td>
-        <a ng-click="insertToken('action.optOutUrl')" class="button"><span><span
-          class='icon ui-icon-circle-plus'></span> {{ts('Opt-out')}}</span></a>
+        <a ng-click="insertToken('action.optOutUrl')" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('Opt-out')}}</span></a>
       </td>
       <td>
-        <a ng-click="insertToken('action.optOut')" class="button"><span><span
-          class='icon ui-icon-circle-plus'></span> {{ts('Opt-out')}}</span></a>
+        <a ng-click="insertToken('action.optOut')" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('Opt-out')}}</span></a>
       </td>
     </tr>
     </tbody>

diff --git a/ang/crmMailing/ReviewBool.js b/ang/crmMailing/ReviewBool.js
index 83bd7090dbe9575049ee54ef24bbe6b414dd982d..2a18a5540891db43673cbff8ea1d29ba370c82ab 100644 (file)
--- a/ang/crmMailing/ReviewBool.js
+++ b/ang/crmMailing/ReviewBool.js
@@ -10,11 +10,11 @@
         function refresh() {
           if (scope.$parent.$eval(attrs.crmOn)) {
             scope.spanClasses = {'crmMailing-active': true};
-            scope.iconClasses = {'ui-icon-check': true};
+            scope.iconClasses = {'fa-check': true};
           }
           else {
             scope.spanClasses = {'crmMailing-inactive': true};
-            scope.iconClasses = {'ui-icon-close': true};
+            scope.iconClasses = {'fa-times': true};
           }
           scope.evalTitle = scope.$parent.$eval(attrs.crmTitle);
         }

diff --git a/ang/crmMailing/SaveMsgTemplateDialogCtrl.js b/ang/crmMailing/SaveMsgTemplateDialogCtrl.js
index 31ca60245289b5bd30a014b43d4008eb97c28cfe..ea80522e98fcc0e012305de974ffcc6220c5ea65 100644 (file)
--- a/ang/crmMailing/SaveMsgTemplateDialogCtrl.js
+++ b/ang/crmMailing/SaveMsgTemplateDialogCtrl.js
@@ -59,7 +59,7 @@
       var buttons = [
         {
           text: ts('Save'),
-          icons: {primary: 'ui-icon-check'},
+          icons: {primary: 'fa-check'},
           click: function () {
             $scope.save().then(function (item) {
               dialogService.close('saveTemplateDialog', item);
@@ -68,7 +68,7 @@
         },
         {
           text: ts('Cancel'),
-          icons: {primary: 'ui-icon-close'},
+          icons: {primary: 'fa-times'},
           click: function () {
             dialogService.cancel('saveTemplateDialog');
           }

diff --git a/ang/crmMailingAB/BlockMailing.html b/ang/crmMailingAB/BlockMailing.html
index cdab76cccbbe5215d33bff8ffb73034db901096b..ad6e8652e25d1e8f740214c63bf5828f304192bc 100644 (file)
--- a/ang/crmMailingAB/BlockMailing.html
+++ b/ang/crmMailingAB/BlockMailing.html
@@ -27,7 +27,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a crm-icon="disk" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
+        <a crm-icon="fa-floppy-o" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
     <div crm-ui-field="{name: 'subform.msg_template_idA', title: ts('Template (A)')}" ng-if="fields.msg_template_idA">
@@ -42,7 +42,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a crm-icon="disk" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
+        <a crm-icon="fa-floppy-o" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
     <div crm-ui-field="{name: 'subform.msg_template_idB', title: ts('Template (B)')}" ng-if="fields.msg_template_idB">
@@ -57,7 +57,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a crm-icon="disk" ng-click="saveTemplate(abtest.mailings.b)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
+        <a crm-icon="fa-floppy-o" ng-click="saveTemplate(abtest.mailings.b)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
 

diff --git a/ang/crmMailingAB/EditCtrl/edit.html b/ang/crmMailingAB/EditCtrl/edit.html
index e50d798c0a4b5f82a761b299b6efb1ee18ccfc28..eddc171f3fbbd8e5cd6666bba1eaf0d67f2e6aaa 100644 (file)
--- a/ang/crmMailingAB/EditCtrl/edit.html
+++ b/ang/crmMailingAB/EditCtrl/edit.html
@@ -165,13 +165,13 @@
       </div>
       <span crm-ui-wizard-buttons style="float:right;">
         <button
-          crm-icon="trash"
+          crm-icon="fa-trash"
           ng-show="checkPerm('delete in CiviMail')"
           ng-disabled="block.check()"
           crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"
           on-yes="delete()">{{ts('Delete Draft')}}
         </button>
-        <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave) ">{{ts('Save Draft')}}</button>
+        <button crm-icon="fa-floppy-o" ng-disabled="block.check()" ng-click="save().then(leave) ">{{ts('Save Draft')}}</button>
       </span>
     </div>
 </div>

diff --git a/ang/crmMailingAB/EditCtrl/report.html b/ang/crmMailingAB/EditCtrl/report.html
index e049b14021d859bb13465216e8894638a288ddf7..4c4b8291ae40e332bd8b9ba95c27f14ef656436c 100644 (file)
--- a/ang/crmMailingAB/EditCtrl/report.html
+++ b/ang/crmMailingAB/EditCtrl/report.html
@@ -11,7 +11,7 @@
     <tr ng-show="abtest.ab.status == 'Testing'">
       <td></td>
       <td ng-repeat="am in getActiveMailings()">
-        <button crm-icon="mail-closed" ng-click="selectWinner(am.name)">{{ts('Select as Final')}}</button>
+        <button crm-icon="fa-trophy" ng-click="selectWinner(am.name)">{{ts('Select as Final')}}</button>
       </td>
       <td></td>
     </tr>
@@ -72,7 +72,7 @@
           ng-href="{{statUrl(am.mailing, statType, 'search')}}"
           ng-if="checkPerm('view all contacts')"
           title="{{ts('Search for contacts using \'%1\'', {1: statType.title})}}"
-          crm-icon="search"
+          crm-icon="fa-search"
           ></a>
         <a
           class="crm-hover-button action-item"
@@ -129,8 +129,8 @@
     <tr>
       <td>{{ts('Content')}}</td>
       <td ng-repeat="am in getActiveMailings()">
-        <a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewMailing(am.name,'html')" ng-show="am.mailing.body_html">{{ts('HTML')}}</a>
-        <a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewMailing(am.name,'text')" ng-show="am.mailing.body_text">{{ts('Text')}}</a>
+        <a crm-icon="fa-television" class="crm-hover-button action-item" ng-click="previewMailing(am.name,'html')" ng-show="am.mailing.body_html">{{ts('HTML')}}</a>
+        <a crm-icon="fa-file-text-o" class="crm-hover-button action-item" ng-click="previewMailing(am.name,'text')" ng-show="am.mailing.body_text">{{ts('Text')}}</a>
       </td>
       <td ng-show="abtest.ab.status == 'Testing'"></td>
     </tr>
@@ -155,10 +155,10 @@
         <div crm-mailing-review-bool crm-on="am.mailing.override_verp=='0'" crm-title="ts('Track Replies')"></div>
         <div crm-mailing-review-bool crm-on="am.mailing.override_verp=='0' && mailing.forward_replies=='1'" crm-title="ts('Forward Replies')"></div>
         <div ng-controller="PreviewComponentCtrl">
-          <div ng-show="am.mailing.override_verp == '0' && mailing.auto_responder"><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Auto-Respond'), am.mailing.reply_id)">{{ts('Auto-Respond')}}</a></div>
-          <div><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Opt-out'), am.mailing.optout_id)">{{ts('Opt-out')}}</a></div>
-          <div><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Resubscribe'), am.mailing.resubscribe_id)">{{ts('Resubscribe')}}</a></div>
-          <div><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Unsubscribe'), am.mailing.unsubscribe_id)">{{ts('Unsubscribe')}}</a></div>
+          <div ng-show="am.mailing.override_verp == '0' && mailing.auto_responder"><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Auto-Respond'), am.mailing.reply_id)">{{ts('Auto-Respond')}}</a></div>
+          <div><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Opt-out'), am.mailing.optout_id)">{{ts('Opt-out')}}</a></div>
+          <div><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Resubscribe'), am.mailing.resubscribe_id)">{{ts('Resubscribe')}}</a></div>
+          <div><a crm-icon="fa-envelope" class="crm-hover-button action-item" ng-click="previewComponent(ts('Unsubscribe'), am.mailing.unsubscribe_id)">{{ts('Unsubscribe')}}</a></div>
         </div>
       </td>
       <td ng-show="abtest.ab.status == 'Testing'"></td>

diff --git a/ang/crmMailingAB/ListCtrl.html b/ang/crmMailingAB/ListCtrl.html
index 1944350ecb8e731e0a7c028c52afba9df9bc919c..edfb5b97910f2253c1f0933385b155508d545eed 100644 (file)
--- a/ang/crmMailingAB/ListCtrl.html
+++ b/ang/crmMailingAB/ListCtrl.html
@@ -59,5 +59,5 @@ Required vars: mailingABList
 
 <div class="crm-submit-buttons">
   <br>
-  <a ng-href="#/abtest/new" class="button"><span><div class="icon ui-icon-circle-plus"></div>{{ts('New A/B Test')}}</span></a>
+  <a ng-href="#/abtest/new" class="button"><span><i class="crm-i fa-bar-chart"></i> {{ts('New A/B Test')}}</span></a>
 </div>

diff --git a/ang/crmMailingAB/WinnerDialogCtrl.js b/ang/crmMailingAB/WinnerDialogCtrl.js
index b5bd3bf63ca8ce7b4299ced5888cb5466c2c5345..aac6f77a391b7bef32c9b9bd2e9ffb38b2d851e7 100644 (file)
--- a/ang/crmMailingAB/WinnerDialogCtrl.js
+++ b/ang/crmMailingAB/WinnerDialogCtrl.js
@@ -15,7 +15,7 @@
       var buttons = [
         {
           text: ts('Submit final mailing'),
-          icons: {primary: 'ui-icon-check'},
+          icons: {primary: 'fa-paper-plane'},
           click: function() {
             crmMailingMgr.mergeInto(abtest.mailings.c, abtest.mailings[mailingName], [
               'name',
@@ -37,7 +37,7 @@
         },
         {
           text: ts('Cancel'),
-          icons: {primary: 'ui-icon-close'},
+          icons: {primary: 'fa-times'},
           click: function() {
             dialogService.cancel('selectWinnerDialog');
           }

diff --git a/ang/crmUi.js b/ang/crmUi.js
index 42179c689e985939a8af4437df4ead06e0b36baf..b5c76b2c3de065a3c4d3e33ac79a13daeb58a1bb 100644 (file)
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -429,20 +429,20 @@
           var titleLocked = parse(attrs.titleLocked, ts('Locked'));
           var titleUnlocked = parse(attrs.titleUnlocked, ts('Unlocked'));
 
-          $(element).addClass('ui-icon lock-button');
+          $(element).addClass('crm-i lock-button');
           var refresh = function () {
             var locked = binding(scope);
             if (locked) {
               $(element)
-                .removeClass('ui-icon-unlocked')
-                .addClass('ui-icon-locked')
+                .removeClass('fa-unlock')
+                .addClass('fa-lock')
                 .prop('title', titleLocked(scope))
               ;
             }
             else {
               $(element)
-                .removeClass('ui-icon-locked')
-                .addClass('ui-icon-unlocked')
+                .removeClass('fa-lock')
+                .addClass('fa-unlock')
                 .prop('title', titleUnlocked(scope))
               ;
             }
@@ -837,7 +837,8 @@
       };
     })
 
-    // Example: <button crm-icon="check">Save</button>
+    // Example for Font Awesome: <button crm-icon="fa-check">Save</button>
+    // Example for jQuery UI (deprecated): <button crm-icon="check">Save</button>
     .directive('crmIcon', function() {
       return {
         restrict: 'EA',

diff --git a/ang/crmUi/wizard.html b/ang/crmUi/wizard.html
index aa4e8f0afff6d9bc974d5e0402d22fc13b538c13..44b09743f237e5a65cb6f290d5d4dfd988d37ae9 100644 (file)
--- a/ang/crmUi/wizard.html
+++ b/ang/crmUi/wizard.html
@@ -9,7 +9,7 @@
   </ul>
   <div class="crm-wizard-body" ng-transclude/>
   <div class="crm-wizard-buttons">
-    <button crm-icon="triangle-1-w" ng-click="crmUiWizardCtrl.previous()" ng-show="!crmUiWizardCtrl.$first()">{{ts('Previous')}}</button>
-    <button crm-icon="triangle-1-e" title="{{!crmUiWizardCtrl.$validStep() ? ts('Complete all required fields first') : ts('Next step')}}" ng-click="crmUiWizardCtrl.next()" ng-show="!crmUiWizardCtrl.$last()" ng-disabled="!crmUiWizardCtrl.$validStep()">{{ts('Next')}}</button>
+    <button crm-icon="fa-chevron-left" ng-click="crmUiWizardCtrl.previous()" ng-show="!crmUiWizardCtrl.$first()">{{ts('Previous')}}</button>
+    <button crm-icon="fa-chevron-right" title="{{!crmUiWizardCtrl.$validStep() ? ts('Complete all required fields first') : ts('Next step')}}" ng-click="crmUiWizardCtrl.next()" ng-show="!crmUiWizardCtrl.$last()" ng-disabled="!crmUiWizardCtrl.$validStep()">{{ts('Next')}}</button>
   </div>
 </div>