CRM-16415 ang: more icons in angularland
authorAndrew Hunt <andrew@aghstrategies.com>
Wed, 30 Sep 2015 19:00:09 +0000 (15:00 -0400)
committerAndrew Hunt <andrew@aghstrategies.com>
Tue, 13 Oct 2015 17:21:20 +0000 (13:21 -0400)
----------------------------------------
* CRM-16415: Implement Font Awesome icon font
  https://issues.civicrm.org/jira/browse/CRM-16415

ang/crmCxn/ManageCtrl.html
ang/crmMailing/Recipients.js
ang/crmMailing/ReviewBool.js
ang/crmMailingAB/ListCtrl.html

index 8a402e239b6070598c1b3cdcc87ad20537637d7d..7437a4ab776d9b73c8a3dd20a29700fc64e8b5b9 100644 (file)
@@ -72,6 +72,6 @@
 </div>
 
 <div ng-show="$.isEmptyObject(appMetas)" class="messages status no-popup">
-  <div class="icon inform-icon"></div>
+  <i class="crm-i fa-info-circle"></i>
   {{ts('No available applications')}}
 </div>
index 44114b2de6dc490510c27f7fb979ad7f18f80b2e..60cd1b88e21a928385e12020515671d6c595f327 100644 (file)
             return item.text;
           }
           var option = convertValueToObj(item.id);
-          var icon = (option.entity_type === 'civicrm_mailing') ? 'EnvelopeIn.gif' : 'group.png';
+          var icon = (option.entity_type === 'civicrm_mailing') ? 'fa-envelope' : 'fa-users';
           var spanClass = (option.mode == 'exclude') ? 'crmMailing-exclude' : 'crmMailing-include';
           if (option.entity_type != 'civicrm_mailing' && isMandatory(option.entity_id)) {
             spanClass = 'crmMailing-mandatory';
           }
-          return '<img src="' + CRM.config.resourceBase + 'i/' + icon + '" height="12" width="12" /> <span class="' + spanClass + '">' + item.text + '</span>';
+          return '<i class="crm-i '+icon+'"></i> <span class="' + spanClass + '">' + item.text + '</span>';
         }
 
         function validate() {
index 2a18a5540891db43673cbff8ea1d29ba370c82ab..98ec85c57f745b6011463be347576e82d8fe13be 100644 (file)
@@ -5,7 +5,7 @@
         crmOn: '@',
         crmTitle: '@'
       },
-      template: '<span ng-class="spanClasses"><span class="icon" ng-class="iconClasses"></span>{{evalTitle}} </span>',
+      template: '<span ng-class="spanClasses"><i class="crm-i" ng-class="iconClasses"></i> {{evalTitle}} </span>',
       link: function(scope, element, attrs) {
         function refresh() {
           if (scope.$parent.$eval(attrs.crmOn)) {
index edfb5b97910f2253c1f0933385b155508d545eed..ec6f1974043652e698b0ca7f9771f79428725730 100644 (file)
@@ -52,7 +52,7 @@ Required vars: mailingABList
 </div>
 
 <div ng-show="$.isEmptyObject(mailingABList)" class="messages status no-popup">
-  <div class="icon inform-icon"></div>
+  <i class="crm-i fa-info-circle"></i>
   {{ts('You have no A/B mailings')}}
 </div>