From dd7e23f250720223d8bb742bdbbc0486a8bf710a Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Thu, 30 Jul 2020 14:36:13 -0400 Subject: [PATCH] Standardize single space (not nbsp) between icon and text --- CRM/Core/Controller.php | 4 ++-- CRM/Core/Smarty/plugins/block.crmButton.php | 2 +- templates/CRM/Admin/Page/APIExplorer.tpl | 2 +- .../Contact/Form/Search/Custom/FullText.tpl | 14 ++++++------- .../Event/Form/ParticipantFeeSelection.tpl | 2 +- templates/CRM/Event/Page/DashBoard.tpl | 2 +- templates/CRM/Report/Form/Actions.tpl | 2 +- templates/CRM/Tag/Page/Tag.tpl | 20 +++++++++---------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CRM/Core/Controller.php b/CRM/Core/Controller.php index 4a4254c255..68c6531858 100644 --- a/CRM/Core/Controller.php +++ b/CRM/Core/Controller.php @@ -568,8 +568,8 @@ class CRM_Core_Controller extends HTML_QuickForm_Controller { public function addWizardStyle(&$wizard) { $wizard['style'] = [ 'barClass' => '', - 'stepPrefixCurrent' => ' ', - 'stepPrefixPast' => ' ', + 'stepPrefixCurrent' => ' ', + 'stepPrefixPast' => ' ', 'stepPrefixFuture' => ' ', 'subStepPrefixCurrent' => '  ', 'subStepPrefixPast' => '  ', diff --git a/CRM/Core/Smarty/plugins/block.crmButton.php b/CRM/Core/Smarty/plugins/block.crmButton.php index 390a8e7303..64543d5957 100644 --- a/CRM/Core/Smarty/plugins/block.crmButton.php +++ b/CRM/Core/Smarty/plugins/block.crmButton.php @@ -47,7 +47,7 @@ function smarty_block_crmButton($params, $text, &$smarty) { if (strpos($icon, 'fa-') !== 0) { $icon = "fa-$icon"; } - $iconMarkup = "  "; + $iconMarkup = " "; } // All other params are treated as html attributes CRM_Utils_Array::remove($params, 'icon', 'p', 'q', 'a', 'f', 'h', 'fb', 'fe'); diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl index ced1f3668d..9c127fcb6f 100644 --- a/templates/CRM/Admin/Page/APIExplorer.tpl +++ b/templates/CRM/Admin/Page/APIExplorer.tpl @@ -286,7 +286,7 @@
- +
diff --git a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl index 6a7d8b516a..51a3c91956 100644 --- a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl +++ b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl @@ -62,7 +62,7 @@ {if !$table and $summary.addShowAllLink.Contact}
 {ts}View all results for contacts{/ts} + title="{ts}View all results for contacts{/ts}"> {ts}View all results for contacts{/ts}
{/if} {* note we using location="below" because we don't want to use rows per page for now. And therefore don't put location="bottom" for now. *} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -125,7 +125,7 @@ {if !$table and $summary.addShowAllLink.Activity}
 {ts}View all results for activities{/ts} + title="{ts}View all results for activities{/ts}"> {ts}View all results for activities{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -182,7 +182,7 @@ {if !$table and $summary.addShowAllLink.Case}
 {ts}View all results for cases{/ts} + title="{ts}View all results for cases{/ts}"> {ts}View all results for cases{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -236,7 +236,7 @@ {if !$table and $summary.addShowAllLink.Contribution}
 {ts}View all results for contributions{/ts} + title="{ts}View all results for contributions{/ts}"> {ts}View all results for contributions{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -293,7 +293,7 @@ {if !$table and $summary.addShowAllLink.Participant}
 {ts}View all results for participants{/ts} + title="{ts}View all results for participants{/ts}"> {ts}View all results for participants{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *} @@ -349,7 +349,7 @@ {if !$table and $summary.addShowAllLink.Membership}
 {ts}View all results for memberships{/ts} + title="{ts}View all results for memberships{/ts}"> {ts}View all results for memberships{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -395,7 +395,7 @@ {if !$table and $summary.addShowAllLink.File}
 {ts}View all results for files{/ts} + title="{ts}View all results for files{/ts}"> {ts}View all results for files{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *} diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl index 16bb9a1938..f91c883be3 100644 --- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl +++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl @@ -87,7 +87,7 @@ CRM.$(function($) {
{include file="CRM/common/formButtons.tpl" location="bottom"}
{if !$email}
-  {ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts} + {ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
{/if} diff --git a/templates/CRM/Event/Page/DashBoard.tpl b/templates/CRM/Event/Page/DashBoard.tpl index 3ca364f093..d01250ee68 100644 --- a/templates/CRM/Event/Page/DashBoard.tpl +++ b/templates/CRM/Event/Page/DashBoard.tpl @@ -87,7 +87,7 @@ {if $actionColumn} {include file="CRM/common/tasks.tpl" location="botton"} {if $instanceUrl} - + {/if}
{if $values.isMap} -  {ts}Map{/ts} + {ts}Map{/ts}  |  {/if} {if $values.configure} diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl index 9aee8f6695..34690c1d91 100644 --- a/templates/CRM/Report/Form/Actions.tpl +++ b/templates/CRM/Report/Form/Actions.tpl @@ -20,7 +20,7 @@
   {ts}Existing report(s) from this template{/ts}   {ts}Existing report(s) from this template{/ts}
diff --git a/templates/CRM/Tag/Page/Tag.tpl b/templates/CRM/Tag/Page/Tag.tpl index e59f24246a..e0ded1e4bc 100644 --- a/templates/CRM/Tag/Page/Tag.tpl +++ b/templates/CRM/Tag/Page/Tag.tpl @@ -463,16 +463,16 @@ <% {rdelim} %>
" class="button crm-popup"> -   {ts}Add Tag{/ts} + {ts}Add Tag{/ts} <% if(tagset && adminTagsets) {ldelim} %> " class="button crm-popup tagset-action-update"> -   {ts}Edit Set{/ts} + {ts}Edit Set{/ts} <% {rdelim} %> <% if(tagset && !length && adminTagsets && (!is_reserved || adminReserved)) {ldelim} %> " class="button crm-popup small-popup tagset-action-delete"> -   {ts}Delete Set{/ts} + {ts}Delete Set{/ts} <% {rdelim} %>
@@ -519,21 +519,21 @@
<% if(!tagset) {ldelim} %> " class="button crm-popup" title="{ts}Create new tag under this one{/ts}"> -   {ts}Add Child{/ts} + {ts}Add Child{/ts} <% {rdelim} %> " class="button crm-popup" title="{ts}Duplicate this tag{/ts}"> -   {ts}Clone Tag{/ts} + {ts}Clone Tag{/ts} <% if(!data.is_reserved || adminReserved) {ldelim} %> <% if(tagsetCount) {ldelim} %> -   {ts}Move Tag{/ts} + {ts}Move Tag{/ts} <% {rdelim} %> <% if(!hasChildren) {ldelim} %> " class="button crm-popup small-popup"> -   {ts}Delete{/ts} + {ts}Delete{/ts} <% {rdelim} %> <% {rdelim} %> @@ -551,16 +551,16 @@
<% if(!reserved || adminReserved) {ldelim} %> " class="button crm-popup small-popup" title="{ts}Combine tags into one{/ts}"> -   {ts}Merge Tags{/ts} + {ts}Merge Tags{/ts} <% if(tagsetCount) {ldelim} %> -   {ts}Move Tags{/ts} + {ts}Move Tags{/ts} <% {rdelim} %> <% if(!hasChildren) {ldelim} %> " class="button crm-popup small-popup"> -   {ts}Delete All{/ts} + {ts}Delete All{/ts} <% {rdelim} %> <% {rdelim} %> -- 2.25.1