From 8777ffd129f7076dd7701ea6320c272e012bcf30 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Sun, 27 Sep 2015 16:54:00 -0400
Subject: [PATCH] CRM-16415 Replaced .ui-icon-alert

----------------------------------------
* CRM-16415: Implement Font Awesome icon font
  https://issues.civicrm.org/jira/browse/CRM-16415
---
 css/civicrm.css                                    |  4 ++++
 templates/CRM/Admin/Form/Options.tpl               |  2 +-
 templates/CRM/Admin/Page/APIExplorer.js            |  8 ++++----
 templates/CRM/Admin/Page/OptionGroup.tpl           |  2 +-
 templates/CRM/Batch/Form/Entry.tpl                 | 11 +++++------
 templates/CRM/Campaign/Form/Task/Interview.tpl     |  3 +--
 templates/CRM/Core/Page/RecurringEntityPreview.tpl |  2 +-
 templates/CRM/Custom/Form/Field.tpl                |  2 +-
 templates/CRM/Event/Form/Participant.tpl           |  3 +--
 templates/CRM/Form/body.tpl                        |  3 +--
 templates/CRM/common/fatal.tpl                     |  6 +++---
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 2d18b9d12d..914420b0f1 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2201,6 +2201,10 @@ input.crm-form-entityref {
   background-image: url("../i/icons/jquery-ui-8A1F11.png");
 }
 
+.crm-container .fa.icon-red {
+  color: #8A1F11;
+}
+
 .crm-container .inform-icon {
   background-position: -16px -144px;
   margin-right: 5px;
diff --git a/templates/CRM/Admin/Form/Options.tpl b/templates/CRM/Admin/Form/Options.tpl
index d9eb0d3648..1320e79203 100644
--- a/templates/CRM/Admin/Form/Options.tpl
+++ b/templates/CRM/Admin/Form/Options.tpl
@@ -79,7 +79,7 @@
         <tr class="crm-admin-options-form-block-value">
           <td class="label">{$form.value.label}</td>
           <td>{$form.value.html}<br />
-              <span class="description"><div class="icon ui-icon-alert"></div>{ts}Changing the Value field will unlink records which have been marked with this option. This change can not be undone except by restoring the previous value.{/ts}</span>
+              <span class="description"><i class="fa fa-exclamation-triangle"></i> {ts}Changing the Value field will unlink records which have been marked with this option. This change can not be undone except by restoring the previous value.{/ts}</span>
           </td>
         </tr>
       {/if}
diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js
index 4b1bc15d95..d27a59547d 100644
--- a/templates/CRM/Admin/Page/APIExplorer.js
+++ b/templates/CRM/Admin/Page/APIExplorer.js
@@ -527,7 +527,7 @@
         .addClass('crm-error')
         .css('width', '82%')
         .attr('title', msg)
-        .before('<div class="icon red-icon ui-icon-alert" title="'+msg+'"/>')
+        .before('<i class="fa fa-exclamation-triangle icon-red" title="'+msg+'"></i> ')
         .tooltip();
     }
   }
@@ -542,7 +542,7 @@
       .attr('title', '')
       .css('width', '85%')
       .tooltip('destroy')
-      .siblings('.ui-icon-alert').remove();
+      .siblings('.fa-exclamation-triangle').remove();
   }
 
   /**
@@ -714,12 +714,12 @@
     }
     checkBookKeepingEntity(entity, action);
   }
-    
+
   /**
    * Check if entity is Financial Trxn and Entity Financial Trxn
    * and Action is Create, delete, update etc then display warning
    */
