CRM-16415 done with wrenches

----------------------------------------
* CRM-16415:
  https://issues.civicrm.org/jira/browse/CRM-16415

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 57275373a04cadac6f1b86123ce11b12d77683f5..1339757e57ab3655e16a9c54f373e9210c4cf264 100644 (file)
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -311,7 +311,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
       $path = $field->getAttribute('data-option-edit-path');
       // NOTE: If we ever needed to support arguments in this link other than reset=1 we could split $path here if it contains a ?
       $url = CRM_Utils_System::url($path, 'reset=1');
-      $el['html'] .= ' <a href="' . $url . '" class="crm-option-edit-link medium-popup crm-hover-button" target="_blank" title="' . ts('Edit Options') . '" data-option-edit-path="' . $path . '"><span class="icon ui-icon-wrench"></span></a>';
+      $el['html'] .= ' <a href="' . $url . '" class="crm-option-edit-link medium-popup crm-hover-button" target="_blank" title="' . ts('Edit Options') . '" data-option-edit-path="' . $path . '"><i class="crm-i fa-wrench"></i></a>';
     }
   }
 

diff --git a/css/civicrm.css b/css/civicrm.css
index 3cbf85a1a25d1da0e0e21368051bf31a7aa56cde..dbef827a947a9e25725ddbc7c25b6aeba6ee6642 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2240,6 +2240,24 @@ a.crm-i:hover {
   color: #6177D5;
 }
 
