From 060b6f10e67105b605cafccb0d828e85dde0e9f1 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Thu, 7 May 2020 15:27:32 -0400 Subject: [PATCH] Replace stop-icon.png with fa-ban over a relevant icon for privacy --- CRM/Contact/Selector.php | 1 + .../Smarty/plugins/function.privacyFlag.php | 53 ++++++++++++++++++ css/civicrm.css | 3 +- i/stop-icon.png | Bin 595 -> 0 bytes templates/CRM/Contact/Form/Selector.tpl | 11 ++-- templates/CRM/Contact/Page/Inline/Address.tpl | 2 +- templates/CRM/Contact/Page/Inline/Email.tpl | 4 +- templates/CRM/Contact/Page/Inline/Phone.tpl | 6 +- 8 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 CRM/Core/Smarty/plugins/function.privacyFlag.php delete mode 100644 i/stop-icon.png diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php index 0e1c82f78c..2296ddd2e4 100644 --- a/CRM/Contact/Selector.php +++ b/CRM/Contact/Selector.php @@ -61,6 +61,7 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se 'status', 'do_not_email', 'do_not_phone', + 'do_not_sms', 'do_not_mail', ]; diff --git a/CRM/Core/Smarty/plugins/function.privacyFlag.php b/CRM/Core/Smarty/plugins/function.privacyFlag.php new file mode 100644 index 0000000000..e4e3593291 --- /dev/null +++ b/CRM/Core/Smarty/plugins/function.privacyFlag.php @@ -0,0 +1,53 @@ + 'fa-phone', + 'do_not_email' => 'fa-paper-plane', + 'do_not_mail' => 'fa-envelope', + 'do_not_sms' => 'fa-mobile', + 'do_not_trade' => 'fa-exchange', + 'is_opt_out' => 'fa-paper-plane-o', + ]; + $titles = CRM_Core_SelectValues::privacy(); + $field = $params['field'] ?? 'do_not_mail'; + if ($field == 'on_hold') { + $text = ts('Email on hold - generally due to bouncing.'); + return <<$text +HEREDOC; + } + $class = str_replace('_', '-', $field); + $text = ts('Privacy flag: %1', [1 => $titles[$field]]); + return <<$text +HEREDOC; +} diff --git a/css/civicrm.css b/css/civicrm.css index c85cc87173..be8af43c42 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -2470,9 +2470,8 @@ div.crm-master-accordion-header a.helpicon { /* privacy icons */ #crm-container div span.privacy-flag { - background-repeat: no-repeat; - background-image: url("../i/stop-icon.png"); float: right; + font-size: 80%; } /* specific, targeted fixes */ diff --git a/i/stop-icon.png b/i/stop-icon.png deleted file mode 100644 index e00eea441f7bf8d0e9b1b51a617e36d47405c6f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 595 zcmV-Z0<8UsP)c?|5zN(?{m-ecg@(qj1c=MTfXdGi>AlM)%eU%$cddCL|C$&Plg z=9lG_AW9PyE)48SN(_S0Q4H@EEMoYuc{2ltp#j6Yx$_ugrcYydJ9j>VP+TknvydOE6Ap`T@ zzX+TE|NhM&5a0(?^n>Bk?ww$XpZD)EJk2j)5GyKV_5|6=`vaF@Cb-Az%k7Trx6gMk;y** ztPvj1&=e-a84>>Y`-&BCn-NI^rqQ3_@5W82DGVuX%W%a+KmN0KFNXGiR@QJEG14}& h0iXmxOs)b5FaTjm*1nmHHmCpq002ovPDHLkV1lX93f2Gs diff --git a/templates/CRM/Contact/Form/Selector.tpl b/templates/CRM/Contact/Form/Selector.tpl index 338c6e0883..36cf635081 100644 --- a/templates/CRM/Contact/Form/Selector.tpl +++ b/templates/CRM/Contact/Form/Selector.tpl @@ -81,7 +81,7 @@ {if $row.is_deleted}{/if}{$row.sort_name}{if $row.is_deleted}{/if} {if $action eq 512 or $action eq 256} {if !empty($columnHeaders.street_address)} - {$row.street_address|mb_truncate:22:"...":true}{if $row.do_not_mail} {/if} + {$row.street_address|mb_truncate:22:"...":true}{if $row.do_not_mail} {privacyFlag field=do_not_mail}{/if} {/if} {if !empty($columnHeaders.city)} {$row.city} @@ -100,9 +100,9 @@ {$row.email|mb_truncate:17:"...":true} {if $row.on_hold} - (On Hold) + {privacyFlag field=on_hold} {elseif $row.do_not_email} - + {privacyFlag field=do_not_email} {/if} {/if} @@ -111,7 +111,10 @@ {if $row.phone} {$row.phone} {if $row.do_not_phone} - + {privacyFlag field=do_not_phone} + {/if} + {if $row.do_not_sms} + {privacyFlag field=do_not_sms} {/if} {/if} diff --git a/templates/CRM/Contact/Page/Inline/Address.tpl b/templates/CRM/Contact/Page/Inline/Address.tpl index d507e76d3f..e2c70343d9 100644 --- a/templates/CRM/Contact/Page/Inline/Address.tpl +++ b/templates/CRM/Contact/Page/Inline/Address.tpl @@ -24,7 +24,7 @@
{ts 1=$add.location_type}%1 Address{/ts} - {if $privacy.do_not_mail}{/if} + {if $privacy.do_not_mail}{privacyFlag field=do_not_mail}{/if} {if $config->mapProvider AND !empty($add.geo_code_1) AND is_numeric($add.geo_code_1) AND diff --git a/templates/CRM/Contact/Page/Inline/Email.tpl b/templates/CRM/Contact/Page/Inline/Email.tpl index 48aa7263cf..afc29d4beb 100644 --- a/templates/CRM/Contact/Page/Inline/Email.tpl +++ b/templates/CRM/Contact/Page/Inline/Email.tpl @@ -19,7 +19,7 @@
{ts}Email{/ts} - {if $privacy.do_not_email}{/if} + {if $privacy.do_not_email}{privacyFlag field=do_not_email}{/if}
@@ -29,7 +29,7 @@
{$item.location_type} {ts}Email{/ts} - {if $privacy.do_not_email}{elseif $item.on_hold}{/if} + {if $privacy.do_not_email}{privacyFlag field=do_not_email}{elseif $item.on_hold}{privacyFlag field=on_hold}{/if}
{if !$item.on_hold and !$privacy.do_not_email} diff --git a/templates/CRM/Contact/Page/Inline/Phone.tpl b/templates/CRM/Contact/Page/Inline/Phone.tpl index 2b788cb177..3ab90ab126 100644 --- a/templates/CRM/Contact/Page/Inline/Phone.tpl +++ b/templates/CRM/Contact/Page/Inline/Phone.tpl @@ -19,7 +19,8 @@
{ts}Phone{/ts} - {if $privacy.do_not_phone}{/if} + {if $privacy.do_not_sms}{privacyFlag field=do_not_sms}{/if} + {if $privacy.do_not_phone}{privacyFlag field=do_not_phone}{/if}
@@ -28,7 +29,8 @@ {if $item.phone || $item.phone_ext}
- {if $privacy.do_not_phone}{/if} + {if $privacy.do_not_sms}{privacyFlag field=do_not_sms}{/if} + {if $privacy.do_not_phone}{privacyFlag field=do_not_phone}{/if} {$item.location_type} {$item.phone_type}
-- 2.25.1