From b24d209453fd6c10d5786ed69928883d110e821a Mon Sep 17 00:00:00 2001 From: Rebeka Date: Mon, 17 Jul 2023 14:15:36 +0200 Subject: [PATCH] Suppress the cookie banner when the footer is suppressed, except for the new login and registration page variant GitOrigin-RevId: 553fd63f1a0fefaf90afb8c4850c5c7af7855387 --- services/web/app/views/general/post-gateway.pug | 1 + services/web/app/views/layout-marketing.pug | 1 + services/web/app/views/layout.pug | 1 + services/web/app/views/project/editor.pug | 1 + services/web/app/views/project/editor/new_from_template.pug | 1 + services/web/app/views/project/editor_detached.pug | 1 + services/web/app/views/project/importing.pug | 1 + services/web/app/views/project/token/access.pug | 1 + services/web/app/views/subscriptions/new-react.pug | 1 + .../st-personal-off-default/interstitial-payment.pug | 1 + .../st-personal-off-variant/interstitial-payment.pug | 1 + 11 files changed, 11 insertions(+) diff --git a/services/web/app/views/general/post-gateway.pug b/services/web/app/views/general/post-gateway.pug index 428b5f3094..e3411b727f 100644 --- a/services/web/app/views/general/post-gateway.pug +++ b/services/web/app/views/general/post-gateway.pug @@ -4,6 +4,7 @@ block vars - var suppressNavbar = true - var suppressFooter = true - var suppressSkipToContent = true + - var suppressCookieBanner = true block content .content.content-alt diff --git a/services/web/app/views/layout-marketing.pug b/services/web/app/views/layout-marketing.pug index 3bfee2b4ae..0ca338809e 100644 --- a/services/web/app/views/layout-marketing.pug +++ b/services/web/app/views/layout-marketing.pug @@ -17,6 +17,7 @@ block body else include layout/fat-footer + if (typeof(suppressCookieBanner) == 'undefined') include _cookie_banner != moduleIncludes("contactModal-marketing", locals) diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index 26b3560436..ff4481c87b 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -15,6 +15,7 @@ block body else include layout/fat-footer + if (typeof(suppressCookieBanner) == 'undefined') include _cookie_banner != moduleIncludes("contactModal", locals) diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug index 051f89ccf2..1c1191ca99 100644 --- a/services/web/app/views/project/editor.pug +++ b/services/web/app/views/project/editor.pug @@ -4,6 +4,7 @@ block vars - var suppressNavbar = true - var suppressFooter = true - var suppressSkipToContent = true + - var suppressCookieBanner = true - metadata.robotsNoindexNofollow = true block css diff --git a/services/web/app/views/project/editor/new_from_template.pug b/services/web/app/views/project/editor/new_from_template.pug index 2b054bbd3f..b1b5ae1e25 100644 --- a/services/web/app/views/project/editor/new_from_template.pug +++ b/services/web/app/views/project/editor/new_from_template.pug @@ -2,6 +2,7 @@ extends ../../layout-marketing block vars - var suppressFooter = true + - var suppressCookieBanner = true - var suppressSkipToContent = true block content diff --git a/services/web/app/views/project/editor_detached.pug b/services/web/app/views/project/editor_detached.pug index 104eca8e79..874082fa01 100644 --- a/services/web/app/views/project/editor_detached.pug +++ b/services/web/app/views/project/editor_detached.pug @@ -7,6 +7,7 @@ block vars - var suppressNavbar = true - var suppressFooter = true - var suppressSkipToContent = true + - var suppressCookieBanner = true - metadata.robotsNoindexNofollow = true block content diff --git a/services/web/app/views/project/importing.pug b/services/web/app/views/project/importing.pug index 6d62114806..bd8e12e349 100644 --- a/services/web/app/views/project/importing.pug +++ b/services/web/app/views/project/importing.pug @@ -4,6 +4,7 @@ block vars - var suppressNavbar = true - var suppressFooter = true - var suppressSkipToContent = true + - var suppressCookieBanner = true - metadata.robotsNoindexNofollow = true block content diff --git a/services/web/app/views/project/token/access.pug b/services/web/app/views/project/token/access.pug index e3c22707dd..cad37498cf 100644 --- a/services/web/app/views/project/token/access.pug +++ b/services/web/app/views/project/token/access.pug @@ -2,6 +2,7 @@ extends ../../layout block vars - var suppressFooter = true + - var suppressCookieBanner = true - var suppressSkipToContent = true block content diff --git a/services/web/app/views/subscriptions/new-react.pug b/services/web/app/views/subscriptions/new-react.pug index 5b8a179df3..fd0036f977 100644 --- a/services/web/app/views/subscriptions/new-react.pug +++ b/services/web/app/views/subscriptions/new-react.pug @@ -6,6 +6,7 @@ block entrypointVar block vars - var suppressNavbarRight = true - var suppressFooter = true + - var suppressCookieBanner = true block append meta meta(name="ol-countryCode" content=countryCode) diff --git a/services/web/app/views/subscriptions/plans-marketing/st-personal-off-default/interstitial-payment.pug b/services/web/app/views/subscriptions/plans-marketing/st-personal-off-default/interstitial-payment.pug index d51dc39f49..f573e6630d 100644 --- a/services/web/app/views/subscriptions/plans-marketing/st-personal-off-default/interstitial-payment.pug +++ b/services/web/app/views/subscriptions/plans-marketing/st-personal-off-default/interstitial-payment.pug @@ -6,6 +6,7 @@ block vars - entrypoint = 'pages/user/subscription/plans-v2/plans-v2-main' - var suppressFooter = true - var suppressNavbarRight = true + - var suppressCookieBanner = true block append meta meta(name="ol-recommendedCurrency" content=recommendedCurrency) diff --git a/services/web/app/views/subscriptions/plans-marketing/st-personal-off-variant/interstitial-payment.pug b/services/web/app/views/subscriptions/plans-marketing/st-personal-off-variant/interstitial-payment.pug index d51dc39f49..f573e6630d 100644 --- a/services/web/app/views/subscriptions/plans-marketing/st-personal-off-variant/interstitial-payment.pug +++ b/services/web/app/views/subscriptions/plans-marketing/st-personal-off-variant/interstitial-payment.pug @@ -6,6 +6,7 @@ block vars - entrypoint = 'pages/user/subscription/plans-v2/plans-v2-main' - var suppressFooter = true - var suppressNavbarRight = true + - var suppressCookieBanner = true block append meta meta(name="ol-recommendedCurrency" content=recommendedCurrency)