Merge pull request #25788 from overleaf/td-layout-react

Use correct layout for React pages GitOrigin-RevId: 0dbf3146273c0ac2f1549f67be374595e1b8403e
2026-05-25 10:10:08 +02:00 · 2025-05-22 11:12:34 +01:00
parent dfed87723f
commit b70fbb38ce
18 changed files with 69 additions and 72 deletions
--- a/services/web/app/views/layout-react.pug
+++ b/services/web/app/views/layout-react.pug
@@ -12,72 +12,54 @@ block isApplicationPageVar
 	- isApplicationPage = true
 		
 block append meta
-	if bootstrapVersion === 5
-		- const canDisplayAdminMenu = hasAdminAccess()
-		- const canDisplayAdminRedirect = canRedirectToAdminDomain()
-		- const sessionUser = getSessionUser()
-		- const staffAccess = sessionUser?.staffAccess
-		- const canDisplaySplitTestMenu = hasFeature('saas') && (canDisplayAdminMenu || staffAccess?.splitTestMetrics || staffAccess?.splitTestManagement)
-		- const canDisplaySurveyMenu = hasFeature('saas') && canDisplayAdminMenu
-		- const canDisplayScriptLogMenu = hasFeature('saas') && canDisplayAdminMenu
-		- const enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
-		- const showSignUpLink = hasFeature('registration-page')
+	- const canDisplayAdminMenu = hasAdminAccess()
+	- const canDisplayAdminRedirect = canRedirectToAdminDomain()
+	- const sessionUser = getSessionUser()
+	- const staffAccess = sessionUser?.staffAccess
+	- const canDisplaySplitTestMenu = hasFeature('saas') && (canDisplayAdminMenu || staffAccess?.splitTestMetrics || staffAccess?.splitTestManagement)
+	- const canDisplaySurveyMenu = hasFeature('saas') && canDisplayAdminMenu
+	- const canDisplayScriptLogMenu = hasFeature('saas') && canDisplayAdminMenu
+	- const enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
+	- const showSignUpLink = hasFeature('registration-page')

-		meta(name="ol-navbar" data-type="json" content={
-			customLogo: settings.nav.custom_logo,
-			title: nav.title,
-			canDisplayAdminMenu,
-			canDisplayAdminRedirect,
-			canDisplaySplitTestMenu,
-			canDisplaySurveyMenu,
-			canDisplayScriptLogMenu,
-			enableUpgradeButton,
-			suppressNavbarRight: !!suppressNavbarRight,
-			suppressNavContentLinks: !!suppressNavContentLinks,
-			showSubscriptionLink: nav.showSubscriptionLink,
-			showSignUpLink: showSignUpLink,
-			currentUrl: currentUrl,
-			sessionUser: sessionUser ? { email: sessionUser.email} : undefined,
-			adminUrl: settings.adminUrl,
-			items: cloneAndTranslateText(nav.header_extras)
-		})
-		meta(name="ol-footer" data-type="json" content={
-			showThinFooter: showThinFooter,
-			showPoweredBy: !hasFeature('saas') && !settings.nav.hide_powered_by,
-			subdomainLang: settings.i18n.subdomainLang,
-			translatedLanguages: settings.translatedLanguages,
-			leftItems: cloneAndTranslateText(settings.nav.left_footer),
-			rightItems: settings.nav.right_footer
-		})
+	meta(name="ol-navbar" data-type="json" content={
+		customLogo: settings.nav.custom_logo,
+		title: nav.title,
+		canDisplayAdminMenu,
+		canDisplayAdminRedirect,
+		canDisplaySplitTestMenu,
+		canDisplaySurveyMenu,
+		canDisplayScriptLogMenu,
+		enableUpgradeButton,
+		suppressNavbarRight: !!suppressNavbarRight,
+		suppressNavContentLinks: !!suppressNavContentLinks,
+		showSubscriptionLink: nav.showSubscriptionLink,
+		showSignUpLink: showSignUpLink,
+		currentUrl: currentUrl,
+		sessionUser: sessionUser ? { email: sessionUser.email} : undefined,
+		adminUrl: settings.adminUrl,
+		items: cloneAndTranslateText(nav.header_extras)
+	})
+	meta(name="ol-footer" data-type="json" content={
+		showThinFooter: showThinFooter,
+		showPoweredBy: !hasFeature('saas') && !settings.nav.hide_powered_by,
+		subdomainLang: settings.i18n.subdomainLang,
+		translatedLanguages: settings.translatedLanguages,
+		leftItems: cloneAndTranslateText(settings.nav.left_footer),
+		rightItems: settings.nav.right_footer
+	})

 block body
 	if (typeof suppressNavbar === "undefined")
-		if bootstrapVersion === 5
-			include layout/navbar-marketing-react-bootstrap-5
-		else
-			include layout/navbar-marketing
+		include layout/navbar-marketing-react-bootstrap-5

 	block content

 	if (typeof suppressFooter === "undefined")
 		if showThinFooter
-			if bootstrapVersion === 5
-				include layout/thin-footer-bootstrap-5
-			else
-				include layout/thin-footer
+			include layout/thin-footer-bootstrap-5
 		else
-			if bootstrapVersion === 5
-				include layout/fat-footer-react-bootstrap-5
-			else
-				include layout/fat-footer
+			include layout/fat-footer-react-bootstrap-5

 	if (typeof suppressCookieBanner === "undefined")
 		include _cookie_banner
-
-	if bootstrapVersion === 3
-		!= moduleIncludes("contactModal-marketing", locals)
-		
-block prepend foot-scripts
-	//- Only include Bootstrap JS if using Bootstrap 3 
-	if bootstrapVersion === 3
-		+bootstrap-js(3)
--- a/services/web/app/views/project/editor/socket_diagnostics.pug
+++ b/services/web/app/views/project/editor/socket_diagnostics.pug
@@ -1,4 +1,4 @@
-extends ../../layout-marketing
+extends ../../layout-react

 block vars
 	- var suppressNavbar = true
