From 9f3549e77c5cd5b42c63327b96c42c382543946d Mon Sep 17 00:00:00 2001 From: Jessica Wade Date: Thu, 1 Feb 2024 13:14:39 -0600 Subject: [PATCH 1/5] Replace am-footer-block with footer-new-block --- .../components/blocks/{am-footer.marko => footer-new.marko} | 2 +- packages/common/components/blocks/marko.json | 4 ++-- tenants/all/templates/am-breaking-news.marko | 2 +- tenants/all/templates/am-case-of-the-week.marko | 2 +- tenants/all/templates/am-community-insider.marko | 2 +- tenants/all/templates/am-lfte.marko | 2 +- tenants/all/templates/am-senl.marko | 2 +- tenants/all/templates/ame-lfte.marko | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename packages/common/components/blocks/{am-footer.marko => footer-new.marko} (99%) diff --git a/packages/common/components/blocks/am-footer.marko b/packages/common/components/blocks/footer-new.marko similarity index 99% rename from packages/common/components/blocks/am-footer.marko rename to packages/common/components/blocks/footer-new.marko index 3022951..864130d 100644 --- a/packages/common/components/blocks/am-footer.marko +++ b/packages/common/components/blocks/footer-new.marko @@ -166,7 +166,7 @@ $ const stealthLinkStyle = { - You are receiving this email because you subscribed to receive relevant news from AuntMinnie.com. + You are receiving this email because you subscribed to receive relevant news from ${website.get("name")}. Click here to unsubscribe. diff --git a/packages/common/components/blocks/marko.json b/packages/common/components/blocks/marko.json index 7ea2d91..8e1cc39 100644 --- a/packages/common/components/blocks/marko.json +++ b/packages/common/components/blocks/marko.json @@ -21,7 +21,7 @@ "": { "template": "./external-api.marko" }, - "": { - "template": "am-footer.marko" + "": { + "template": "footer-new.marko" } } diff --git a/tenants/all/templates/am-breaking-news.marko b/tenants/all/templates/am-breaking-news.marko index 2ec88de..918fce6 100644 --- a/tenants/all/templates/am-breaking-news.marko +++ b/tenants/all/templates/am-breaking-news.marko @@ -2,6 +2,6 @@ $ const { newsletter } = data; <@footer> - + diff --git a/tenants/all/templates/am-case-of-the-week.marko b/tenants/all/templates/am-case-of-the-week.marko index a10ba1e..78546e3 100644 --- a/tenants/all/templates/am-case-of-the-week.marko +++ b/tenants/all/templates/am-case-of-the-week.marko @@ -59,7 +59,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ <@footer> - + diff --git a/tenants/all/templates/am-community-insider.marko b/tenants/all/templates/am-community-insider.marko index e8fa608..7f419a2 100644 --- a/tenants/all/templates/am-community-insider.marko +++ b/tenants/all/templates/am-community-insider.marko @@ -2,6 +2,6 @@ $ const { newsletter } = data; <@footer> - + diff --git a/tenants/all/templates/am-lfte.marko b/tenants/all/templates/am-lfte.marko index cb80bdf..05b6165 100644 --- a/tenants/all/templates/am-lfte.marko +++ b/tenants/all/templates/am-lfte.marko @@ -147,7 +147,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ <@footer> - + diff --git a/tenants/all/templates/am-senl.marko b/tenants/all/templates/am-senl.marko index 1942d90..b5a1be2 100644 --- a/tenants/all/templates/am-senl.marko +++ b/tenants/all/templates/am-senl.marko @@ -2,6 +2,6 @@ $ const { newsletter } = data; <@footer> - + diff --git a/tenants/all/templates/ame-lfte.marko b/tenants/all/templates/ame-lfte.marko index ce428b2..23deaed 100644 --- a/tenants/all/templates/ame-lfte.marko +++ b/tenants/all/templates/ame-lfte.marko @@ -147,7 +147,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ <@footer> - + From 248ef5da1d1157a7c9e404ec652f9b801356c92f Mon Sep 17 00:00:00 2001 From: Jessica Wade Date: Thu, 1 Feb 2024 13:14:53 -0600 Subject: [PATCH 2/5] Add footer-new-block to DrB LFTE --- tenants/all/templates/drb-lfte.marko | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tenants/all/templates/drb-lfte.marko b/tenants/all/templates/drb-lfte.marko index 303b587..4b8baaf 100644 --- a/tenants/all/templates/drb-lfte.marko +++ b/tenants/all/templates/drb-lfte.marko @@ -147,6 +147,9 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ /> + <@footer> + + From e6dee9ac39d98f11d2cb27da7b71aba8fb2b3fa4 Mon Sep 17 00:00:00 2001 From: Jessica Wade Date: Thu, 1 Feb 2024 13:15:19 -0600 Subject: [PATCH 3/5] Update preferenceCenter url & add additional info to core.js (DrB LFTE) --- tenants/all/config/core.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tenants/all/config/core.js b/tenants/all/config/core.js index 06d6e72..983ea11 100644 --- a/tenants/all/config/core.js +++ b/tenants/all/config/core.js @@ -53,7 +53,9 @@ const config = { src: '/files/base/smg/all/image/static/drb/DrB_EmailHeader_LFTE_v3.jpg', footerWidth: 200, }, - preferenceCenter: 'https://www.drbicuspid.com/user/subscribe', + preferenceCenter: 'https://my.drbicuspid.com/unsubscribe/', + subTitle: 'DrBicuspid Daily Newsletter', + subID: '2712ea70-a46a-4b40-91bb-e00c38647657', caseBlock: true, }, 'drb-breaking-news': { From 4aaa61514b4e95129426aa652071965b3240b27f Mon Sep 17 00:00:00 2001 From: Jessica Wade Date: Thu, 1 Feb 2024 14:25:34 -0600 Subject: [PATCH 4/5] Update name of footer block --- packages/common/components/blocks/marko.json | 4 ++-- tenants/all/templates/am-breaking-news.marko | 2 +- tenants/all/templates/am-case-of-the-week.marko | 2 +- tenants/all/templates/am-community-insider.marko | 2 +- tenants/all/templates/am-lfte.marko | 2 +- tenants/all/templates/am-senl.marko | 2 +- tenants/all/templates/ame-lfte.marko | 2 +- tenants/all/templates/drb-lfte.marko | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/common/components/blocks/marko.json b/packages/common/components/blocks/marko.json index 8e1cc39..a3580ee 100644 --- a/packages/common/components/blocks/marko.json +++ b/packages/common/components/blocks/marko.json @@ -21,7 +21,7 @@ "": { "template": "./external-api.marko" }, - "": { - "template": "footer-new.marko" + "": { + "template": "new-footer.marko" } } diff --git a/tenants/all/templates/am-breaking-news.marko b/tenants/all/templates/am-breaking-news.marko index 918fce6..89e55d6 100644 --- a/tenants/all/templates/am-breaking-news.marko +++ b/tenants/all/templates/am-breaking-news.marko @@ -2,6 +2,6 @@ $ const { newsletter } = data; <@footer> - + diff --git a/tenants/all/templates/am-case-of-the-week.marko b/tenants/all/templates/am-case-of-the-week.marko index 78546e3..77a9cc6 100644 --- a/tenants/all/templates/am-case-of-the-week.marko +++ b/tenants/all/templates/am-case-of-the-week.marko @@ -59,7 +59,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ <@footer> - + diff --git a/tenants/all/templates/am-community-insider.marko b/tenants/all/templates/am-community-insider.marko index 7f419a2..da64329 100644 --- a/tenants/all/templates/am-community-insider.marko +++ b/tenants/all/templates/am-community-insider.marko @@ -2,6 +2,6 @@ $ const { newsletter } = data; <@footer> - + diff --git a/tenants/all/templates/am-lfte.marko b/tenants/all/templates/am-lfte.marko index 05b6165..f12289d 100644 --- a/tenants/all/templates/am-lfte.marko +++ b/tenants/all/templates/am-lfte.marko @@ -147,7 +147,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ <@footer> - + diff --git a/tenants/all/templates/am-senl.marko b/tenants/all/templates/am-senl.marko index b5a1be2..6013b52 100644 --- a/tenants/all/templates/am-senl.marko +++ b/tenants/all/templates/am-senl.marko @@ -2,6 +2,6 @@ $ const { newsletter } = data; <@footer> - + diff --git a/tenants/all/templates/ame-lfte.marko b/tenants/all/templates/ame-lfte.marko index 23deaed..95ca36d 100644 --- a/tenants/all/templates/ame-lfte.marko +++ b/tenants/all/templates/ame-lfte.marko @@ -147,7 +147,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ <@footer> - + diff --git a/tenants/all/templates/drb-lfte.marko b/tenants/all/templates/drb-lfte.marko index 4b8baaf..4bc29cb 100644 --- a/tenants/all/templates/drb-lfte.marko +++ b/tenants/all/templates/drb-lfte.marko @@ -148,7 +148,7 @@ $ const resolvedToNodesConverter = ({ resolved }) => (resolved.map((node) => ({ <@footer> - + From f919e655dc349df7a73c0964f5a71aa763f9ac19 Mon Sep 17 00:00:00 2001 From: Jessica Wade Date: Thu, 1 Feb 2024 14:28:13 -0600 Subject: [PATCH 5/5] =?UTF-8?q?Rename=20file=20to=20=E2=80=98new-footer?= =?UTF-8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/blocks/{footer-new.marko => new-footer.marko} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/common/components/blocks/{footer-new.marko => new-footer.marko} (100%) diff --git a/packages/common/components/blocks/footer-new.marko b/packages/common/components/blocks/new-footer.marko similarity index 100% rename from packages/common/components/blocks/footer-new.marko rename to packages/common/components/blocks/new-footer.marko