From 86f3ce138b72c3bfb33e77a49c463237b734d913 Mon Sep 17 00:00:00 2001 From: Rebeka Date: Fri, 14 Jul 2023 16:17:09 +0200 Subject: [PATCH] Revert "Suppress the cookie banner when the footer is suppressed, except for the new login and registration page variant" This reverts commit 3bd0e3aa9cbebbfc41db54ed4307540d1c557363. GitOrigin-RevId: 4b5f7662105add926c122b9f8205528400c1023d --- 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 deletions(-) diff --git a/services/web/app/views/general/post-gateway.pug b/services/web/app/views/general/post-gateway.pug index e3411b727f..428b5f3094 100644 --- a/services/web/app/views/general/post-gateway.pug +++ b/services/web/app/views/general/post-gateway.pug @@ -4,7 +4,6 @@ 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 0ca338809e..3bfee2b4ae 100644 --- a/services/web/app/views/layout-marketing.pug +++ b/services/web/app/views/layout-marketing.pug @@ -17,7 +17,6 @@ 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 ff4481c87b..26b3560436 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -15,7 +15,6 @@ 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 1c1191ca99..051f89ccf2 100644 --- a/services/web/app/views/project/editor.pug +++ b/services/web/app/views/project/editor.pug @@ -4,7 +4,6 @@ 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 ba834e072b..2b054bbd3f 100644 --- a/services/web/app/views/project/editor/new_from_template.pug +++ b/services/web/app/views/project/editor/new_from_template.pug @@ -3,7 +3,6 @@ extends ../../layout-marketing block vars - var suppressFooter = true - var suppressSkipToContent = true - - var suppressCookieBanner = true block content .editor.full-size diff --git a/services/web/app/views/project/editor_detached.pug b/services/web/app/views/project/editor_detached.pug index 874082fa01..104eca8e79 100644 --- a/services/web/app/views/project/editor_detached.pug +++ b/services/web/app/views/project/editor_detached.pug @@ -7,7 +7,6 @@ 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 bd8e12e349..6d62114806 100644 --- a/services/web/app/views/project/importing.pug +++ b/services/web/app/views/project/importing.pug @@ -4,7 +4,6 @@ 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 dcc2de810b..e3c22707dd 100644 --- a/services/web/app/views/project/token/access.pug +++ b/services/web/app/views/project/token/access.pug @@ -3,7 +3,6 @@ extends ../../layout block vars - var suppressFooter = true - var suppressSkipToContent = true - - var suppressCookieBanner = true block content diff --git a/services/web/app/views/subscriptions/new-react.pug b/services/web/app/views/subscriptions/new-react.pug index fd0036f977..5b8a179df3 100644 --- a/services/web/app/views/subscriptions/new-react.pug +++ b/services/web/app/views/subscriptions/new-react.pug @@ -6,7 +6,6 @@ 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 f573e6630d..d51dc39f49 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,7 +6,6 @@ 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 f573e6630d..d51dc39f49 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,7 +6,6 @@ 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)