CRM-16415 Last icons to replace

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

diff --git a/css/civicrm.css b/css/civicrm.css
index 975f43797523cbebd3a5a195028cbd8c73c9bfef..71e180efda2762f0ef3a006e0f6fafda75a62ebe 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2237,6 +2237,10 @@ a.crm-i:hover {
   text-decoration: none;
 }
 
+.crm-container a:hover .crm-i.fa-trash,
+.crm-container .crm-button:hover .crm-i.fa-trash,
+.crm-container .crm-hover-button:hover .crm-i.fa-trash,
+.crm-container span:hover > .crm-i.fa-trash,
 .crm-i.crm-i-red {
   color: #8A1F11;
 }

diff --git a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
index 25148c4164822e37b5c29a125114087b8aa8f352..3c6c3b4435c36d54c63973e2f5c6a7de71f4bf46 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
+++ b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
@@ -35,12 +35,12 @@
     </p>
 </div>
         <div>
-          <span class="crm-button crm-icon-button">
-            <span class="crm-button-icon ui-icon-trash"> </span>
+          <span class="crm-button crm-i-button">
+            <i class="crm-i fa-undo"></i>
             {$form._qf_UpdateConfigBackend_next_cleanup.html}
           </span>
-          <span class="crm-button crm-icon-button">
-            <span class="crm-button-icon ui-icon-trash"> </span>
+          <span class="crm-button crm-i-button">
+            <i class="crm-i fa-terminal"></i>
             {$form._qf_UpdateConfigBackend_next_resetpaths.html}
           </span>
         </div>

diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js
index 7571271877d284bbaf6011504439cf3353226bf0..ce0b65a130919de54c6b545f39b294b8954ed78a 100644 (file)
--- a/templates/CRM/Admin/Page/APIExplorer.js
+++ b/templates/CRM/Admin/Page/APIExplorer.js
@@ -95,10 +95,10 @@
     var $row = $('tr:last-child', '#api-params');
     $('.api-chain-entity', $row).crmSelect2({
       formatSelection: function(item) {
-        return '<span class="icon ui-icon-link"></span> API ' +
+        return '<i class="crm-i fa-link"></i> API ' +
           ($(item.element).hasClass('strikethrough') ? '<span class="strikethrough">' + item.text + '</span>' : item.text);
       },
-      placeholder: '<span class="icon ui-icon-link"></span> ' + ts('Entity'),
+      placeholder: '<i class="crm-i fa-link"></i> ' + ts('Entity'),
       escapeMarkup: function(m) {return m;}
     });
   }

diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index 90795d2f1ecd3111b83522cf3d21156dea19c191..1c2b8bbd2234661f89b9f787bf71b18d383ecef5 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -38,7 +38,7 @@
       </div>
       <div class="crm-submit-buttons reset-advanced-search">
         <a href="{crmURL p='civicrm/contact/search/advanced' q='reset=1'}" id="resetAdvancedSearch" class="crm-hover-button css_right" title="{ts}Clear all search criteria{/ts}">
-          <span class="icon ui-icon-circle-close"></span>
+          <i class="crm-i fa-undo"></i>
           {ts}Reset Form{/ts}
         </a>
       </div>

diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index 3faaf0f82779ce51c153a36258129c5044e4f9a0..1f64df4aef404d0d5139741f41cbfcc17c4d0537 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -28,11 +28,8 @@
       width="20%">{if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].label}
     {else}{$form.custom_post_id_multiple[$profileBottomNum].label}{/if}</td>
   <td>{if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].html}{else}{$form.custom_post_id_multiple[$profileBottomNum].html}{/if}
-    &nbsp;<span class='profile_bottom_link_remove'><a href="#" class="crm-hover-button crm-button-rem-profile"
-                                                      data-addtlPartc="{$addProfileBottomAdd}"><span
-          class="icon ui-icon-trash"></span>{ts}remove profile{/ts}</a></span>&nbsp;&nbsp;<span
-      class='profile_bottom_link'>&nbsp;<a href="#" class="crm-hover-button crm-button-add-profile"><span
-          class="icon ui-icon-plus"></span>{ts}add another profile (bottom of page){/ts}</a></span>
+    <span class='profile_bottom_link_remove'><a href="#" class="crm-hover-button crm-button-rem-profile" data-addtlPartc="{$addProfileBottomAdd}"><i class="crm-i fa-trash"></i> {ts}remove profile{/ts}</a></span>
+    <span class='profile_bottom_link'>&nbsp;<a href="#" class="crm-hover-button crm-button-add-profile"><i class="crm-i fa-plus-circle"></i> {ts}add another profile (bottom of page){/ts}</a></span>
     {if $addProfileBottomAdd }
       <div
         class="description">{ts}Change this if you want to use a different profile for additional participants.{/ts}</div>
