diff --git a/assets/js/src/common/sender_email_address_warning.jsx b/assets/js/src/common/sender_email_address_warning.jsx index 27b8c563c0..5a7084c5e8 100644 --- a/assets/js/src/common/sender_email_address_warning.jsx +++ b/assets/js/src/common/sender_email_address_warning.jsx @@ -32,6 +32,7 @@ const SenderEmailAddressWarning = ({ emailAddress, mssActive }) => {

diff --git a/assets/js/src/help/system_status.jsx b/assets/js/src/help/system_status.jsx index e18543df89..58c3c7d0fd 100644 --- a/assets/js/src/help/system_status.jsx +++ b/assets/js/src/help/system_status.jsx @@ -5,7 +5,7 @@ import CronStatus from './cron_status.jsx'; import QueueStatus from './queue_status.jsx'; import Tabs from './tabs.jsx'; -function renderStatusMessage(status, error, link, additionalInfo) { +function renderStatusMessage(status, error, link, linkBeacon, additionalInfo) { const noticeType = (status) ? 'success' : 'error'; let noticeMessage = (status) ? MailPoet.I18n.t('systemStatusConnectionSuccessful') @@ -16,7 +16,7 @@ function renderStatusMessage(status, error, link, additionalInfo) { noticeMessage, /\[link\](.*?)\[\/link\]/g, (match) => ( - {match} + {match} ) ); } @@ -41,7 +41,7 @@ function renderCronSection(data) {

{url}

- {renderStatusMessage(status, error, 'https://kb.mailpoet.com/article/231-sending-does-not-work', additionalInfo)} + {renderStatusMessage(status, error, 'https://kb.mailpoet.com/article/231-sending-does-not-work', '5a0257ac2c7d3a272c0d7ad6', additionalInfo)} ); } diff --git a/assets/js/src/newsletters/listings/statistics.jsx b/assets/js/src/newsletters/listings/statistics.jsx index 3822a7d06e..4052cfd74e 100644 --- a/assets/js/src/newsletters/listings/statistics.jsx +++ b/assets/js/src/newsletters/listings/statistics.jsx @@ -208,6 +208,7 @@ const Statistics = ({ newsletter, isSent, currentTime }) => {
{ (match) => ( { match } diff --git a/assets/js/src/newsletters/types.jsx b/assets/js/src/newsletters/types.jsx index b5760ed4c0..78ead729e0 100644 --- a/assets/js/src/newsletters/types.jsx +++ b/assets/js/src/newsletters/types.jsx @@ -116,6 +116,7 @@ class NewsletterTypes extends React.Component { title: MailPoet.I18n.t('welcomeNewsletterTypeTitle'), description: MailPoet.I18n.t('welcomeNewsletterTypeDescription'), videoGuide: 'https://kb.mailpoet.com/article/254-video-guide-to-welcome-emails', + videoGuideBeacon: '5b05ebf20428635ba8b2aa53', action: (function action() { return (

{type.description}

{ type.videoGuide && ( - + {MailPoet.I18n.t('seeVideoGuide')} diff --git a/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx b/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx index 90b9159237..3f1f37b2a5 100644 --- a/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx +++ b/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx @@ -49,6 +49,7 @@ const Warnings = ({ return ( ( { (match) => ( diff --git a/assets/js/src/wizard/steps/usage_tracking_step.jsx b/assets/js/src/wizard/steps/usage_tracking_step.jsx index 01ab0e41a4..dff2fd7bfe 100644 --- a/assets/js/src/wizard/steps/usage_tracking_step.jsx +++ b/assets/js/src/wizard/steps/usage_tracking_step.jsx @@ -16,6 +16,7 @@ const WelcomeWizardUsageTrackingStep = (props) => ( diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php index 089f6d3587..ccd265f2f0 100644 --- a/lib/Config/Initializer.php +++ b/lib/Config/Initializer.php @@ -115,7 +115,10 @@ class Initializer { return WPNotice::displayError(Helpers::replaceLinkTags( WPFunctions::get()->__('Unable to connect to the database (the database is unable to open a file or folder), the connection is likely not configured correctly. Please read our [link] Knowledge Base article [/link] for steps how to resolve it.', 'mailpoet'), 'https://kb.mailpoet.com/article/200-solving-database-connection-issues', - ['target' => '_blank'] + [ + 'target' => '_blank', + 'data-beacon-article' => '596de7db2c7d3a73488b2f8d', + ] )); } diff --git a/lib/Util/Notices/AfterMigrationNotice.php b/lib/Util/Notices/AfterMigrationNotice.php index d8874f5ab4..d8f07b75f0 100644 --- a/lib/Util/Notices/AfterMigrationNotice.php +++ b/lib/Util/Notices/AfterMigrationNotice.php @@ -35,7 +35,10 @@ class AfterMigrationNotice { $message = Helpers::replaceLinkTags( WPFunctions::get()->__('Congrats! You’re progressing well so far. Complete your upgrade thanks to this [link]checklist[/link].', 'mailpoet'), 'https://kb.mailpoet.com/article/199-checklist-after-migrating-to-mailpoet3', - ['target' => '_blank'] + [ + 'target' => '_blank', + 'data-beacon-article' => '596352492c7d3a707d7b8994', + ] ); $extra_classes = 'mailpoet-dismissible-notice is-dismissible'; diff --git a/lib/Util/Notices/InactiveSubscribersNotice.php b/lib/Util/Notices/InactiveSubscribersNotice.php index 2b1cc59520..ecd0b3f3b7 100644 --- a/lib/Util/Notices/InactiveSubscribersNotice.php +++ b/lib/Util/Notices/InactiveSubscribersNotice.php @@ -50,7 +50,10 @@ class InactiveSubscribersNotice { $go_to_settings_string = __('Go to the Advanced Settings', 'mailpoet'); $notice = str_replace('[number]', $this->wp->numberFormatI18n($inactive_subscribers_count), $error_string); - $notice = Helpers::replaceLinkTags($notice, 'https://kb.mailpoet.com/article/264-inactive-subscribers', ['target' => '_blank']); + $notice = Helpers::replaceLinkTags($notice, 'https://kb.mailpoet.com/article/264-inactive-subscribers', [ + 'target' => '_blank', + 'data-beacon-article' => '5cbf19622c7d3a026fd3efe1', + ]); $notice = "

$notice

"; $notice .= '

' . $go_to_settings_string . '

'; diff --git a/lib/Util/Notices/PHPVersionWarnings.php b/lib/Util/Notices/PHPVersionWarnings.php index cc6ecea44b..6e7d141cf2 100644 --- a/lib/Util/Notices/PHPVersionWarnings.php +++ b/lib/Util/Notices/PHPVersionWarnings.php @@ -29,6 +29,7 @@ class PHPVersionWarnings { $error .= '

' . Helpers::replaceLinkTags($get_in_touch_string, 'https://www.mailpoet.com/let-us-handle-your-php-upgrade/', [ 'target' => '_blank', 'class' => 'button', + 'data-beacon-article' => '5ad5f8982c7d3a0e93676666', ]); $extra_classes = 'mailpoet-dismissible-notice is-dismissible'; diff --git a/views/form/editor.html b/views/form/editor.html index e11847baaa..546e8d90ee 100644 --- a/views/form/editor.html +++ b/views/form/editor.html @@ -135,13 +135,13 @@

<%= __('Add this form to your sidebar or footer on the [link]Widgets page[/link].') - |replaceLinkTags('widgets.php', {'target' : '_blank'}) + |replaceLinkTags('widgets.php', {'target': '_blank'}) |raw %>

<%= __('Copy and paste this [link]shortcode[/link] on to a post or page.') - |replaceLinkTags('javascript:;', {'class' : 'mailpoet_form_export_toggle', 'data-type' : 'shortcode'}) + |replaceLinkTags('javascript:;', {'class': 'mailpoet_form_export_toggle', 'data-type': 'shortcode'}) |raw %>

@@ -197,7 +197,7 @@

<%= __('Tip: read our [link]GDPR guide[/link] to make sure your form follows the privacy directive of the European Union.') - |replaceLinkTags('https://kb.mailpoet.com/article/246-guide-to-conform-to-gdpr?utm_source=plugin&utm_medium=formeditor&utm_campaign=helpdocs', {'target' : '_blank', id: 'mailpoet_helper_link'}) + |replaceLinkTags('https://kb.mailpoet.com/article/246-guide-to-conform-to-gdpr?utm_source=plugin&utm_medium=formeditor&utm_campaign=helpdocs', {'target': '_blank', id: 'mailpoet_helper_link', 'data-beacon-article': '5a9e8cdd04286374f7089a8c'}) |raw %>

diff --git a/views/forms.html b/views/forms.html index 5972d1fcb8..2f06b66c61 100644 --- a/views/forms.html +++ b/views/forms.html @@ -6,14 +6,14 @@

<%= __('Tip: we have a [link]list of plugins[/link] that work with MailPoet if you need fancier forms.') - |replaceLinkTags('https://kb.mailpoet.com/article/198-list-of-forms-plugins-that-work-with-mailpoet?utm_source=plugin&utm_medium=settings&utm_campaign=helpdocs', {'target' : '_blank', id: 'mailpoet_helper_link'}) + |replaceLinkTags('https://kb.mailpoet.com/article/198-list-of-forms-plugins-that-work-with-mailpoet?utm_source=plugin&utm_medium=settings&utm_campaign=helpdocs', {'target': '_blank', id: 'mailpoet_helper_link', 'data-beacon-article': '5953a9720428637ff8d42272'}) |raw %>

<% set badgeClassName = (is_new_user == true) ? 'mailpoet_badge mailpoet_badge_video' : 'mailpoet_badge mailpoet_badge_video mailpoet_badge_video_grey' %> - + <%= __('See video guide') %> diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index 8e0d6a32b4..4bafed1aa9 100644 --- a/views/newsletter/editor.html +++ b/views/newsletter/editor.html @@ -369,7 +369,7 @@ <% block translations %> <% set helpTooltipSendPreview = __("Didn't receive the test email? Read our [link]quick guide[/link] to sending issues.

A MailPoet logo will appear in the footer of all emails sent with the free version of MailPoet.") - |replaceLinkTags('https://kb.mailpoet.com/article/146-my-newsletters-are-not-being-received', {'target' : '_blank'}) + |replaceLinkTags('https://kb.mailpoet.com/article/146-my-newsletters-are-not-being-received', {'target' : '_blank', 'data-beacon-article': '580846f09033604df5166ed1'}) |escape('js') %> <%= localize({ 'failedToFetchAvailablePosts': __('Failed to fetch available posts'), diff --git a/views/newsletter/templates/blocks/container/settings.hbs b/views/newsletter/templates/blocks/container/settings.hbs index 8dd0ae4ffb..61a5fd1af2 100644 --- a/views/newsletter/templates/blocks/container/settings.hbs +++ b/views/newsletter/templates/blocks/container/settings.hbs @@ -40,7 +40,7 @@
-

<%= _x('A [link]few email clients[/link] do not show background images. Make sure you have a good background color to fall back on if the image is not displayed.', 'Editor > right sidebar for column block settings.')|replaceLinkTags('https://kb.mailpoet.com/article/261-add-a-background-image-to-your-newsletter', {'target' : '_blank'})|raw %>

+

<%= _x('A [link]few email clients[/link] do not show background images. Make sure you have a good background color to fall back on if the image is not displayed.', 'Editor > right sidebar for column block settings.')|replaceLinkTags('https://kb.mailpoet.com/article/261-add-a-background-image-to-your-newsletter', {'target': '_blank', 'data-beacon-article': '5bf5863104286304a71c7e1a'})|raw %>

diff --git a/views/premium.html b/views/premium.html index 8888af6508..91487d9191 100644 --- a/views/premium.html +++ b/views/premium.html @@ -94,6 +94,7 @@
<%= __("View full comparison table") %> @@ -104,7 +105,7 @@

<%= __("Spammers are ineligible to use the MailPoet Sending Service. We reserve the right to cancel any sending plan if we detect more than 5% hard bounces. [link]Customers are required to clean their lists before joining MailPoet[/link].") - |replaceLinkTags('https://kb.mailpoet.com/article/127-checklist-before-importing-subscribers?utm_source=plugin&utm_medium=premium&utm_campaign=clean-lists', {'target' : '_blank'}) + |replaceLinkTags('https://kb.mailpoet.com/article/127-checklist-before-importing-subscribers?utm_source=plugin&utm_medium=premium&utm_campaign=clean-lists', {'target': '_blank', 'data-beacon-article': '57ce07ffc6979108399a044b'}) |raw %>

@@ -139,11 +140,11 @@

<%= __("Already a Premium customer? [link]Add your Key in the Settings page[/link].") - |replaceLinkTags(admin_url('admin.php?page=mailpoet-settings#premium'), {'target' : '_blank'}) + |replaceLinkTags(admin_url('admin.php?page=mailpoet-settings#premium'), {'target': '_blank'}) |raw %>

<%= __("Don’t need to use our sending service? Not a problem; we understand. You can also [link]buy the Premium[/link] features separately. Prices start at $149 per year for 1 website, $249 for 4 sites and $499 for an unlimited number of sites.") - |replaceLinkTags(add_referral_id('https://account.mailpoet.com/premium?utm_source=plugin&utm_medium=premium&utm_campaign=buy-premium'), {'target' : '_blank'}) + |replaceLinkTags(add_referral_id('https://account.mailpoet.com/premium?utm_source=plugin&utm_medium=premium&utm_campaign=buy-premium'), {'target': '_blank'}) |raw %>

diff --git a/views/settings/advanced.html b/views/settings/advanced.html index 5809eafd73..74bff8dc19 100644 --- a/views/settings/advanced.html +++ b/views/settings/advanced.html @@ -9,7 +9,8 @@

<%= __('Your bounced emails will be sent to this address.') %> <%= _x('Read more.', 'support article link label') %>

@@ -168,7 +169,8 @@

<%= __("Gmail, Yahoo and other email providers will treat your emails like spam if your subscribers don't open your emails in the long run. This option will mark your subscribers as Inactive and MailPoet will stop sending to them.") %> <%= _x('Read more.', 'support article link label') %>

@@ -236,6 +238,7 @@ <%= __('Share anonymous data and help us improve the plugin. We appreciate your help!') %> <%= _x('Read more.', 'support article link label') %>

diff --git a/views/settings/basics.html b/views/settings/basics.html index 759b7f1f20..7a231ae363 100644 --- a/views/settings/basics.html +++ b/views/settings/basics.html @@ -448,6 +448,7 @@

<%= __('Read our guide') %> diff --git a/views/settings/mta.html b/views/settings/mta.html index f442b879b9..86d04c27d5 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -82,10 +82,10 @@

- <% set badgeClassName = (is_new_user == true) ? 'mailpoet_badge mailpoet_badge_video' : 'mailpoet_badge mailpoet_badge_video mailpoet_badge_video_grey' %> + <% set badgeClassName = (is_new_user == true) ? 'mailpoet_badge mailpoet_badge_video': 'mailpoet_badge mailpoet_badge_video mailpoet_badge_video_grey' %> <%= __('[link]%s See video guide[/link]') |format('') - |replaceLinkTags('https://kb.mailpoet.com/article/235-video-guide-sending-options', {'class' : badgeClassName, 'target' : '_blank'}, 'link') + |replaceLinkTags('https://kb.mailpoet.com/article/235-video-guide-sending-options', {'class': badgeClassName, 'target': '_blank', 'data-beacon-article': '5a3d4c260428631938003802'}, 'link') |raw %>

@@ -124,7 +124,7 @@
  • <%= __("Manual configuration of SPF and DKIM required.") %>
  • <%= __("Bounce handling is available, but only with an extra [link]add-on[/link].") - |replaceLinkTags('https://wordpress.org/plugins/bounce-handler-mailpoet/', {'target' : '_blank'}) + |replaceLinkTags('https://wordpress.org/plugins/bounce-handler-mailpoet/', {'target': '_blank'}) |raw %>
    • @@ -663,7 +663,7 @@