+.crm-i-button>.crm-i {
+  padding-left: 2px;
+}
+
+.crm-container .ui-dialog-titlebar .ui-button .ui-icon[class*=" fa-"] {
+  background: none repeat scroll 0 0 transparent !important;
+  color: #F5F6F1;
+}
+
+.crm-container .ui-dialog-titlebar .ui-button .ui-icon[class*=" fa-"]:hover {
+
+}
+
+.crm-container .crm-button.crm-i-button input[type="button"],
+.crm-container .crm-button.crm-i-button input.crm-form-submit {
+  padding-left: 0;
+}
+
 .crm-container .inform-icon {
   background-position: -16px -144px;
   margin-right: 5px;
@@ -2266,10 +2284,6 @@ a.crm-i:hover {
   content: "\f059";
 }
 
-.crm-container div.crm-accordion-header a.helpicon {
-  color: #2786C2;
-}
-
 /* These .crm-icon classes use item_sprites.png */
 
 .crm-container .crm-icon {

diff --git a/css/crm-i.css b/css/crm-i.css
index cbdee150294bdd05a935630e95829ae0931da84a..4b6875319c6cd58dd3d27670c26538c5939a4e9d 100644 (file)
--- a/css/crm-i.css
+++ b/css/crm-i.css
@@ -12,23 +12,27 @@ is loaded before font-awesome.css so that .fa-XXX classes can modify it. */
   transform: translate(0, 0);
 }
 
+i.crm-i {
+  font-style: normal;
+}
+
 /* Have FA handle jQuery UI icons */
 
 .ui-icon[class*=" fa-"] {
-    /* Remove the jQuery UI Icon */
-    background: none repeat scroll 0 0 transparent !important;
-    /* Remove the jQuery UI Text Indent */
-    text-indent: 0;
-    /* Bump it up - jQuery UI is -8px */
-    margin-top: -0.5em;
+  /* Remove the jQuery UI Icon */
+  background: none repeat scroll 0 0 transparent !important;
+  /* Remove the jQuery UI Text Indent */
+  text-indent: 0;
+  /* Bump it up - jQuery UI is -8px */
+  margin-top: -0.5em;
 }
 
 /* Allow use of icon-large to be properly aligned */
 .ui-icon.icon-large {
-    margin-top: -0.75em;
+  margin-top: -0.75em;
 }
 
 .ui-button-icon-only .ui-icon[class*=" fa-"] {
-    /* Bump it - jQuery UI is -8px */
-    margin-left: -7px;
+  /* Bump it - jQuery UI is -8px */
+  margin-left: -7px;
 }

diff --git a/js/Common.js b/js/Common.js
index b54cff9e329fe71881894e0ff4ab8e81fd1e8521..c2134fa8023c70e7a2767e77d91ddac82819d7b9 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -608,7 +608,7 @@ if (!CRM.vars) CRM.vars = {};
         $clearLink = $();
 
       if (settings.allowClear !== undefined ? settings.allowClear : !$dataField.is('.required, [required]')) {
-        $clearLink = $('<a class="crm-hover-button crm-clear-link" title="'+ ts('Clear') +'"><span class="icon ui-icon-close"></span></a>')
+        $clearLink = $('<a class="crm-hover-button crm-clear-link" title="'+ ts('Clear') +'"><i class="crm-i fa-times"></i></a>')
           .insertAfter($dataField);
       }
       if (settings.time !== false) {
@@ -920,7 +920,7 @@ if (!CRM.vars) CRM.vars = {};
       }
       // Add resize button
       if ($el.parent().hasClass('crm-container') && $el.dialog('option', 'resizable')) {
-        $el.parent().find('.ui-dialog-titlebar').append($('<button class="crm-dialog-titlebar-resize ui-dialog-titlebar-close" title="'+ts('Toggle fullscreen')+'" style="right:2em;"/>').button({icons: {primary: 'ui-icon-newwin'}, text: false}));
+        $el.parent().find('.ui-dialog-titlebar').append($('<button class="crm-dialog-titlebar-resize ui-dialog-titlebar-close" title="'+ts('Toggle fullscreen')+'" style="right:2em;"/>').button({icons: {primary: 'fa-expand'}, text: false}));
         $('.crm-dialog-titlebar-resize', $el.parent()).click(function(e) {
           if ($el.data('origSize')) {
             $el.dialog('option', $el.data('origSize'));
@@ -1149,7 +1149,7 @@ if (!CRM.vars) CRM.vars = {};
         buttons.push({
           text: label,
           'data-op': op,
-          icons: {primary: op === 'no' ? 'ui-icon-close' : 'ui-icon-check'},
+          icons: {primary: op === 'no' ? 'fa-times' : 'fa-check'},
           click: function() {
             var event = $.Event('crmConfirm:' + op);
             $(this).trigger(event);

diff --git a/js/crm.insert-shortcode.js b/js/crm.insert-shortcode.js
index 778d312480155101cd18c7e7b84dcd617c048863..af285dd5b692b9fc12fad64523a4f48e09a60817 100755 (executable)
--- a/js/crm.insert-shortcode.js
+++ b/js/crm.insert-shortcode.js
@@ -40,13 +40,13 @@ CRM.$(function($) {
   $form.closest('.ui-dialog-content').dialog('option', 'buttons', [
     {
       text: ts("Insert"),
-      icons: {primary: "ui-icon-check"},
+      icons: {primary: "fa-check"},
       click: insert
     },
     {
       text: ts("Cancel"),
-      icons: {primary: "ui-icon-close"},
+      icons: {primary: "fa-times"},
       click: close
     }
   ]);
-});
\ No newline at end of file
+});

diff --git a/js/jquery/jquery.crmeditable.js b/js/jquery/jquery.crmeditable.js
index 2b8a12f2e96f2bf8498d2d5cd8cdc14b3dc577fd..92440ebf0d8e56fe611c05bbb4fd21ae4f53a491 100644 (file)
--- a/js/jquery/jquery.crmeditable.js
+++ b/js/jquery/jquery.crmeditable.js
@@ -109,8 +109,8 @@
         tooltip: $i.data('tooltip') || ts('Click to edit'),
         placeholder: $i.data('placeholder') || '<span class="crm-editable-placeholder">' + ts('Click to edit') + '</span>',
         onblur: 'cancel',
-        cancel: '<button type="cancel"><span class="ui-icon ui-icon-closethick"></span></button>',
-        submit: '<button type="submit"><span class="ui-icon ui-icon-check"></span></button>',
+        cancel: '<button type="cancel"><i class="crm-i fa-times"></i></button>',
+        submit: '<button type="submit"><i class="crm-i fa-check"></i></button>',
         cssclass: 'crm-editable-form',
         data: getData,
         onreset: restoreContainer

diff --git a/templates/CRM/Admin/Page/CKEditorConfig.tpl b/templates/CRM/Admin/Page/CKEditorConfig.tpl
index 522bc94825bd834a40d9246c7eb2c76e6bba62e9..0024b4d46b607c5924880d5cc0a0693e53cffd77 100644 (file)
--- a/templates/CRM/Admin/Page/CKEditorConfig.tpl
+++ b/templates/CRM/Admin/Page/CKEditorConfig.tpl
@@ -25,7 +25,9 @@
 *}
 <style>{literal}
   .select2-results .ui-icon,
+  .select2-results .crm-i,
   .select2-container .ui-icon,
+  .select2-container .crm-i,
   .select2-results img,
   .select2-container img {
     display: inline-block;
@@ -67,11 +69,11 @@
   </div>
 
   <div class="crm-submit-buttons">
-    <span class="crm-button crm-icon-button">
-      <span class="crm-button-icon ui-icon-check"> </span> <input type="submit" value="{ts}Save{/ts}" name="save" class="crm-form-submit" accesskey="S"/>
+    <span class="crm-button crm-i-button">
+      <i class="crm-i fa-wrench"></i> <input type="submit" value="{ts}Save{/ts}" name="save" class="crm-form-submit" accesskey="S"/>
     </span>
-    <span class="crm-button crm-icon-button">
-      <span class="crm-button-icon ui-icon-cancel"> </span> <input type="submit" value="{ts}Revert to Default{/ts}" name="revert" class="crm-form-submit" onclick="return confirm('{$revertConfirm}');"/>
+    <span class="crm-button crm-i-button">
+      <i class="crm-i fa-times"></i> <input type="submit" value="{ts}Revert to Default{/ts}" name="revert" class="crm-form-submit" onclick="return confirm('{$revertConfirm}');"/>
     </span>
   </div>
 </form>

diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl
index 9261ffeecbf9cf2af265ed04abac89baf0d7c3ea..520d9d7e25f3f2caa0ab65b4b839eda8c6fd2616 100644 (file)
--- a/templates/CRM/Contact/Form/Contact.tpl
+++ b/templates/CRM/Contact/Form/Contact.tpl
@@ -32,7 +32,7 @@
   {/if}
   <div class="crm-form-block crm-search-form-block">
     {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
-      <a href='{crmURL p="civicrm/admin/setting/preferences/display" q="reset=1"}' title="{ts}Click here to configure the panes.{/ts}"><span class="icon ui-icon-wrench"></span></a>
+      <a href='{crmURL p="civicrm/admin/setting/preferences/display" q="reset=1"}' title="{ts}Click here to configure the panes.{/ts}"><i class="crm-i fa-wrench"></i></a>
     {/if}
     <span style="float:right;"><a href="#expand" id="expand">{ts}Expand all tabs{/ts}</a></span>
     <div class="crm-submit-buttons">

diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index c1cc6b559d78d26747b1cea7dd893f8b6c3dd055..3eeb52c4a77f1aa86e6d59cd35ff6fd656e86198 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -90,7 +90,7 @@
       <td>
         {$form.max_participants.html|crmAddClass:four}
         {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
-          <a class="crm-popup crm-hover-button" target="_blank" title="{ts}Edit Participant Status Options{/ts}" href="{crmURL p='civicrm/admin/participant_status' q='reset=1'}"><span class="icon ui-icon-wrench"> </span></a>
+          <a class="crm-popup crm-hover-button" target="_blank" title="{ts}Edit Participant Status Options{/ts}" href="{crmURL p='civicrm/admin/participant_status' q='reset=1'}"><i class="crm-i fa-wrench"></i></a>
         {/if}
       </td>
     </tr>
@@ -181,4 +181,3 @@
   });
 </script>
 {/literal}
-

diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl
index ff1ca59e99337d870990e48cc4a94e56d09cbc86..26f4bcbb51ee9d19b3d76109f5d17776315f96e2 100644 (file)
--- a/templates/CRM/Event/Page/EventInfo.tpl
+++ b/templates/CRM/Event/Page/EventInfo.tpl
@@ -28,7 +28,7 @@
 {if $registerClosed }
 <div class="spacer"></div>
 <div class="messages status no-popup">
-  <div class="icon inform-icon"></div>
+  <i class="crm-i fa-info-circle"></i>
      &nbsp;{ts}Registration is closed for this event{/ts}
   </div>
 {/if}
@@ -39,7 +39,7 @@
   <li>
     <div id="crm-event-links-wrapper">
       <span id="crm-event-configure-link" class="crm-hover-button">
-        <span title="{ts}Configure this event.{/ts}" class="icon ui-icon-wrench"></span>
+        <span title="{ts}Configure this event.{/ts}" class="crm-i fa-wrench"></span>
       </span>
       <div class="ac_results" id="crm-event-links-list" style="margin-left: -25px;">
         <div class="crm-event-links-list-inner">
@@ -63,7 +63,7 @@
   <li>
     <div id="crm-participant-wrapper">
       <span id="crm-participant-links" class="crm-hover-button">
-        <span title="{ts}Participant listing links.{/ts}" class="icon ui-icon-search"></span>
+        <span title="{ts}Participant listing links.{/ts}" class="crm-i fa-search"></span>
       </span>
       <div class="ac_results" id="crm-participant-list" style="margin-left: -25px;">
         <div class="crm-participant-list-inner">