-  function checkBookKeepingEntity(entity, action) {      
+  function checkBookKeepingEntity(entity, action) {
     if ($.inArray(entity, ['EntityFinancialTrxn', 'FinancialTrxn']) > -1 && $.inArray(action, ['delete', 'setvalue', 'replace', 'create']) > -1) {
       var msg = ts('Given the importance of auditability, extension developers are strongly discouraged from writing code to add, update or delete entries in the civicrm_financial_item, civicrm_entity_financial_trxn, and civicrm_financial_trxn tables. Before publishing an extension on civicrm.org that does any of this, please ask for a special bookkeeping code review for the extension.');
       CRM.alert(msg, 'warning');
diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl
index ea46d7b985..a7ca128179 100644
--- a/templates/CRM/Admin/Page/OptionGroup.tpl
+++ b/templates/CRM/Admin/Page/OptionGroup.tpl
@@ -29,7 +29,7 @@
 {else}
 <div id="help">
     {ts}CiviCRM stores configurable choices for various drop-down fields as 'option groups'. You can click <strong>Options</strong> to view the available choices.{/ts}
-    <p><div class="icon ui-icon-alert"></div> {ts}WARNING: Many option groups are used programatically and values should be added or modified with caution.{/ts}</p>
+    <p><i class="fa fa-exclamation-triangle"></i> {ts}WARNING: Many option groups are used programatically and values should be added or modified with caution.{/ts}</p>
 </div>
 {/if}
 
diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl
index 27a794fed6..50559b4980 100755
--- a/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@ -29,8 +29,7 @@
   </div>
   {if $batchAmountMismatch}
     <div class="status message status-warning">
-      <div
-        class="icon ui-icon-alert"></div> {ts}Total for amounts entered below does not match the expected batch total.{/ts}
+      <i class="fa fa-exclamation-triangle"></i> {ts}Total for amounts entered below does not match the expected batch total.{/ts}
     </div>
     <div class="crm-button crm-button_qf_Entry_upload_force-save">
       {$form._qf_Entry_upload_force.html}
@@ -125,10 +124,10 @@ CRM.$(function($) {
   $('.selector-rows').change(function () {
     var options = {
       'url': {/literal}"{crmURL p='civicrm/ajax/batch' h=0}"{literal}
-    }; 
+    };
     $($form).ajaxSubmit(options);
   });
- 
+
  $('input[id*="primary_contact_"]').change(function() {
  var temp = this.id.split('_');
    var ROWID = temp[3];
@@ -509,7 +508,7 @@ if (CRM.batch.type_id == 3){
 function setPledgeAmount(form, pledgeID) {
   var rowID = form.closest('div.crm-grid-row').attr('entity_id');
   var dataUrl = CRM.url('civicrm/ajax/pledgeAmount');
-  if (pledgeID) { 
+  if (pledgeID) {
     cj.post(dataUrl, {pid: pledgeID}, function (data) {
     cj('#field_' + rowID + '_financial_type').val(data.financial_type_id).change();
     cj('#field_' + rowID + '_total_amount').val(data.amount).change();
@@ -518,7 +517,7 @@ function setPledgeAmount(form, pledgeID) {
   }
   else {
     cj('#field_' + rowID + '_total_amount').val('').change();
-    cj('#field_' + rowID + '_financial_type').val('').change(); 
+    cj('#field_' + rowID + '_financial_type').val('').change();
     cj('#field_' + rowID + '_total_amount').removeAttr('readonly');
   }
 }
diff --git a/templates/CRM/Campaign/Form/Task/Interview.tpl b/templates/CRM/Campaign/Form/Task/Interview.tpl
index 4d593c351a..e9dbadb8f2 100644
--- a/templates/CRM/Campaign/Form/Task/Interview.tpl
+++ b/templates/CRM/Campaign/Form/Task/Interview.tpl
@@ -329,7 +329,7 @@ var surveyActivityIds = {/literal}{$surveyActivityIds}{literal};
         if (interview.errors[error]) errorList =  errorList + '<li>' + interview.errors[error] + '</li>';
       }
       if ( errorList ) {
-        var allErrors = '<div class = "icon red-icon ui-icon-alert"></div>Please correct the following errors in the survey fields below:' + '<ul>' + errorList + '</ul>';
+        var allErrors = '<i class="fa fa-exclamation-triangle icon-red"></i> ' + ts('Please correct the following errors in the survey fields below:') + '<ul>' + errorList + '</ul>';
         CRM.$('#responseErrors').show( ).html(allErrors);
       }
     }
@@ -402,4 +402,3 @@ function registerInterviewforall( ) {
 {*include batch copy js js file*}
 {include file="CRM/common/batchCopy.tpl"}
 {/if}
-
diff --git a/templates/CRM/Core/Page/RecurringEntityPreview.tpl b/templates/CRM/Core/Page/RecurringEntityPreview.tpl
index 5ce3fdfef0..0528717db3 100644
--- a/templates/CRM/Core/Page/RecurringEntityPreview.tpl
+++ b/templates/CRM/Core/Page/RecurringEntityPreview.tpl
@@ -25,7 +25,7 @@
 *}
 {if !empty($participantData)}
   <div class="messages status no-popup">
-    <div class="icon ui-icon-alert"></div>
+    <i class="fa fa-exclamation-triangle"></i>
     {ts}There are participants registered for repeating events being removed from the set. Those with participants will be converted to standalone events, and those without registration will be deleted.{/ts}
   </div>
   <table class="display">
diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl
index 2160e2b5bf..0834e4cb15 100644
--- a/templates/CRM/Custom/Form/Field.tpl
+++ b/templates/CRM/Custom/Form/Field.tpl
@@ -184,7 +184,7 @@ function custom_option_html_type( ) {
               {$form.group_id.html}
             &nbsp;&nbsp;<span><a href="#" onclick="toggleContactRefFilter('Advance'); return false;">{ts}Advanced Filter{/ts}</a></span>
               {capture assign=searchPreferences}{crmURL p="civicrm/admin/setting/search" q="reset=1"}{/capture}
-            <div class="messages status no-popup"><div class="icon ui-icon-alert"></div> {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter'  (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use <a href='%1'>Search Preferences - Contact Reference Options</a> to control the fields included in the search results.{/ts}
+            <div class="messages status no-popup"><i class="fa fa-exclamation-triangle"></i> {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter'  (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use <a href='%1'>Search Preferences - Contact Reference Options</a> to control the fields included in the search results.{/ts}
           </td>
         </tr>
       <tr id='field_advance_filter'>
diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index acb09a1a1f..7aa85cd109 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -122,7 +122,7 @@
           }
 
         if ( showError ) {
-          cj('#validate_pricefield').show().html("<span class='icon red-icon ui-icon-alert'></span>{/literal}{ts escape='js'}This Option is already full for this event.{/ts}{literal}");
+          cj('#validate_pricefield').show().html("<i class="fa fa-exclamation-triangle icon-red"></i>{/literal} {ts escape='js'}This Option is already full for this event.{/ts}{literal}");
         }
         else {
           cj('#validate_pricefield').hide( ).html('');
@@ -461,4 +461,3 @@
 </script>
 
 {/if} {* end of main event block*}
-
diff --git a/templates/CRM/Form/body.tpl b/templates/CRM/Form/body.tpl
index 0206a583a7..f7534f2b33 100644
--- a/templates/CRM/Form/body.tpl
+++ b/templates/CRM/Form/body.tpl
@@ -33,7 +33,7 @@
 
 {if ($snippet !== 'json') and !$suppressForm and count($form.errors) gt 0}
    <div class="messages crm-error">
-       <div class="icon red-icon ui-icon-alert"></div>
+       <i class="fa fa-exclamation-triangle icon-red"></i>
      {ts}Please correct the following errors in the form fields below:{/ts}
      <ul id="errorList">
      {foreach from=$form.errors key=errorName item=error}
@@ -55,4 +55,3 @@
   {/foreach}
   </table>
 {/if}
-
diff --git a/templates/CRM/common/fatal.tpl b/templates/CRM/common/fatal.tpl
index 33a1eae5e3..587d6e4529 100644
--- a/templates/CRM/common/fatal.tpl
+++ b/templates/CRM/common/fatal.tpl
@@ -34,7 +34,7 @@
   <base href="{$config->resourceBase}" />
   <style type="text/css" media="screen">
     @import url({$config->resourceBase}css/civicrm.css);
-    @import url({$config->resourceBase}bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css);
+    @import url({$config->resourceBase}bower_components/font-awesome/css/font-awesome.min.css);
   </style>
 </head>
 <body>
@@ -43,10 +43,10 @@
 <div id="crm-container" class="crm-container" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
   <style type="text/css" media="screen">
     @import url({$config->resourceBase}css/civicrm.css);
-    @import url({$config->resourceBase}bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css);
+    @import url({$config->resourceBase}bower_components/font-awesome/css/font-awesome.min.css);
   </style>
 {/if}
-<div class="messages status no-popup">  <div class="icon red-icon ui-icon-alert"></div>
+<div class="messages status no-popup">  <i class="fa fa-exclamation-triangle icon-red"></i>
  <span class="status-fatal">{ts}Sorry but we are not able to provide this at the moment.{/ts}</span>
     <div class="crm-section crm-error-message">{$message}</div>
     {if $error.message && $message != $error.message}
-- 
2.25.1