CRM-15705 - Standardize token menu label and icon

diff --git a/css/civicrm.css b/css/civicrm.css
index 0873e1eb23c5ee0bf01afb6252307f0f3dacbf9d..541356aea71b9ffc147304898729a7df450a8d08 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3687,6 +3687,9 @@ div.m ul#civicrm-menu,
 .crm-container .crm-action-menu.action-icon-clipboard .select2-default span.select2-chosen:before {
   background-position: -160px -128px;
 }
+.crm-container .crm-action-menu.action-icon-token .select2-default span.select2-chosen:before {
+  background-position: -144px 0;
+}
 /* Restore this property otherwise our css overrides it */
 .select2-search input {
   box-sizing: border-box;

diff --git a/js/angular-crmMailing/directives.js b/js/angular-crmMailing/directives.js
index a66f854ce1ce956f5d7e0263aa77216971c22379..f88d1afc44aa1057cf8f59f3fe7b522809751b69 100644 (file)
--- a/js/angular-crmMailing/directives.js
+++ b/js/angular-crmMailing/directives.js
@@ -190,11 +190,11 @@
       },
       template: '<input type="text" class="crmMailingToken" />',
       link: function (scope, element, attrs, crmUiIdCtrl) {
-        $(element).select2({
-          width: "10em",
+        $(element).addClass('crm-action-menu action-icon-token').select2({
+          width: "12em",
           dropdownAutoWidth: true,
           data: CRM.crmMailing.mailTokens,
-          placeholder: ts('Insert')
+          placeholder: ts('Tokens')
         });
         $(element).on('select2-selecting', function (e) {
           var id = crmUiIdCtrl.get(attrs.crmFor);

diff --git a/templates/CRM/Mailing/Form/InsertTokens.tpl b/templates/CRM/Mailing/Form/InsertTokens.tpl
index 6fc6c3c33d93b1f73fbbb5b9b115dc94f498120a..d3155eff0b05a8ef31455189eb8b555f06247b1b 100644 (file)
--- a/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -385,11 +385,11 @@ CRM.$(function($) {
   // Initialize token selector widgets
   var form = $('form.{/literal}{$form.formClass}{literal}');
   $('input.crm-token-selector', form)
-    .addClass('crm-action-menu')
+    .addClass('crm-action-menu action-icon-token')
     .change(insertToken)
     .crmSelect2({
       data: form.data('tokens'),
-      placeholder: '{/literal}{ts escape='js'}Insert Token{/ts}{literal}'
+      placeholder: '{/literal}{ts escape='js'}Tokens{/ts}{literal}'
     });
 
   $('.accordion .head').addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ");