Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Updated shortcodes for unsubscribe/manage/browser links

Browse Source 
- fixed all issues in #387 except the custom mailpoet pages
This commit is contained in:
Jonathan Labreuille
2016-03-16 12:33:45 +01:00
parent e28451d410
commit f11de2f1ad
26 changed files with 180 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletter_editor/blocks/footer.js
View File

@@ -16,7 +16,7 @@ define([
defaults: function() {
return this._getDefaults({
type: 'footer',
text: '<a href="[unsubscribeUrl]">Unsubscribe</a> | <a href="[manageSubscriptionUrl]">Manage subscription</a><br /><b>Add your postal address here!</b>',
text: '<a href="[subscription:unsubscribe_url]">Unsubscribe</a> | <a href="[subscription:manage_url]">Manage subscription</a><br /><b>Add your postal address here!</b>',
styles: {
block: {
backgroundColor: 'transparent',

2
assets/js/src/newsletter_editor/blocks/header.js
View File

@@ -16,7 +16,7 @@ define([
defaults: function() {
return this._getDefaults({
type: 'header',
text: 'Display problems? <a href="[viewInBrowserUrl]">View it in your browser</a>',
text: 'Display problems? <a href="[newsletter:view_in_browser_url]">View it in your browser</a>',
styles: {
block: {
backgroundColor: 'transparent',

2
assets/js/src/newsletter_editor/components/save.js
View File

@@ -284,7 +284,7 @@ define([
}
if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') &&
JSON.stringify(jsonObject).indexOf("[unsubscribeUrl]") < 0) {
JSON.stringify(jsonObject).indexOf("[subscription:unsubscribe_url]") < 0) {
this.showValidationError(App.getConfig().get('translations.unsubscribeLinkMissing'));
return;
}