diff --git a/services/web/app/views/beta_program/opt_in.pug b/services/web/app/views/beta_program/opt_in.pug index bc26ae94a5..2bbc26cfa7 100644 --- a/services/web/app/views/beta_program/opt_in.pug +++ b/services/web/app/views/beta_program/opt_in.pug @@ -1,6 +1,9 @@ extends ../layout-marketing include ../_mixins/back_to_btns +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container.beta-opt-in-wrapper diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug index 92301293a0..9fc97823c5 100644 --- a/services/web/app/views/general/400.pug +++ b/services/web/app/views/general/400.pug @@ -2,6 +2,7 @@ extends ../layout/layout-no-js block vars - metadata = { title: 'Something went wrong' } + - bootstrap5PageStatus = 'disabled' block body body.full-height diff --git a/services/web/app/views/general/404.pug b/services/web/app/views/general/404.pug index f76eac6997..f4b5800cf2 100644 --- a/services/web/app/views/general/404.pug +++ b/services/web/app/views/general/404.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug index 41e7440e0d..90cb1e3606 100644 --- a/services/web/app/views/general/500.pug +++ b/services/web/app/views/general/500.pug @@ -2,6 +2,7 @@ extends ../layout/layout-no-js block vars - metadata = { title: 'Something went wrong' } + - bootstrap5PageStatus = 'disabled' block body body.full-height diff --git a/services/web/app/views/general/closed.pug b/services/web/app/views/general/closed.pug index 91654c3f77..f4012997bd 100644 --- a/services/web/app/views/general/closed.pug +++ b/services/web/app/views/general/closed.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content#main-content .container diff --git a/services/web/app/views/general/post-gateway.pug b/services/web/app/views/general/post-gateway.pug index e3411b727f..dcc844171a 100644 --- a/services/web/app/views/general/post-gateway.pug +++ b/services/web/app/views/general/post-gateway.pug @@ -5,6 +5,7 @@ block vars - var suppressFooter = true - var suppressSkipToContent = true - var suppressCookieBanner = true + - bootstrap5PageStatus = 'disabled' block content .content.content-alt diff --git a/services/web/app/views/general/unsupported-browser.pug b/services/web/app/views/general/unsupported-browser.pug index a2c2216315..f8806cf8d2 100644 --- a/services/web/app/views/general/unsupported-browser.pug +++ b/services/web/app/views/general/unsupported-browser.pug @@ -2,6 +2,7 @@ extends ../layout/layout-no-js block vars - metadata = { title: 'Unsupported browser' } + - bootstrap5PageStatus = 'disabled' block body body.full-height diff --git a/services/web/app/views/layout-base.pug b/services/web/app/views/layout-base.pug index 42db767bb9..be874f2076 100644 --- a/services/web/app/views/layout-base.pug +++ b/services/web/app/views/layout-base.pug @@ -21,7 +21,7 @@ html( head include ./_metadata.pug - - const bootstrapVersion = bootstrap5PageStatus !== 'disabled' && (bootstrap5Override || (bootstrap5PageStatus === 'enabled' && (bootstrap5PageSplitTest === '' || splitTestVariants[bootstrap5PageSplitTest] === 'enabled'))) ? 5 : 3 + - const bootstrapVersion = bootstrap5PageStatus !== 'disabled' && (bootstrap5Override || bootstrap5PageSplitTest === '' || splitTestVariants[bootstrap5PageSplitTest] === 'enabled') ? 5 : 3 //- Stylesheet link(rel='stylesheet', href=buildCssPath(getCssThemeModifier(userSettings, brandVariation, enableIeeeBranding), bootstrapVersion), id="main-stylesheet") 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 b1b5ae1e25..c3b40cecf5 100644 --- a/services/web/app/views/project/editor/new_from_template.pug +++ b/services/web/app/views/project/editor/new_from_template.pug @@ -4,6 +4,7 @@ block vars - var suppressFooter = true - var suppressCookieBanner = true - var suppressSkipToContent = true + - bootstrap5PageStatus = 'disabled' block content .editor.full-size diff --git a/services/web/app/views/project/invite/not-valid.pug b/services/web/app/views/project/invite/not-valid.pug index b26e580a04..ac3eaed80a 100644 --- a/services/web/app/views/project/invite/not-valid.pug +++ b/services/web/app/views/project/invite/not-valid.pug @@ -1,5 +1,8 @@ extends ../../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug index 434c7f2976..8d19a1edba 100644 --- a/services/web/app/views/project/invite/show.pug +++ b/services/web/app/views/project/invite/show.pug @@ -1,5 +1,8 @@ extends ../../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/referal/bonus.pug b/services/web/app/views/referal/bonus.pug index b001650e47..ecd5a7160a 100644 --- a/services/web/app/views/referal/bonus.pug +++ b/services/web/app/views/referal/bonus.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content .content.content-alt#main-content .container.bonus diff --git a/services/web/app/views/user/accountSuspended.pug b/services/web/app/views/user/accountSuspended.pug index dd473c9179..da57f4d9ff 100644 --- a/services/web/app/views/user/accountSuspended.pug +++ b/services/web/app/views/user/accountSuspended.pug @@ -4,6 +4,7 @@ block vars - var suppressNavbar = true - var suppressFooter = true - metadata.robotsNoindexNofollow = true + - bootstrap5PageStatus = 'disabled' block content main.content.content-alt#main-content diff --git a/services/web/app/views/user/addSecondaryEmail.pug b/services/web/app/views/user/addSecondaryEmail.pug index 00cb1ad607..b4c5b327ee 100644 --- a/services/web/app/views/user/addSecondaryEmail.pug +++ b/services/web/app/views/user/addSecondaryEmail.pug @@ -3,6 +3,7 @@ extends ../layout-marketing block vars - var suppressNavbar = true - var suppressSkipToContent = true + - bootstrap5PageStatus = 'disabled' block entrypointVar - entrypoint = 'pages/user/add-secondary-email' diff --git a/services/web/app/views/user/confirm_email.pug b/services/web/app/views/user/confirm_email.pug index d45b5b8dba..37c04880b1 100644 --- a/services/web/app/views/user/confirm_email.pug +++ b/services/web/app/views/user/confirm_email.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/email-preferences.pug b/services/web/app/views/user/email-preferences.pug index d4eeda4c1e..465ffede37 100644 --- a/services/web/app/views/user/email-preferences.pug +++ b/services/web/app/views/user/email-preferences.pug @@ -1,6 +1,9 @@ extends ../layout-marketing include ../_mixins/back_to_btns +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug index ffd38e8075..711d3297f2 100644 --- a/services/web/app/views/user/login.pug +++ b/services/web/app/views/user/login.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/one_time_login.pug b/services/web/app/views/user/one_time_login.pug index ff43d0683d..89e1491913 100644 --- a/services/web/app/views/user/one_time_login.pug +++ b/services/web/app/views/user/one_time_login.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug index aed7a54513..410e79fbb2 100644 --- a/services/web/app/views/user/passwordReset.pug +++ b/services/web/app/views/user/passwordReset.pug @@ -1,6 +1,9 @@ extends ../layout-marketing include ../_mixins/recaptcha +block vars + - bootstrap5PageStatus = 'disabled' + block content - var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset) diff --git a/services/web/app/views/user/primaryEmailCheck.pug b/services/web/app/views/user/primaryEmailCheck.pug index 31583cfb01..8a0f1e6e94 100644 --- a/services/web/app/views/user/primaryEmailCheck.pug +++ b/services/web/app/views/user/primaryEmailCheck.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .login-register-container.primary-email-check-container diff --git a/services/web/app/views/user/reconfirm.pug b/services/web/app/views/user/reconfirm.pug index 62ba37202b..5db1d811c7 100644 --- a/services/web/app/views/user/reconfirm.pug +++ b/services/web/app/views/user/reconfirm.pug @@ -1,6 +1,9 @@ extends ../layout-marketing include ../_mixins/recaptcha +block vars + - bootstrap5PageStatus = 'disabled' + block content - var email = reconfirm_email ? reconfirm_email : "" - var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset) diff --git a/services/web/app/views/user/register.pug b/services/web/app/views/user/register.pug index 9392fbdd49..c35f3c04f0 100644 --- a/services/web/app/views/user/register.pug +++ b/services/web/app/views/user/register.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/restricted.pug b/services/web/app/views/user/restricted.pug index 834e49b7de..949bd9b4b6 100644 --- a/services/web/app/views/user/restricted.pug +++ b/services/web/app/views/user/restricted.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content#main-content .container diff --git a/services/web/app/views/user/sessions.pug b/services/web/app/views/user/sessions.pug index b994feea7a..99905a960d 100644 --- a/services/web/app/views/user/sessions.pug +++ b/services/web/app/views/user/sessions.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/user/setPassword.pug b/services/web/app/views/user/setPassword.pug index 198de711bf..5da2b6b59a 100644 --- a/services/web/app/views/user/setPassword.pug +++ b/services/web/app/views/user/setPassword.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container-custom-sm.mx-auto diff --git a/services/web/app/views/user_membership/new.pug b/services/web/app/views/user_membership/new.pug index 0500d22470..6a88249ca6 100644 --- a/services/web/app/views/user_membership/new.pug +++ b/services/web/app/views/user_membership/new.pug @@ -1,5 +1,8 @@ extends ../layout-marketing +block vars + - bootstrap5PageStatus = 'disabled' + block content main.content.content-alt#main-content .container diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug index 28d3ff8fc8..fdf0576c4a 100644 --- a/services/web/modules/launchpad/app/views/launchpad.pug +++ b/services/web/modules/launchpad/app/views/launchpad.pug @@ -25,6 +25,7 @@ block entrypointVar block vars - metadata = metadata || {} + - bootstrap5PageStatus = 'disabled' block append meta meta(name="ol-adminUserExists" data-type="boolean" content=adminUserExists) diff --git a/services/web/modules/user-activate/app/views/user/register.pug b/services/web/modules/user-activate/app/views/user/register.pug index e83746c087..d64c2c413e 100644 --- a/services/web/modules/user-activate/app/views/user/register.pug +++ b/services/web/modules/user-activate/app/views/user/register.pug @@ -4,6 +4,9 @@ block entrypointVar - entrypoint = 'modules/user-activate/pages/user-activate-page' +block vars + - bootstrap5PageStatus = 'disabled' + block content .content.content-alt#main-content .container