--- a/services/web/app/views/project/token/access-react.pug
+++ b/services/web/app/views/project/token/access-react.pug
@@ -1,4 +1,4 @@
-extends ../../layout-marketing
+extends ../../layout-react

 block entrypointVar
 	- entrypoint = 'pages/token-access'
--- a/services/web/app/views/project/token/sharing-updates.pug
+++ b/services/web/app/views/project/token/sharing-updates.pug
@@ -1,4 +1,4 @@
-extends ../../layout-marketing
+extends ../../layout-react

 block entrypointVar
 	- entrypoint = 'pages/sharing-updates'
@@ -9,6 +9,7 @@ block vars
 	- var suppressSkipToContent = true

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-project_id" data-type="string" content=projectId)

 block content
--- a/services/web/app/views/subscriptions/add-seats.pug
+++ b/services/web/app/views/subscriptions/add-seats.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/add-seats'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-groupName", data-type="string", content=groupName)
 	meta(name="ol-subscriptionId", data-type="string", content=subscriptionId)
 	meta(name="ol-totalLicenses", data-type="number", content=totalLicenses)
--- a/services/web/app/views/subscriptions/manually-collected-subscription.pug
+++ b/services/web/app/views/subscriptions/manually-collected-subscription.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/manually-collected-subscription'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-groupName", data-type="string", content=groupName)

 block content
--- a/services/web/app/views/subscriptions/missing-billing-information.pug
+++ b/services/web/app/views/subscriptions/missing-billing-information.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/missing-billing-information'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-groupName", data-type="string", content=groupName)

 block content
--- a/services/web/app/views/subscriptions/preview-change.pug
+++ b/services/web/app/views/subscriptions/preview-change.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/preview-change'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-subscriptionChangePreview" data-type="json" content=changePreview)
 	meta(name="ol-purchaseReferrer" data-type="string" content=purchaseReferrer)

--- a/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug
+++ b/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/subtotal-limit-exceeded'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-groupName", data-type="string", content=groupName)

 block content
--- a/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug
+++ b/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/upgrade-group-subscription'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-subscriptionChangePreview" data-type="json" content=changePreview)
 	meta(name="ol-totalLicenses", data-type="number", content=totalLicenses)
 	meta(name="ol-groupName", data-type="string", content=groupName)
--- a/services/web/app/views/user/compromised_password.pug
+++ b/services/web/app/views/user/compromised_password.pug
@@ -1,4 +1,4 @@
-extends ../layout-marketing
+extends ../layout-react

 block vars
 	- var suppressNavbar = true
--- a/services/web/app/views/user/confirmSecondaryEmail.pug
+++ b/services/web/app/views/user/confirmSecondaryEmail.pug
@@ -1,4 +1,4 @@
-extends ../layout-marketing
+extends ../layout-react

 block vars
 	- var suppressNavbar = true
--- a/services/web/app/views/user_membership/group-managers-react.pug
+++ b/services/web/app/views/user_membership/group-managers-react.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/group-managers'

 block append meta
+	meta(name="ol-user", data-type="json", content=user)
 	meta(name="ol-users", data-type="json", content=users)
 	meta(name="ol-groupId", data-type="string", content=groupId)
 	meta(name="ol-groupName", data-type="string", content=name)
--- a/services/web/app/views/user_membership/group-members-react.pug
+++ b/services/web/app/views/user_membership/group-members-react.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/group-members'
 		
 block append meta
+	meta(name="ol-user", data-type="json", content=user)
 	meta(name="ol-users", data-type="json", content=users)
 	meta(name="ol-groupId", data-type="string", content=groupId)
 	meta(name="ol-groupName", data-type="string", content=name)
--- a/services/web/app/views/user_membership/institution-managers-react.pug
+++ b/services/web/app/views/user_membership/institution-managers-react.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/institution-managers'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-users", data-type="json", content=users)
 	meta(name="ol-groupId", data-type="string", content=groupId)
 	meta(name="ol-groupName", data-type="string", content=name)
--- a/services/web/app/views/user_membership/publisher-managers-react.pug
+++ b/services/web/app/views/user_membership/publisher-managers-react.pug
@@ -1,9 +1,10 @@
-extends ../layout-marketing
+extends ../layout-react

 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/publisher-managers'

 block append meta
+	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-users", data-type="json", content=users)
 	meta(name="ol-groupId", data-type="string", content=groupId)
 	meta(name="ol-groupName", data-type="string", content=name)
--- a/services/web/frontend/js/pages/sharing-updates.tsx
+++ b/services/web/frontend/js/pages/sharing-updates.tsx
@@ -1,6 +1,7 @@
 import './../utils/meta'
 import '../utils/webpack-public-path'
 import './../infrastructure/error-reporter'
+import './../features/header-footer-react'
 import '@/i18n'
 import { createRoot } from 'react-dom/client'
 import SharingUpdatesRoot from '../features/token-access/components/sharing-updates-root'
--- a/services/web/modules/user-activate/app/views/user/register.pug
+++ b/services/web/modules/user-activate/app/views/user/register.pug
@@ -1,8 +1,11 @@
-extends ../../../../../app/views/layout-marketing
+extends ../../../../../app/views/layout-react

 block entrypointVar
 	- entrypoint = 'modules/user-activate/pages/user-activate-page'

+block append meta
+	meta(name="ol-user" data-type="json" content=user)
+
 block content
 	.content.content-alt#main-content
 		.container