From f73b741f69764169dafb62fec106a44f281f3ba1 Mon Sep 17 00:00:00 2001 From: "alexander.sealey" Date: Mon, 4 Aug 2025 12:14:00 +0100 Subject: [PATCH 1/5] Added function to move message --- b2c/views/js/b2c.js | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/b2c/views/js/b2c.js b/b2c/views/js/b2c.js index 835f8bdd..ba3c99e9 100644 --- a/b2c/views/js/b2c.js +++ b/b2c/views/js/b2c.js @@ -159,6 +159,45 @@ function validateErrors() { } } +function moveVerifyingModal() { + + const observer = new MutationObserver(() => { + console.log("MutationObserver triggered."); + + const modalOverlay = document.querySelector("#simplemodal-overlay") + const modalContainer = document.querySelector('#simplemodal-container') + const modalData = document.querySelector('#simplemodal-data') + const modalBlurb = document.querySelector('#verifying_blurb') + const newLocation = document.querySelector('.govuk-notification-banner__content') + + modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" + + if (modalOverlay && modalOverlay.checkVisibility()) { + observer.disconnect(); + + modalOverlay.remove() + + modalContainer.style.all = "unset"; + modalData.style.all = "unset" + modalBlurb.classList.add("govuk-notification-banner__heading") + + newLocation.appendChild(modalContainer) + + //debugger; + + observer.observe(document.body, { childList: true, subtree: true }); + + } + + modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" + + }); + + observer.observe(document.body, { childList: true, subtree: true }); + console.log("Observer started on document body."); + +} + $(function () { moveForgotPassword(); moveRetryCode(); @@ -168,4 +207,5 @@ $(function () { removeAutofocus(); $(window).on('pageshow', removeAutofocus); addDescriptiveErrors(); + moveVerifyingModal(); }); From 93e5124f29c2cc7ca8d518d53c01a50872d5708d Mon Sep 17 00:00:00 2001 From: "alexander.sealey" Date: Wed, 6 Aug 2025 11:32:27 +0100 Subject: [PATCH 2/5] Add JS and CSS workarounds to dismiss modal, devs to review --- b2c/views/css/main.css | 26 +++++++++++++++++++++----- b2c/views/js/b2c.js | 32 ++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/b2c/views/css/main.css b/b2c/views/css/main.css index 92b47a2d..e39c111c 100644 --- a/b2c/views/css/main.css +++ b/b2c/views/css/main.css @@ -75,14 +75,14 @@ font-family: "GDS Transport"; font-style: normal; font-weight: normal; - src: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/light-94a07e06a1-v2.woff2") format("woff2"), url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/light-f591b13f7d-v2.woff") format("woff"); + src: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/light-94a07e06a1-v2.woff2") format("woff2"), url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/light-f591b13f7d-v2.woff") format("woff"); font-display: fallback; } @font-face { font-family: "GDS Transport"; font-style: normal; font-weight: bold; - src: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-b542beb274-v2.woff2") format("woff2"), url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-affa96571d-v2.woff") format("woff"); + src: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-b542beb274-v2.woff2") format("woff2"), url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-affa96571d-v2.woff") format("woff"); font-display: fallback; } @media print { @@ -3954,7 +3954,7 @@ display: block; width: 100%; padding-top: 112px; - background-image: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); + background-image: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); background-repeat: no-repeat; background-position: 50% 0%; background-size: 125px 102px; @@ -3964,8 +3964,8 @@ @supports (-webkit-mask-position: initial) or (mask-position: initial) { .govuk-footer__copyright-logo::before { background: currentcolor; - -webkit-mask-image: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); - mask-image: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); + -webkit-mask-image: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); + mask-image: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; -webkit-mask-position: 50% 0%; @@ -8567,3 +8567,19 @@ input[type="checkbox"] { .changeClaims { visibility: hidden; } + +/* ======================= */ +/* B2C Hide Modal */ +/* ======================= */ + +#simplemodal-overlay { + display:none !important; +} + +#simplemodal-container { + display:none; +} + +#verifying_blurb { + display: none; +} \ No newline at end of file diff --git a/b2c/views/js/b2c.js b/b2c/views/js/b2c.js index ba3c99e9..790309fd 100644 --- a/b2c/views/js/b2c.js +++ b/b2c/views/js/b2c.js @@ -46,7 +46,7 @@ function addTsAndCsLink() { // fix the wrong for attribute supplied by B2C tsAndCsLabel.setAttribute('for', tsAndCsText.getAttribute('for')); if (tsAndCsText) { - tsAndCsText.innerHTML = tsAndCsText.innerHTML = 'I agree to the Terms & Conditions (including Acceptable Use) for the Section 28 Video on Demand Portal.' + tsAndCsText.innerHTML = tsAndCsText.innerHTML = 'I agree to the Terms & Conditions (including Acceptable Use) for the Section 28 Video on Demand Portal.' } } } @@ -149,8 +149,8 @@ function validateErrors() {
`; @@ -159,20 +159,27 @@ function validateErrors() { } } +function moveVerifyingMessage() { + +} + + function moveVerifyingModal() { const observer = new MutationObserver(() => { - console.log("MutationObserver triggered."); const modalOverlay = document.querySelector("#simplemodal-overlay") - const modalContainer = document.querySelector('#simplemodal-container') - const modalData = document.querySelector('#simplemodal-data') const modalBlurb = document.querySelector('#verifying_blurb') - const newLocation = document.querySelector('.govuk-notification-banner__content') - - modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" + + if (modalBlurb) { + modalBlurb.style.display = modalBlurb.classList.contains("govuk-notification-banner__heading") ? "block" : "none"; + } if (modalOverlay && modalOverlay.checkVisibility()) { + const modalContainer = document.querySelector('#simplemodal-container') + const modalData = document.querySelector('#simplemodal-data') + const newLocation = document.querySelector('.govuk-notification-banner__content') + observer.disconnect(); modalOverlay.remove() @@ -180,17 +187,13 @@ function moveVerifyingModal() { modalContainer.style.all = "unset"; modalData.style.all = "unset" modalBlurb.classList.add("govuk-notification-banner__heading") + modalBlurb.style.display = "block" newLocation.appendChild(modalContainer) - //debugger; - observer.observe(document.body, { childList: true, subtree: true }); - } - modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" - }); observer.observe(document.body, { childList: true, subtree: true }); @@ -198,6 +201,7 @@ function moveVerifyingModal() { } + $(function () { moveForgotPassword(); moveRetryCode(); From 9b01357e0786b8f92f971fe3bb3322e10fe33145 Mon Sep 17 00:00:00 2001 From: "alexander.sealey" Date: Wed, 6 Aug 2025 11:48:27 +0100 Subject: [PATCH 3/5] Revert "Add JS and CSS workarounds to dismiss modal, devs to review" This reverts commit 93e5124f29c2cc7ca8d518d53c01a50872d5708d. --- b2c/views/css/main.css | 26 +++++--------------------- b2c/views/js/b2c.js | 32 ++++++++++++++------------------ 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/b2c/views/css/main.css b/b2c/views/css/main.css index e39c111c..92b47a2d 100644 --- a/b2c/views/css/main.css +++ b/b2c/views/css/main.css @@ -75,14 +75,14 @@ font-family: "GDS Transport"; font-style: normal; font-weight: normal; - src: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/light-94a07e06a1-v2.woff2") format("woff2"), url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/light-f591b13f7d-v2.woff") format("woff"); + src: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/light-94a07e06a1-v2.woff2") format("woff2"), url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/light-f591b13f7d-v2.woff") format("woff"); font-display: fallback; } @font-face { font-family: "GDS Transport"; font-style: normal; font-weight: bold; - src: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-b542beb274-v2.woff2") format("woff2"), url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-affa96571d-v2.woff") format("woff"); + src: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-b542beb274-v2.woff2") format("woff2"), url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/fonts/bold-affa96571d-v2.woff") format("woff"); font-display: fallback; } @media print { @@ -3954,7 +3954,7 @@ display: block; width: 100%; padding-top: 112px; - background-image: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); + background-image: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); background-repeat: no-repeat; background-position: 50% 0%; background-size: 125px 102px; @@ -3964,8 +3964,8 @@ @supports (-webkit-mask-position: initial) or (mask-position: initial) { .govuk-footer__copyright-logo::before { background: currentcolor; - -webkit-mask-image: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); - mask-image: url("https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); + -webkit-mask-image: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); + mask-image: url("https://presa{env}.blob.core.windows.net/pre-b2c-container/assets/images/govuk-crest.svg"); -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; -webkit-mask-position: 50% 0%; @@ -8567,19 +8567,3 @@ input[type="checkbox"] { .changeClaims { visibility: hidden; } - -/* ======================= */ -/* B2C Hide Modal */ -/* ======================= */ - -#simplemodal-overlay { - display:none !important; -} - -#simplemodal-container { - display:none; -} - -#verifying_blurb { - display: none; -} \ No newline at end of file diff --git a/b2c/views/js/b2c.js b/b2c/views/js/b2c.js index 790309fd..ba3c99e9 100644 --- a/b2c/views/js/b2c.js +++ b/b2c/views/js/b2c.js @@ -46,7 +46,7 @@ function addTsAndCsLink() { // fix the wrong for attribute supplied by B2C tsAndCsLabel.setAttribute('for', tsAndCsText.getAttribute('for')); if (tsAndCsText) { - tsAndCsText.innerHTML = tsAndCsText.innerHTML = 'I agree to the Terms & Conditions (including Acceptable Use) for the Section 28 Video on Demand Portal.' + tsAndCsText.innerHTML = tsAndCsText.innerHTML = 'I agree to the Terms & Conditions (including Acceptable Use) for the Section 28 Video on Demand Portal.' } } } @@ -149,8 +149,8 @@ function validateErrors() {
`; @@ -159,27 +159,20 @@ function validateErrors() { } } -function moveVerifyingMessage() { - -} - - function moveVerifyingModal() { const observer = new MutationObserver(() => { + console.log("MutationObserver triggered."); const modalOverlay = document.querySelector("#simplemodal-overlay") + const modalContainer = document.querySelector('#simplemodal-container') + const modalData = document.querySelector('#simplemodal-data') const modalBlurb = document.querySelector('#verifying_blurb') - - if (modalBlurb) { - modalBlurb.style.display = modalBlurb.classList.contains("govuk-notification-banner__heading") ? "block" : "none"; - } + const newLocation = document.querySelector('.govuk-notification-banner__content') - if (modalOverlay && modalOverlay.checkVisibility()) { - const modalContainer = document.querySelector('#simplemodal-container') - const modalData = document.querySelector('#simplemodal-data') - const newLocation = document.querySelector('.govuk-notification-banner__content') + modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" + if (modalOverlay && modalOverlay.checkVisibility()) { observer.disconnect(); modalOverlay.remove() @@ -187,13 +180,17 @@ function moveVerifyingModal() { modalContainer.style.all = "unset"; modalData.style.all = "unset" modalBlurb.classList.add("govuk-notification-banner__heading") - modalBlurb.style.display = "block" newLocation.appendChild(modalContainer) + //debugger; + observer.observe(document.body, { childList: true, subtree: true }); + } + modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" + }); observer.observe(document.body, { childList: true, subtree: true }); @@ -201,7 +198,6 @@ function moveVerifyingModal() { } - $(function () { moveForgotPassword(); moveRetryCode(); From 886faa1581ea5b113c95f9d813026edf45e261f1 Mon Sep 17 00:00:00 2001 From: "alexander.sealey" Date: Wed, 6 Aug 2025 11:50:22 +0100 Subject: [PATCH 4/5] Add JS and CSS to hide modal, with correct env vars, devs to review --- b2c/views/css/main.css | 16 ++++++++++++++++ b2c/views/js/b2c.js | 23 +++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/b2c/views/css/main.css b/b2c/views/css/main.css index 92b47a2d..9de0f88d 100644 --- a/b2c/views/css/main.css +++ b/b2c/views/css/main.css @@ -8567,3 +8567,19 @@ input[type="checkbox"] { .changeClaims { visibility: hidden; } + +/* ======================= */ +/* B2C Hide Modal */ +/* ======================= */ + +#simplemodal-overlay { + display:none !important; +} + +#simplemodal-container { + display:none; +} + +#verifying_blurb { + display: none; +} \ No newline at end of file diff --git a/b2c/views/js/b2c.js b/b2c/views/js/b2c.js index ba3c99e9..8e133719 100644 --- a/b2c/views/js/b2c.js +++ b/b2c/views/js/b2c.js @@ -162,17 +162,19 @@ function validateErrors() { function moveVerifyingModal() { const observer = new MutationObserver(() => { - console.log("MutationObserver triggered."); const modalOverlay = document.querySelector("#simplemodal-overlay") - const modalContainer = document.querySelector('#simplemodal-container') - const modalData = document.querySelector('#simplemodal-data') const modalBlurb = document.querySelector('#verifying_blurb') - const newLocation = document.querySelector('.govuk-notification-banner__content') - - modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" + + if (modalBlurb) { + modalBlurb.style.display = modalBlurb.classList.contains("govuk-notification-banner__heading") ? "block" : "none"; + } if (modalOverlay && modalOverlay.checkVisibility()) { + const modalContainer = document.querySelector('#simplemodal-container') + const modalData = document.querySelector('#simplemodal-data') + const newLocation = document.querySelector('.govuk-notification-banner__content') + observer.disconnect(); modalOverlay.remove() @@ -180,17 +182,13 @@ function moveVerifyingModal() { modalContainer.style.all = "unset"; modalData.style.all = "unset" modalBlurb.classList.add("govuk-notification-banner__heading") + modalBlurb.style.display = "block" newLocation.appendChild(modalContainer) - //debugger; - observer.observe(document.body, { childList: true, subtree: true }); - } - modalBlurb.classList.contains('govuk-notification-banner__heading') ? modalBlurb.style.display = "block" : modalBlurb.style.display = "none" - }); observer.observe(document.body, { childList: true, subtree: true }); @@ -198,6 +196,7 @@ function moveVerifyingModal() { } + $(function () { moveForgotPassword(); moveRetryCode(); @@ -208,4 +207,4 @@ $(function () { $(window).on('pageshow', removeAutofocus); addDescriptiveErrors(); moveVerifyingModal(); -}); +}); \ No newline at end of file From 121f70a5fe64949eff2ff8fb2e88efd30f93635c Mon Sep 17 00:00:00 2001 From: "alexander.sealey" Date: Wed, 6 Aug 2025 14:07:06 +0100 Subject: [PATCH 5/5] Removed JS function and added ticket to CSS --- b2c/views/css/main.css | 6 +++--- b2c/views/js/b2c.js | 39 --------------------------------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/b2c/views/css/main.css b/b2c/views/css/main.css index 9de0f88d..1d733fdf 100644 --- a/b2c/views/css/main.css +++ b/b2c/views/css/main.css @@ -8568,9 +8568,9 @@ input[type="checkbox"] { visibility: hidden; } -/* ======================= */ -/* B2C Hide Modal */ -/* ======================= */ +/* ================================ */ +/* B2C Hide Modal - S28-4038 */ +/* ================================ */ #simplemodal-overlay { display:none !important; diff --git a/b2c/views/js/b2c.js b/b2c/views/js/b2c.js index 8e133719..6292f55a 100644 --- a/b2c/views/js/b2c.js +++ b/b2c/views/js/b2c.js @@ -159,44 +159,6 @@ function validateErrors() { } } -function moveVerifyingModal() { - - const observer = new MutationObserver(() => { - - const modalOverlay = document.querySelector("#simplemodal-overlay") - const modalBlurb = document.querySelector('#verifying_blurb') - - if (modalBlurb) { - modalBlurb.style.display = modalBlurb.classList.contains("govuk-notification-banner__heading") ? "block" : "none"; - } - - if (modalOverlay && modalOverlay.checkVisibility()) { - const modalContainer = document.querySelector('#simplemodal-container') - const modalData = document.querySelector('#simplemodal-data') - const newLocation = document.querySelector('.govuk-notification-banner__content') - - observer.disconnect(); - - modalOverlay.remove() - - modalContainer.style.all = "unset"; - modalData.style.all = "unset" - modalBlurb.classList.add("govuk-notification-banner__heading") - modalBlurb.style.display = "block" - - newLocation.appendChild(modalContainer) - - observer.observe(document.body, { childList: true, subtree: true }); - } - - }); - - observer.observe(document.body, { childList: true, subtree: true }); - console.log("Observer started on document body."); - -} - - $(function () { moveForgotPassword(); moveRetryCode(); @@ -206,5 +168,4 @@ $(function () { removeAutofocus(); $(window).on('pageshow', removeAutofocus); addDescriptiveErrors(); - moveVerifyingModal(); }); \ No newline at end of file