Merge pull request #13003 from agh1/obsoleteIcons

Replace translation and calendar image icons
civicrm · Oct 25, 2018 · 1ecd742 · 1ecd742
2 parents b7801a4 + 32c5750
commit 1ecd742
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/css/civicrm.css b/css/civicrm.css
@@ -2683,12 +2683,15 @@ div.crm-container form {
 /* Date plugin */
 .crm-container input.dateplugin,
 .crm-container input.crm-form-date {
-  background: white url(../i/cal.gif) no-repeat scroll right center;
-  padding-right: 16px;
-  /* so that text doesn't flow on top of icon */
   width: 9em;
 }
 
+.crm-container input.dateplugin::placeholder,
+.crm-container input.crm-form-date::placeholder {
+  font-family: "FontAwesome";
+  text-align: right;
+}
+
 .crm-container div.batch-update {
   overflow: visible;
 }

diff --git a/i/cal.gif b/i/cal.gif
diff --git a/i/langs.png b/i/langs.png
diff --git a/js/crm.datepicker.js b/js/crm.datepicker.js
@@ -58,7 +58,9 @@
           if (!settings.yearRange && settings.minDate !== null && settings.maxDate !== null) {
             settings.yearRange = '' + CRM.utils.formatDate(settings.minDate, 'yy') + ':' + CRM.utils.formatDate(settings.maxDate, 'yy');
           }
-          $dateField.addClass('crm-form-date').datepicker(settings);
+          // Set placeholder as calendar icon (`fa-calendar` is Unicode f073)
+          // and add datepicker
+          $dateField.addClass('crm-form-date').attr({placeholder: '\uF073'}).datepicker(settings);
         } else {
           $dateField.attr('min', settings.minDate ? CRM.utils.formatDate(settings.minDate, 'yy') : '1000');
           $dateField.attr('max', settings.maxDate ? CRM.utils.formatDate(settings.maxDate, 'yy') : '4000');

diff --git a/templates/CRM/Core/I18n/Dialog.tpl b/templates/CRM/Core/I18n/Dialog.tpl
@@ -25,6 +25,6 @@
 *}
 {if $config->languageLimit|@count >= 2 and $translatePermission }
   <a href="{crmURL p='civicrm/i18n' q="reset=1&table=$table&field=$field&id=$id"}" data-field="{$field}" class="crm-hover-button crm-multilingual-edit-button" title="{ts}Languages{/ts}">
-    <img src="{$config->resourceBase}i/langs.png" style="position:relative; top: 2px;"/>
+    <i class="crm-i fa-language fa-lg"></i>
   </a>
 {/if}