From 1821930f00c67b141b06faef26dbcd31d06564e0 Mon Sep 17 00:00:00 2001 From: Vingle Date: Fri, 30 Oct 2020 00:40:55 +0100 Subject: [PATCH] modifies the social media footer and help dialogs to remove embed scripts, as described https://lab.civicrm.org/dev/user-interface/-/issues/2 --- .../Form/ContributionPage/Settings.hlp | 2 +- .../CRM/Event/Form/ManageEvent/EventInfo.hlp | 2 +- templates/CRM/common/SocialNetwork.tpl | 64 ++++++------------- 3 files changed, 20 insertions(+), 48 deletions(-) diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp index cf793eac40..f8f77332c9 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp @@ -64,6 +64,6 @@ {ts}Social Sharing{/ts} {/htxt} {htxt id="id-is_share"} -

{ts}When enabled, links allowing people to share this online contribution page with their social network will be displayed (e.g. Facebook "Like", Google+, and Twitter).{/ts}

+

{ts}When enabled, links helping people share this online contribution page with their social network will be displayed (e.g. Facebook, Twitter, LinkedIn and email).{/ts}

{ts}Social media links will be included on the Contribution Thank-you page, Tell-a-Friend page (if enabled), and in contribution receipt emails.{/ts}

{/htxt} diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp b/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp index 550eef61ff..f8b6d96f5c 100644 --- a/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp +++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp @@ -106,6 +106,6 @@ {ts}Social Sharing{/ts} {/htxt} {htxt id="id-is_share"} -

{ts}When enabled, links allowing people to share this event with their social network will be displayed (e.g. Facebook "Like", Google+, and Twitter).{/ts}

+

{ts}When enabled, links helping people share this event with their social network will be displayed (e.g. Facebook, Twitter, LinkedIn and email).{/ts}

{ts}Social media links will be included on the Event Info page, Thank-you page, Tell-a-Friend page (if enabled), and in event confirmation emails.{/ts}

{/htxt} diff --git a/templates/CRM/common/SocialNetwork.tpl b/templates/CRM/common/SocialNetwork.tpl index a5b786b173..4f04777ed2 100644 --- a/templates/CRM/common/SocialNetwork.tpl +++ b/templates/CRM/common/SocialNetwork.tpl @@ -7,56 +7,28 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{* Adds social networking buttons (Facebook like, Twitter tweet, Google +1, LinkedIn) to public pages (online contributions, event info) *} +{* Adds social networking buttons (Facebook, Twitter, LinkedIn, email) to public pages (online contributions, event info) *} -
-

{ts}Help spread the word{/ts}

-
- {ts}Please help us and let your friends, colleagues and followers know about our page{/ts}{if $title}: - {$title} - {else}.{/if} -
-
- {if $emailMode eq true} - {*use images for email*} - - Tweet Button - - - Facebook Button - - {else} - {*use advanced buttons for pages*} -
- -
-
- -
-
- - -
+ {if $pageURL} - {if $emailMode neq true} -
- {/if} -
-
-
- {ts}You can also share the below link in an email or on your website.{/ts} + {if $emailMode neq true}
- {$pageURL} -
+ {/if} +
+

{ts}You can also share the below link in an email or on your website:{/ts}
+ {$pageURL}

{else} -
{/if}
- - -- 2.25.1