From 77ec5a8d76c2572741b9bbf6ca2346cc1bd2f334 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Wed, 30 Sep 2015 14:38:24 -0400 Subject: [PATCH] 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 --- ang/crmAttachment/attachments.html | 4 ++-- ang/crmCaseType.css | 8 ++++---- ang/crmCaseType/activityTypesTable.html | 4 ++-- ang/crmCaseType/edit.html | 12 ++++++------ ang/crmCaseType/list.html | 4 ++-- ang/crmCaseType/rolesTable.html | 2 +- ang/crmCaseType/sequenceTable.html | 4 ++-- ang/crmCaseType/timelineTable.html | 4 ++-- ang/crmMailing/BlockMailing.html | 2 +- ang/crmMailing/BlockPreview.html | 8 ++++---- ang/crmMailing/BlockPreview.js | 2 +- ang/crmMailing/BlockRecipients.html | 2 +- ang/crmMailing/BlockReview.html | 14 +++++++------- ang/crmMailing/EditMailingCtrl/2step.html | 4 ++-- ang/crmMailing/EditMailingCtrl/unified.html | 6 +++--- ang/crmMailing/EditMailingCtrl/unified2.html | 6 +++--- ang/crmMailing/EditMailingCtrl/wizard.html | 4 ++-- ang/crmMailing/EditMailingCtrl/workflow.html | 4 ++-- ang/crmMailing/EmailBodyCtrl/tokenAlert.html | 15 +++++---------- ang/crmMailing/ReviewBool.js | 4 ++-- ang/crmMailing/SaveMsgTemplateDialogCtrl.js | 4 ++-- ang/crmMailingAB/BlockMailing.html | 6 +++--- ang/crmMailingAB/EditCtrl/edit.html | 4 ++-- ang/crmMailingAB/EditCtrl/report.html | 16 ++++++++-------- ang/crmMailingAB/ListCtrl.html | 2 +- ang/crmMailingAB/WinnerDialogCtrl.js | 4 ++-- ang/crmUi.js | 13 +++++++------ ang/crmUi/wizard.html | 4 ++-- 28 files changed, 81 insertions(+), 85 deletions(-) diff --git a/ang/crmAttachment/attachments.html b/ang/crmAttachment/attachments.html index 9f9ad37602..dcd7f86663 100644 --- a/ang/crmAttachment/attachments.html +++ b/ang/crmAttachment/attachments.html @@ -11,7 +11,7 @@ @@ -27,7 +27,7 @@ - + diff --git a/ang/crmCaseType.css b/ang/crmCaseType.css index b149493706..fa8edc1272 100644 --- 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 d603527cde..bceb0856db 100644 --- a/ang/crmCaseType/activityTypesTable.html +++ b/ang/crmCaseType/activityTypesTable.html @@ -14,14 +14,14 @@ Required vars: caseType - + {{ activityType.name }} - + diff --git a/ang/crmCaseType/edit.html b/ang/crmCaseType/edit.html index f4c7e6e36b..e661be506d 100644 --- 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.')}} {{ts('Learn more...')}}
- -
@@ -29,12 +29,12 @@ Required vars: caseType
  • {{ts('Activity Types')}}
  • {{ activitySet.label }} - {{ts('Remove')}}
    • @@ -60,10 +60,10 @@ Required vars: caseType
    - -
    diff --git a/ang/crmCaseType/list.html b/ang/crmCaseType/list.html index 73ce281eb8..cd4fb72ae7 100644 --- a/ang/crmCaseType/list.html +++ b/ang/crmCaseType/list.html @@ -69,5 +69,5 @@ Required vars: caseTypes
    -
    {{ts('New Case Type')}}     -
    \ No newline at end of file + {{ts('New Case Type')}} + diff --git a/ang/crmCaseType/rolesTable.html b/ang/crmCaseType/rolesTable.html index 98d8c80d18..ffce5cbf4c 100644 --- a/ang/crmCaseType/rolesTable.html +++ b/ang/crmCaseType/rolesTable.html @@ -17,7 +17,7 @@ Required vars: caseType - + diff --git a/ang/crmCaseType/sequenceTable.html b/ang/crmCaseType/sequenceTable.html index 2b7372c499..05684f6e2a 100644 --- a/ang/crmCaseType/sequenceTable.html +++ b/ang/crmCaseType/sequenceTable.html @@ -13,11 +13,11 @@ Required vars: activitySet - + {{ activity.name }} - + diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html index 94d2cc2a7f..b329af5db8 100644 --- a/ang/crmCaseType/timelineTable.html +++ b/ang/crmCaseType/timelineTable.html @@ -17,7 +17,7 @@ Required vars: activitySet - + {{ activity.name }} @@ -64,7 +64,7 @@ Required vars: activitySet diff --git a/ang/crmMailing/BlockMailing.html b/ang/crmMailing/BlockMailing.html index 9aeee56174..a41d6a1be9 100644 --- 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. - +
    diff --git a/ang/crmMailing/BlockPreview.html b/ang/crmMailing/BlockPreview.html index 7266e2fe1d..71d7ff0baa 100644 --- a/ang/crmMailing/BlockPreview.html +++ b/ang/crmMailing/BlockPreview.html @@ -11,10 +11,10 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController ({{ts('No content to preview')}})
    - {{ts('Preview as HTML')}} + {{ts('Preview as HTML')}}
    - {{ts('Preview as Plain Text')}} + {{ts('Preview as Plain Text')}}
    @@ -44,10 +44,10 @@ Required vars: mailing
    - {{ts('Auto-Respond')}} - {{ts('Opt-out')}} - {{ts('Resubscribe')}} - {{ts('Unsubscribe')}} + {{ts('Auto-Respond')}} + {{ts('Opt-out')}} + {{ts('Resubscribe')}} + {{ts('Unsubscribe')}}
    diff --git a/ang/crmMailing/EditMailingCtrl/2step.html b/ang/crmMailing/EditMailingCtrl/2step.html index b799f7d04d..ea6bccc168 100644 --- a/ang/crmMailing/EditMailingCtrl/2step.html +++ b/ang/crmMailing/EditMailingCtrl/2step.html @@ -57,12 +57,12 @@ - +
    diff --git a/ang/crmMailing/EditMailingCtrl/unified.html b/ang/crmMailing/EditMailingCtrl/unified.html index 2e634ffe6e..216e61725d 100644 --- a/ang/crmMailing/EditMailingCtrl/unified.html +++ b/ang/crmMailing/EditMailingCtrl/unified.html @@ -43,10 +43,10 @@
    - - + + - + + - + diff --git a/ang/crmMailing/EditMailingCtrl/workflow.html b/ang/crmMailing/EditMailingCtrl/workflow.html index bbc2a82031..e60779bde5 100644 --- a/ang/crmMailing/EditMailingCtrl/workflow.html +++ b/ang/crmMailing/EditMailingCtrl/workflow.html @@ -66,12 +66,12 @@ - + diff --git a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html index dc32303ab5..1e35c92bc2 100644 --- a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html +++ b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html @@ -4,8 +4,7 @@

    - {{ts('Address')}} + {{ts('Address')}}
    @@ -26,22 +25,18 @@ - {{ts('Unsubscribe')}} + {{ts('Unsubscribe')}} - {{ts('Unsubscribe')}} + {{ts('Unsubscribe')}} - {{ts('Opt-out')}} + {{ts('Opt-out')}} - {{ts('Opt-out')}} + {{ts('Opt-out')}} diff --git a/ang/crmMailing/ReviewBool.js b/ang/crmMailing/ReviewBool.js index 83bd7090db..2a18a55408 100644 --- 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 31ca602452..ea80522e98 100644 --- 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 cdab76cccb..ad6e8652e2 100644 --- 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 - +
    @@ -42,7 +42,7 @@ processed by Angular; if false, the field will be hidden and completely ignored - +
    @@ -57,7 +57,7 @@ processed by Angular; if false, the field will be hidden and completely ignored - +
    diff --git a/ang/crmMailingAB/EditCtrl/edit.html b/ang/crmMailingAB/EditCtrl/edit.html index e50d798c0a..eddc171f3f 100644 --- a/ang/crmMailingAB/EditCtrl/edit.html +++ b/ang/crmMailingAB/EditCtrl/edit.html @@ -165,13 +165,13 @@ - + diff --git a/ang/crmMailingAB/EditCtrl/report.html b/ang/crmMailingAB/EditCtrl/report.html index e049b14021..4c4b8291ae 100644 --- a/ang/crmMailingAB/EditCtrl/report.html +++ b/ang/crmMailingAB/EditCtrl/report.html @@ -11,7 +11,7 @@ - + @@ -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" > {{ts('Content')}} - {{ts('HTML')}} - {{ts('Text')}} + {{ts('HTML')}} + {{ts('Text')}} @@ -155,10 +155,10 @@
    -
    {{ts('Auto-Respond')}}
    -
    {{ts('Opt-out')}}
    -
    {{ts('Resubscribe')}}
    -
    {{ts('Unsubscribe')}}
    +
    {{ts('Auto-Respond')}}
    +
    {{ts('Opt-out')}}
    +
    {{ts('Resubscribe')}}
    +
    {{ts('Unsubscribe')}}
    diff --git a/ang/crmMailingAB/ListCtrl.html b/ang/crmMailingAB/ListCtrl.html index 1944350ecb..edfb5b9791 100644 --- a/ang/crmMailingAB/ListCtrl.html +++ b/ang/crmMailingAB/ListCtrl.html @@ -59,5 +59,5 @@ Required vars: mailingABList

    -
    {{ts('New A/B Test')}}     + {{ts('New A/B Test')}}
    diff --git a/ang/crmMailingAB/WinnerDialogCtrl.js b/ang/crmMailingAB/WinnerDialogCtrl.js index b5bd3bf63c..aac6f77a39 100644 --- 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 42179c689e..b5c76b2c3d 100644 --- 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: + // Example for Font Awesome: + // Example for jQuery UI (deprecated): .directive('crmIcon', function() { return { restrict: 'EA', diff --git a/ang/crmUi/wizard.html b/ang/crmUi/wizard.html index aa4e8f0aff..44b09743f2 100644 --- a/ang/crmUi/wizard.html +++ b/ang/crmUi/wizard.html @@ -9,7 +9,7 @@
    - - + +
    -- 2.25.1