From: Andrew Hunt <andrew@aghstrategies.com>
Date: Tue, 13 Oct 2015 15:08:34 +0000 (-0400)
Subject: CRM-16415 Wrenches, undos, and go-backs
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;ds=sidebyside;h=f4b168fd4a2c4a36553be0ccdfdaaa56e5cf6281;hp=f1616b1c48600f4e5090079e411fc19c9ebcc399;p=civicrm-core.git

CRM-16415 Wrenches, undos, and go-backs

----------------------------------------
* 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 41259af0f1..ca3d1f7d1e 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2220,11 +2220,16 @@ input.crm-form-entityref {
 
 /* Font Awesome */
 
-.crm-container a,
-.crm-container a:link,
-.crm-container a:visited,
-.crm-container a:active,
-.crm-container a:hover {
+.crm-container a .crm-i,
+.crm-container a:link .crm-i,
+.crm-container a:visited .crm-i,
+.crm-container a:active .crm-i,
+.crm-container a:hover .crm-i,
+.crm-container a .ui-icon[class*=" fa-"],
+.crm-container a:link .ui-icon[class*=" fa-"],
+.crm-container a:visited .ui-icon[class*=" fa-"],
+.crm-container a:active .ui-icon[class*=" fa-"],
+.crm-container a:hover .ui-icon[class*=" fa-"] {
   color: inherit;
 }
 
diff --git a/js/wysiwyg/admin.ckeditor-configurator.js b/js/wysiwyg/admin.ckeditor-configurator.js
index 74f0c1ce8a..64bfef0277 100644
--- a/js/wysiwyg/admin.ckeditor-configurator.js
+++ b/js/wysiwyg/admin.ckeditor-configurator.js
@@ -56,4 +56,4 @@
       });
   });
 
-})(CRM.$, CRM._);
\ No newline at end of file
+})(CRM.$, CRM._);
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 8a3427051d..c006e896d3 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -159,7 +159,7 @@
         {$form.editor_id.html}
         &nbsp;
         <span class="crm-button crm-icon-button" style="display:inline-block;vertical-align:middle;float:none!important;">
-          <span class="crm-button-icon ui-icon-gear"> </span>
+          <i class="crm-i fa-wrench" style="margin: 0 -18px 0 2px;"></i>
           {$form.ckeditor_config.html}
         </span>
       </td>
diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl
index c9d70acebf..242531effa 100644
--- a/templates/CRM/Admin/Page/JobLog.tpl
+++ b/templates/CRM/Admin/Page/JobLog.tpl
@@ -32,7 +32,7 @@
 {/if}
 
 <div class="action-link">
-  <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-top" class="button"><span><div class="icon ui-icon-arrowreturnthick-1-w"></div>{ts}Back to Scheduled Jobs Listing{/ts}</span></a>
+  <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-top" class="button"><span><i class="crm-i fa-chevron-left"></i> {ts}Back to Scheduled Jobs Listing{/ts}</span></a>
 </div>
 
 {if $rows}
@@ -73,5 +73,5 @@
 {/if}
 
 <div class="action-link">
-  <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-bottom" class="button"><span><div class="icon ui-icon-arrowreturnthick-1-w"></div>{ts}Back to Scheduled Jobs Listing{/ts}</span></a>
+  <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-bottom" class="button"><span><i class="crm-i fa-chevron-left"></i> {ts}Back to Scheduled Jobs Listing{/ts}</span></a>
 </div>
diff --git a/templates/CRM/Block/CreateNew.tpl b/templates/CRM/Block/CreateNew.tpl
index 6ceddf8450..2d032807be 100644
--- a/templates/CRM/Block/CreateNew.tpl
+++ b/templates/CRM/Block/CreateNew.tpl
@@ -24,7 +24,7 @@
 *}
 <div class="block-civicrm crm-container">
 <div id="crm-create-new-wrapper">
-  <a id="crm-create-new-link" class="button" href="#"><span><div class="icon ui-icon-arrow-1-se css_right"></div>{ts}Create New{/ts}</span></a>
+  <a id="crm-create-new-link" class="button" href="#"><span>{ts}Create New{/ts} <i class="crm-i fa-bars"></i></span></a>
     <div id="crm-create-new-list">
       <div class="crm-create-new-list-inner">
       <ul>
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl b/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
index 987ea502aa..5f58cff453 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
@@ -28,7 +28,7 @@
    <ul id="actions">
       <li><div id="crm-contribpage-links-wrapper">
             <a id="crm-contribpage-links-link" class="button">
