From f4388b576aa7b707543e6923f7c5d49a13dafcce Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Thu, 7 May 2020 12:51:42 -0400 Subject: [PATCH] Replace all instances of check.gif appearing in listings --- CRM/Campaign/Page/DashBoard.php | 12 +----- CRM/Core/BAO/CustomOption.php | 15 ++----- CRM/Core/Page.php | 31 ++++++++++++++ CRM/Core/Smarty/plugins/block.icon.php | 40 +++++++++++++++++++ CRM/Price/Page/Option.php | 7 +--- templates/CRM/Admin/Page/LabelFormats.tpl | 3 +- templates/CRM/Admin/Page/LocationType.tpl | 2 +- templates/CRM/Admin/Page/Options.tpl | 4 +- .../CRM/Admin/Page/ParticipantStatusType.tpl | 4 +- templates/CRM/Admin/Page/PaymentProcessor.tpl | 3 +- .../CRM/Admin/Page/PaymentProcessorType.tpl | 2 +- templates/CRM/Admin/Page/PdfFormats.tpl | 2 +- templates/CRM/Badge/Page/Layout.tpl | 5 +-- templates/CRM/Campaign/Page/Petition.tpl | 2 +- .../CRM/Financial/Page/FinancialAccount.tpl | 2 +- templates/CRM/Mailing/Page/Component.tpl | 2 +- templates/CRM/Price/Page/Option.tpl | 2 +- 17 files changed, 91 insertions(+), 47 deletions(-) create mode 100644 CRM/Core/Smarty/plugins/block.icon.php diff --git a/CRM/Campaign/Page/DashBoard.php b/CRM/Campaign/Page/DashBoard.php index 1318dd1c57..563f85654b 100644 --- a/CRM/Campaign/Page/DashBoard.php +++ b/CRM/Campaign/Page/DashBoard.php @@ -312,11 +312,7 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page { } $surveysData[$sid]['isActive'] = $isActive; - $isDefault = NULL; - if ($surveysData[$sid]['is_default']) { - $isDefault = '' . ts('Default') . ''; - } - $surveysData[$sid]['is_default'] = $isDefault; + $surveysData[$sid]['is_default'] = self::crmIcon('fa-check', ts('Default'), $surveysData[$sid]['is_default']); if ($surveysData[$sid]['result_id']) { $resultSet = '' . ts('Result Set') . ''; @@ -415,11 +411,7 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page { $isActive = ts('Yes'); } $petitionsData[$pid]['isActive'] = $isActive; - $isDefault = NULL; - if ($petitionsData[$pid]['is_default']) { - $isDefault = '' . ts('Default') . ''; - } - $petitionsData[$pid]['is_default'] = $isDefault; + $petitionsData[$pid]['is_default'] = self::crmIcon('fa-check', ts('Default'), $petitionsData[$pid]['is_default']); $petitionsData[$pid]['action'] = CRM_Core_Action::formLink(self::petitionActionLinks(), $action, diff --git a/CRM/Core/BAO/CustomOption.php b/CRM/Core/BAO/CustomOption.php index 31c522bc77..7ada066788 100644 --- a/CRM/Core/BAO/CustomOption.php +++ b/CRM/Core/BAO/CustomOption.php @@ -138,21 +138,12 @@ class CRM_Core_BAO_CustomOption { } if (in_array($field->html_type, ['CheckBox', 'Multi-Select'])) { - if (isset($defVal) && in_array($dao->value, $defVal)) { - $options[$dao->id]['is_default'] = ''; - } - else { - $options[$dao->id]['is_default'] = ''; - } + $isDefault = (isset($defVal) && in_array($dao->value, $defVal)); } else { - if ($field->default_value == $dao->value) { - $options[$dao->id]['is_default'] = ''; - } - else { - $options[$dao->id]['is_default'] = ''; - } + $isDefault = ($field->default_value == $dao->value); } + $options[$dao->id]['is_default'] = CRM_Core_Page::crmIcon('fa-check', ts('Default'), $isDefault); $options[$dao->id]['description'] = $dao->description; $options[$dao->id]['class'] = $dao->id . ',' . $class; $options[$dao->id]['is_active'] = empty($dao->is_active) ? ts('No') : ts('Yes'); diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php index 251c642d75..b483b1b1f7 100644 --- a/CRM/Core/Page.php +++ b/CRM/Core/Page.php @@ -418,4 +418,35 @@ class CRM_Core_Page { $this->assign('fields', $dateFields); } + /** + * Handy helper to produce the standard markup for an icon with alternative + * text for a title and screen readers. + * + * See also the smarty block function `icon` + * + * @param string $icon + * The class name of the icon to display. + * @param string $text + * The translated text to display. + * @param bool $condition + * Whether to display anything at all. This helps simplify code when a + * checkmark should appear if something is true. + * + * @return string + * The whole bit to drop in. + */ + public static function crmIcon($icon, $text = NULL, $condition = TRUE) { + if (!$condition) { + return ''; + } + if ($text === NULL || $text === '') { + $title = $sr = ''; + } + else { + $title = " title=\"$text\""; + $sr = "$text"; + } + return "$sr"; + } + } diff --git a/CRM/Core/Smarty/plugins/block.icon.php b/CRM/Core/Smarty/plugins/block.icon.php new file mode 100644 index 0000000000..0cdad70186 --- /dev/null +++ b/CRM/Core/Smarty/plugins/block.icon.php @@ -0,0 +1,40 @@ +resourceBase . 'i/check.gif" />'; - } - else { - $customOption[$id]['is_default'] = ''; - } + $customOption[$id]['is_default'] = CRM_Core_Page::crmIcon('fa-check', ts('Default'), !empty($customOption[$id]['is_default'])); $customOption[$id]['order'] = $customOption[$id]['weight']; $customOption[$id]['action'] = CRM_Core_Action::formLink(self::actionLinks(), $action, [ diff --git a/templates/CRM/Admin/Page/LabelFormats.tpl b/templates/CRM/Admin/Page/LabelFormats.tpl index 2baf4ae13d..d2dd488eea 100644 --- a/templates/CRM/Admin/Page/LabelFormats.tpl +++ b/templates/CRM/Admin/Page/LabelFormats.tpl @@ -53,8 +53,7 @@ {$row.groupName} {$row.weight} {$row.grouping} - {if $row.is_default eq 1} - {ts}Default{/ts}{/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {if $row.is_reserved eq 1}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}   {$row.action|replace:'xx':$row.id} diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl index 5d891e12b2..1eb9600caa 100644 --- a/templates/CRM/Admin/Page/LocationType.tpl +++ b/templates/CRM/Admin/Page/LocationType.tpl @@ -40,7 +40,7 @@ {$row.vcard_name} {$row.description} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} - {if $row.is_default eq 1}{ts}Default{/ts}{/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {$row.action|replace:'xx':$row.id} {/foreach} diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl index 6c8a0e709d..ce99ca6434 100644 --- a/templates/CRM/Admin/Page/Options.tpl +++ b/templates/CRM/Admin/Page/Options.tpl @@ -131,13 +131,13 @@ {$row.financial_account} {/if} {if $showCounted} - {if $row.filter eq 1}{ts}Counted{/ts}{/if} + {icon condition=$row.filter}{ts}Counted{/ts}{/icon} {/if} {if $showVisibility}{$row.visibility_label}{/if} {$row.description} {$row.weight} {if $showIsDefault} - {if $row.is_default eq 1}{ts}Default{/ts}{/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {/if} {if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl index 620e411f71..92e1eedec3 100644 --- a/templates/CRM/Admin/Page/ParticipantStatusType.tpl +++ b/templates/CRM/Admin/Page/ParticipantStatusType.tpl @@ -33,9 +33,9 @@ {$row.label} {$row.name} ({$row.id}) {$row.class} - {if $row.is_reserved}{ts}Reserved{/ts}{/if} + {icon condition=$row.is_reserved}{ts}Reserved{/ts}{/icon} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} - {if $row.is_counted} {ts}Counted{/ts}{/if} + {icon condition=$row.is_counted}{ts}Counted{/ts}{/icon} {$row.weight} {$row.visibility} {$row.action|replace:'xx':$row.id} diff --git a/templates/CRM/Admin/Page/PaymentProcessor.tpl b/templates/CRM/Admin/Page/PaymentProcessor.tpl index 308e508d9e..ba6d55da20 100644 --- a/templates/CRM/Admin/Page/PaymentProcessor.tpl +++ b/templates/CRM/Admin/Page/PaymentProcessor.tpl @@ -42,8 +42,7 @@ {$row.description} {$row.financialAccount} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} - - {if $row.is_default eq 1}{ts}Default{/ts}{/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {$row.action|replace:'xx':$row.id} diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl index f8fe04b81d..0526f251a7 100644 --- a/templates/CRM/Admin/Page/PaymentProcessorType.tpl +++ b/templates/CRM/Admin/Page/PaymentProcessorType.tpl @@ -36,7 +36,7 @@ {$row.title} {$row.description} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} - {if $row.is_default eq 1}{ts}Default{/ts}{/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {$row.action} {/foreach} diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl index 5b58ded34b..1b419c5752 100644 --- a/templates/CRM/Admin/Page/PdfFormats.tpl +++ b/templates/CRM/Admin/Page/PdfFormats.tpl @@ -50,7 +50,7 @@ {$row.name} {$row.description} - {if $row.is_default eq 1}{ts}Default{/ts}{/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {$row.weight} {$row.action|replace:'xx':$row.id} diff --git a/templates/CRM/Badge/Page/Layout.tpl b/templates/CRM/Badge/Page/Layout.tpl index a2ab0d69d2..a69b549b34 100644 --- a/templates/CRM/Badge/Page/Layout.tpl +++ b/templates/CRM/Badge/Page/Layout.tpl @@ -38,10 +38,7 @@ {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} - - {if $row.is_default eq 1} - {ts}Default{/ts} - {/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {$row.action|replace:'xx':$row.id} diff --git a/templates/CRM/Campaign/Page/Petition.tpl b/templates/CRM/Campaign/Page/Petition.tpl index 1dfd26a368..85f4423274 100644 --- a/templates/CRM/Campaign/Page/Petition.tpl +++ b/templates/CRM/Campaign/Page/Petition.tpl @@ -40,7 +40,7 @@ {$survey.release_frequency} {$survey.max_number_of_contacts} {$survey.default_number_of_contacts} - {if $survey.is_default}{ts}Default{/ts} {/if} + {icon condition=$survey.is_default}{ts}Default{/ts}{/icon} {if $survey.is_active}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} {$survey.action} diff --git a/templates/CRM/Financial/Page/FinancialAccount.tpl b/templates/CRM/Financial/Page/FinancialAccount.tpl index 264ab9ff45..95c8044ac6 100644 --- a/templates/CRM/Financial/Page/FinancialAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialAccount.tpl @@ -52,7 +52,7 @@ {$row.financial_account_type_id}{if $row.account_type_code} ({$row.account_type_code}){/if} {if $row.is_deductible eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} {if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} - {if $row.is_default eq 1}{ts}Default{/ts} {/if} + {icon condition=$row.is_default}{ts}Default{/ts}{/icon} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} {$row.action|replace:'xx':$row.id} diff --git a/templates/CRM/Mailing/Page/Component.tpl b/templates/CRM/Mailing/Page/Component.tpl index 25ee1557b7..ee7b47880d 100644 --- a/templates/CRM/Mailing/Page/Component.tpl +++ b/templates/CRM/Mailing/Page/Component.tpl @@ -35,7 +35,7 @@ {$row.subject} {$row.body_html|escape} {$row.body_text|escape} - {if $row.is_default eq 1}{ts}Default{/ts}{/if}  + {icon condition=$row.is_default}{ts}Default{/ts}{/icon}  {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} {$row.action|replace:'xx':$row.id} diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl index 0b3ddcbe33..22f82229a4 100644 --- a/templates/CRM/Price/Page/Option.tpl +++ b/templates/CRM/Price/Page/Option.tpl @@ -68,7 +68,7 @@ {$row.count} {$row.max_value} {/if} - {if $row.is_default}{ts}Default{/ts}{/if} + {icon condition=$row.is_default}{ts}Default{/ts}{/icon} {$row.financial_type_id} {$row.weight} {if $getTaxDetails} -- 2.25.1