Przeglądaj źródła

[web] Make Bootstrap 5 the default for new pages (#24079)

* Update layout-base.pug to treat missing `bootstrap5PageStatus` as enabled

* Set `bootstrap5PageStatus = 'disabled'` everywhere it's undefined

I found the files with `find . -name "*.pug" -type f -exec grep -l "block content" {} \; | xargs grep -L "bootstrap5PageStatus\|layout-website-redesign-boo
                        tstrap-5\|layout-website-redesign-cms-bootstrap-5" | sort`

GitOrigin-RevId: 8ecf2eedea032d96e4fba078fb0316a7a311b08a
Antoine Clausse 1 rok temu
rodzic
commit
959562661f
28 zmienionych plików z 66 dodań i 1 usunięć
  1. 3 0
      services/web/app/views/beta_program/opt_in.pug
  2. 1 0
      services/web/app/views/general/400.pug
  3. 3 0
      services/web/app/views/general/404.pug
  4. 1 0
      services/web/app/views/general/500.pug
  5. 3 0
      services/web/app/views/general/closed.pug
  6. 1 0
      services/web/app/views/general/post-gateway.pug
  7. 1 0
      services/web/app/views/general/unsupported-browser.pug
  8. 1 1
      services/web/app/views/layout-base.pug
  9. 1 0
      services/web/app/views/project/editor/new_from_template.pug
  10. 3 0
      services/web/app/views/project/invite/not-valid.pug
  11. 3 0
      services/web/app/views/project/invite/show.pug
  12. 3 0
      services/web/app/views/referal/bonus.pug
  13. 1 0
      services/web/app/views/user/accountSuspended.pug
  14. 1 0
      services/web/app/views/user/addSecondaryEmail.pug
  15. 3 0
      services/web/app/views/user/confirm_email.pug
  16. 3 0
      services/web/app/views/user/email-preferences.pug
  17. 3 0
      services/web/app/views/user/login.pug
  18. 3 0
      services/web/app/views/user/one_time_login.pug
  19. 3 0
      services/web/app/views/user/passwordReset.pug
  20. 3 0
      services/web/app/views/user/primaryEmailCheck.pug
  21. 3 0
      services/web/app/views/user/reconfirm.pug
  22. 3 0
      services/web/app/views/user/register.pug
  23. 3 0
      services/web/app/views/user/restricted.pug
  24. 3 0
      services/web/app/views/user/sessions.pug
  25. 3 0
      services/web/app/views/user/setPassword.pug
  26. 3 0
      services/web/app/views/user_membership/new.pug
  27. 1 0
      services/web/modules/launchpad/app/views/launchpad.pug
  28. 3 0
      services/web/modules/user-activate/app/views/user/register.pug

+ 3 - 0
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

+ 1 - 0
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

+ 3 - 0
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

+ 1 - 0
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

+ 3 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 1
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")

+ 1 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 1 - 0
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

+ 1 - 0
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'

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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)
 

+ 3 - 0
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

+ 3 - 0
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)

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 1 - 0
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)

+ 3 - 0
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