-              <span><div class="icon ui-icon-arrow-1-se css_right"></div>{ts}Contribution Links{/ts}</span>
+              <span>{ts}Contribution Links{/ts} <i class="crm-i fa-bars"></i></span>
             </a>
               <div class="ac_results" id="crm-contribpage-links-list">
                  <div class="crm-contribpage-links-list-inner">
diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl
index 3df7a5635b..7e3f0a6c20 100644
--- a/templates/CRM/Custom/Form/Field.tpl
+++ b/templates/CRM/Custom/Form/Field.tpl
@@ -152,7 +152,7 @@ function custom_option_html_type( ) {
     {if $action eq 2 and $changeFieldType}
     <br />
     <a class="action-item crm-hover-button" href='{crmURL p="civicrm/admin/custom/group/field/changetype" q="reset=1&id=`$id`"}'>
-      <span class="icon ui-icon-gear"></span>
+      <i class="crm-i fa-wrench"></i>
       {ts}Change Input Field Type{/ts}
     </a>
     <div class='clear'></div>
diff --git a/templates/CRM/Event/Form/ManageEvent/Tab.tpl b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
index 8f19066790..56436b18d9 100644
--- a/templates/CRM/Event/Form/ManageEvent/Tab.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
@@ -28,7 +28,7 @@
     <div class="crm-actions-ribbon crm-event-manage-tab-actions-ribbon">
       <ul id="actions">
       <li><div id="crm-event-links-wrapper">
-            <a id="crm-event-links-link" class="button"><span><div class="icon ui-icon-arrow-1-se css_right"></div>{ts}Event Links{/ts}</span></a>
+            <a id="crm-event-links-link" class="button"><span>{ts}Event Links{/ts} <i class="crm-i fa-bars"></i></span></a>
             <div class="ac_results" id="crm-event-links-list">
                  <div class="crm-event-links-list-inner">
                    <ul>
@@ -44,7 +44,7 @@
         </div></li>
 
       <li><div id="crm-participant-wrapper">
-            <a id="crm-participant-link" class="button"><span><div class="icon ui-icon-arrow-1-se css_right"></div>{ts}Find Participants{/ts}</span></a>
+            <a id="crm-participant-link" class="button"><span>{ts}Find Participants{/ts} <i class="crm-i fa-bars"></i></span></a>
             <div class="ac_results" id="crm-participant-list">
                  <div class="crm-participant-list-inner">
                    <ul>
diff --git a/templates/CRM/Logging/ReportDetail.tpl b/templates/CRM/Logging/ReportDetail.tpl
index f63504e499..07b6ae37dc 100644
--- a/templates/CRM/Logging/ReportDetail.tpl
+++ b/templates/CRM/Logging/ReportDetail.tpl
@@ -48,8 +48,8 @@
   {/if}
   {if $layout neq 'overlay'}
   <div class="action-link">
-      <a href="{$backURL}"   class="button"><span><div class="icon ui-icon-arrowreturnthick-1-w"></div>{ts}Back to Logging Summary{/ts}</span></a>
-      <a href="{$revertURL}" class="button" onclick="return confirm('{$revertConfirm}');"><span><div class="icon delete-icon"></div>{ts}Revert These Changes{/ts}</span></a>
+      <a href="{$backURL}"   class="button"><span><i class="crm-i fa-chevron-left"></i> {ts}Back to Logging Summary{/ts}</span></a>
+      <a href="{$revertURL}" class="button" onclick="return confirm('{$revertConfirm}');"><span><i class="crm-i fa-undo"></i> {ts}Revert These Changes{/ts}</span></a>
   </div>
   {/if}
 </div>
diff --git a/templates/CRM/common/navigation.js.tpl b/templates/CRM/common/navigation.js.tpl
index 0ddacf6527..6d17ead7dd 100644
--- a/templates/CRM/common/navigation.js.tpl
+++ b/templates/CRM/common/navigation.js.tpl
@@ -142,7 +142,7 @@ $('#civicrm-menu').ready(function() {
     if ($('#crm-notification-container').length) {
       var alert = CRM.alert({/literal}'<a href="#" id="crm-restore-menu" style="text-align: center; margin-top: -8px;">{ts escape='js'}Restore CiviCRM Menu{/ts}</a>'{literal}, '', 'none', {expires: 10000});
       $('#crm-restore-menu')
-        .button({icons: {primary: 'ui-icon-arrowreturnthick-1-w'}})
+        .button({icons: {primary: 'fa-undo'}})
         .click(function(e) {
           e.preventDefault();
           alert.close();