CRM-16415 - Fix icons in popups

diff --git a/css/civicrm.css b/css/civicrm.css
index 71e180efda2762f0ef3a006e0f6fafda75a62ebe..831d273b380421e599e5b4e48ab67292099288ef 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3218,16 +3218,6 @@ div.m ul#civicrm-menu,
 .select2-drop .crm-entityref-filters select.active {
   border: 1px solid #808080;
 }
-/* Icons used by entityRef create buttons */
-.crm-container .Individual-profile-icon {
-  background-position: -144px -96px;
-}
-.crm-container .Household-profile-icon {
-  background-position: 0 -112px;
-}
-.crm-container .Organization-profile-icon {
-  background-position: -112px -112px;
-}
 /* Style autocomplete results */
 .crm-container .select2-results {
   font-size: 12px;

diff --git a/js/Common.js b/js/Common.js
index c2134fa8023c70e7a2767e77d91ddac82819d7b9..41634344ea509784f6d03cb96456583d4f5ff8e1 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -745,9 +745,23 @@ if (!CRM.vars) CRM.vars = {};
       createLinks = params.contact_type ? _.where(CRM.config.entityRef.contactCreate, {type: params.contact_type}) : CRM.config.entityRef.contactCreate;
     }
     _.each(createLinks, function(link) {
+      var icon;
+      switch (link.type) {
+        case 'Individual':
+          icon = 'fa-user';
+          break;
+
+        case 'Organization':
+          icon = 'fa-building';
+          break;
+
+        case 'Household':
+          icon = 'fa-home';
+          break;
+      }
       markup += ' <a class="crm-add-entity crm-hover-button" href="' + link.url + '">';
-      if (link.type) {
-        markup += '<span class="icon ' + link.type + '-profile-icon"></span> ';
+      if (icon) {
+        markup += '<i class="crm-i ' + icon + '"></i> ';
       }
       markup += link.label + '</a>';
     });

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 96a6df73770fa27bcdff0b86b2d89602678f84f3..58a09a6efb4de6be1ca391707290bef8e0ccd6eb 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -487,8 +487,8 @@
             if ($icon.length) {
               button.icons = {primary: $icon.attr('class')};
             } else {
-              var action = $el.attr('crm-icon') || ($el.hasClass('cancel') ? 'times' : 'check');
-              button.icons = {primary: 'fa-' + action};
+              var action = $el.attr('crm-icon') || ($el.hasClass('cancel') ? 'fa-times' : 'fa-check');
+              button.icons = {primary: action};
             }
             buttons.push(button);
             added.push(identifier);