From 10e8c74fee2c3644a73dc72206a83a89e032b7ea Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 17 Oct 2015 14:58:47 -0400
Subject: [PATCH] CRM-16415 - Replace editable icons

---
 css/civicrm.css                 | 14 ++++----------
 css/crm-i.css                   |  1 +
 js/jquery/jquery.crmeditable.js |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 5593d274ea..7d9dc2ab5d 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3445,10 +3445,11 @@ div.m ul#civicrm-menu,
 }
 
 .crm-container .replace-plain:before {
-  content: "";
+  content: "\f040";
   position: absolute;
   top: .4em;
   right: .5em;
+  opacity: .5;
 }
 
 /* in place edit  */
@@ -3478,21 +3479,14 @@ div.m ul#civicrm-menu,
   display: inline-block !important;
 }
 
-.crm-container .crm-editable-placeholder,
-.crm-container .replace-plain:before {
-  background: url("../i/icons/jquery-ui-3E3E3E.png") -66px -114px no-repeat;
-  text-indent: -10000px;
-  display: block;
-  height: 16px;
-  width: 16px;
+.crm-container .crm-editable-enabled .crm-i {
   opacity: .5;
 }
 
 .crm-container .replace-plain a:active:before,
 .crm-container .replace-plain:focus:before,
 .crm-container .replace-plain:hover:before,
-.crm-container .crm-editable-enabled:hover .crm-editable-placeholder {
-  background-image: url("../i/icons/jquery-ui-2786C2.png");
+.crm-container .crm-editable-enabled:hover .crm-i {
   opacity: 1;
 }
 
diff --git a/css/crm-i.css b/css/crm-i.css
index 6dccf19996..c8ec92a346 100644
--- a/css/crm-i.css
+++ b/css/crm-i.css
@@ -3,6 +3,7 @@ This is separate to avoid conflict with a site theme's implementation of FA.  It
 is loaded before font-awesome.css so that .fa-XXX classes can modify it. */
 .ui-icon[class*=" fa-"],
 .crm-container a.helpicon,
+.crm-container .replace-plain:before,
 .crm-i {
   display: inline-block;
   font: normal normal normal 14px/1 FontAwesome;
diff --git a/js/jquery/jquery.crmeditable.js b/js/jquery/jquery.crmeditable.js
index 92440ebf0d..453c496932 100644
--- a/js/jquery/jquery.crmeditable.js
+++ b/js/jquery/jquery.crmeditable.js
@@ -107,7 +107,7 @@
 
       var settings = {
         tooltip: $i.data('tooltip') || ts('Click to edit'),
-        placeholder: $i.data('placeholder') || '<span class="crm-editable-placeholder">' + ts('Click to edit') + '</span>',
+        placeholder: $i.data('placeholder') || '<i class="crm-i fa-pencil crm-editable-placeholder"></i>',
         onblur: 'cancel',
         cancel: '<button type="cancel"><i class="crm-i fa-times"></i></button>',
         submit: '<button type="submit"><i class="crm-i fa-check"></i></button>',
-- 
2.25.1