@@ -146,11 +143,8 @@
       <tr id="profile_post" class="crm-event-manage-registration-form-block-custom_post_id">
         <td scope="row" class="label" width="20%">{$form.custom_post_id.label}</td>
         <td>{$form.custom_post_id.html}
-          <div
-            class="description">{ts}Include additional fields on this registration form by selecting and configuring a CiviCRM Profile to be included at the bottom of the page.{/ts}</div>
-          &nbsp;<span class='profile_bottom_link_main {if $profilePostMultiple}hiddenElement{/if}'>&nbsp;<a href="#"
-class="crm-hover-button crm-button-add-profile"><span
-                class="icon ui-icon-plus"></span>{ts}add another profile (bottom of page){/ts}</a></span>
+          <div class="description">{ts}Include additional fields on this registration form by selecting and configuring a CiviCRM Profile to be included at the bottom of the page.{/ts}</div>
+          <span class='profile_bottom_link_main {if $profilePostMultiple}hiddenElement{/if}'><a href="#" class="crm-hover-button crm-button-add-profile"><i class="crm-i fa-plus-circle"></i> {ts}add another profile (bottom of page){/ts}</a></span>
           <br/>
         </td>
       </tr>
@@ -164,13 +158,13 @@ class="crm-hover-button crm-button-add-profile"><span
               &nbsp;
               <span class='profile_bottom_link_remove'>
                 <a href="#" class="crm-hover-button crm-button-rem-profile">
-                  <span class="icon ui-icon-trash"></span>{ts}remove profile{/ts}
+                  <i class="crm-i fa-trash"></i> {ts}remove profile{/ts}
                 </a>
               </span>
               &nbsp;&nbsp;
               <span class='profile_bottom_link' {if !$smarty.foreach.profilePostIdName.last} style="display: none"{/if}>
                 <a href="#" class="crm-hover-button crm-button-add-profile">
-                  <span class="icon ui-icon-plus"></span>
+                  <i class="crm-i fa-plus-circle"></i>
                   {ts}add another profile (bottom of page){/ts}
                 </a>
               </span>
@@ -195,9 +189,7 @@ class="crm-hover-button crm-button-add-profile"><span
           <div
             class="description">{ts}Change this if you want to use a different profile for additional participants.{/ts}
           </div>
-          &nbsp;<span class='profile_bottom_add_link_main{if $profilePostMultipleAdd} hiddenElement{/if}'><a
-              href="#" class="crm-hover-button crm-button-add-profile"><span
-                class="icon ui-icon-plus"></span>{ts}add another profile (bottom of page){/ts}</a></span>
+          <span class='profile_bottom_add_link_main{if $profilePostMultipleAdd} hiddenElement{/if}'><a href="#" class="crm-hover-button crm-button-add-profile"><i class="crm-i fa-plus-circle"></i> {ts}add another profile (bottom of page){/ts}</a></span>
           <br/><span class="profile-links"></span>
         </td>
       </tr>
@@ -211,12 +203,12 @@ class="crm-hover-button crm-button-add-profile"><span
               &nbsp;
               <span class='profile_bottom_add_link_remove'>
                 <a href="#" class="crm-hover-button crm-button-rem-profile">
-                  <span class="icon ui-icon-trash"></span>{ts}remove profile{/ts}
+                  <i class="crm-i fa-trash"></i> {ts}remove profile{/ts}
                 </a>
               </span>
               <span class='profile_bottom_add_link' {if !$smarty.foreach.profilePostIdAName.last} style="display: none"{/if}>
                 <a href="#" class="crm-hover-button crm-button-add-profile">
-                  <span class="icon ui-icon-plus"></span>
+                  <i class="crm-i fa-plus-circle"></i>
                   {ts}add another profile (bottom of page){/ts}
                 </a>
               </span>