Remove footer and rightside of the navbar on the interstitial payment page (#8407)

Co-authored with Thomas Mees (thomas.mees@overleaf.com)

GitOrigin-RevId: 270e11f0cfd09830e5c7600d636b8ebbfc6049a2

services/web/app/views/layout/navbar.pug

@@ -1,8 +1,9 @@
 nav.navbar.navbar-default.navbar-main
 	.container-fluid
 		.navbar-header
-			button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}", aria-label="Toggle " + translate('navigation'))
-				i.fa.fa-bars(aria-hidden="true")
+			if (typeof(suppressNavbarRight) == "undefined")
+				button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}", aria-label="Toggle " + translate('navigation'))
+					i.fa.fa-bars(aria-hidden="true")
 			if settings.nav.custom_logo
 				a(href='/', aria-label=settings.appName, style='background-image:url("'+settings.nav.custom_logo+'")').navbar-brand
 			else if (nav.title)
@@ -13,53 +14,67 @@ nav.navbar.navbar-default.navbar-main
 		- var canDisplayAdminMenu = hasAdminAccess()
 		- var canDisplayAdminRedirect = canRedirectToAdminDomain()
 		- var canDisplaySplitTestMenu = hasFeature('saas') && (canDisplayAdminMenu || (getSessionUser() && getSessionUser().staffAccess && (getSessionUser().staffAccess.splitTestMetrics || getSessionUser().staffAccess.splitTestManagement)))
-		.navbar-collapse.collapse(collapse="navCollapsed")
-			ul.nav.navbar-nav.navbar-right
-				if (canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu)
-					li.dropdown(class="subdued", dropdown)
-						a.dropdown-toggle(href, dropdown-toggle)
-							| Admin
-							b.caret
-						ul.dropdown-menu
-							if canDisplayAdminMenu
-								li
-									a(href="/admin") Manage Site
-								li
-									a(href="/admin/user") Manage Users
-								li
-									a(href="/admin/project") Project URL Lookup
-							if canDisplayAdminRedirect
-								li
-									a(href=settings.adminUrl) Switch to Admin
-							if canDisplaySplitTestMenu
-								li
-									a(href="/admin/split-test") Manage Split Tests
 
-				// loop over header_extras
-				each item in ((splitTestVariants && (splitTestVariants['unified-navigation'] === 'show-unified-navigation')) ? nav.header_extras_unified : nav.header_extras)
-					-
-						if ((item.only_when_logged_in && getSessionUser())
-							|| (item.only_when_logged_out && (!getSessionUser()))
-							|| (!item.only_when_logged_out && !item.only_when_logged_in && !item.only_content_pages)
-							|| (item.only_content_pages && (typeof(suppressNavContentLinks) == "undefined" || !suppressNavContentLinks))
-						){ 
-							var showNavItem = true
-						} else {
-							var showNavItem = false
-						}
+		if (typeof(suppressNavbarRight) == "undefined")
+			.navbar-collapse.collapse(collapse="navCollapsed")
+				ul.nav.navbar-nav.navbar-right
+					if (canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu)
+						li.dropdown(class="subdued", dropdown)
+							a.dropdown-toggle(href, dropdown-toggle)
+								| Admin
+								b.caret
+							ul.dropdown-menu
+								if canDisplayAdminMenu
+									li
+										a(href="/admin") Manage Site
+									li
+										a(href="/admin/user") Manage Users
+									li
+										a(href="/admin/project") Project URL Lookup
+								if canDisplayAdminRedirect
+									li
+										a(href=settings.adminUrl) Switch to Admin
+								if canDisplaySplitTestMenu
+									li
+										a(href="/admin/split-test") Manage Split Tests
+
+					// loop over header_extras
+					each item in ((splitTestVariants && (splitTestVariants['unified-navigation'] === 'show-unified-navigation')) ? nav.header_extras_unified : nav.header_extras)
+						-
+							if ((item.only_when_logged_in && getSessionUser())
+								|| (item.only_when_logged_out && (!getSessionUser()))
+								|| (!item.only_when_logged_out && !item.only_when_logged_in && !item.only_content_pages)
+								|| (item.only_content_pages && (typeof(suppressNavContentLinks) == "undefined" || !suppressNavContentLinks))
+							){ 
+								var showNavItem = true
+							} else {
+								var showNavItem = false
+							}
 
-					if showNavItem
-						if item.dropdown
-							li.dropdown(class=item.class, dropdown)
-								a.dropdown-toggle(href, dropdown-toggle)
-									| !{translate(item.text)}
-									b.caret
-								ul.dropdown-menu
-									each child in item.dropdown
-										if child.divider
-											li.divider
-										if child.splitTest 
-											if (splitTestVariants && (splitTestVariants[child.splitTest.name] === child.splitTest.variant))
+						if showNavItem
+							if item.dropdown
+								li.dropdown(class=item.class, dropdown)
+									a.dropdown-toggle(href, dropdown-toggle)
+										| !{translate(item.text)}
+										b.caret
+									ul.dropdown-menu
+										each child in item.dropdown
+											if child.divider
+												li.divider
+											if child.splitTest 
+												if (splitTestVariants && (splitTestVariants[child.splitTest.name] === child.splitTest.variant))
+													li
+														if child.url
+															a(
+																href=child.url,
+																class=child.class,
+																event-tracking=child.event
+																event-tracking-mb="true"
+																event-tracking-trigger="click"
+															) !{translate(child.text)}
+														else
+															| !{translate(child.text)}
+											else
 												li
 													if child.url
 														a(
@@ -71,75 +86,63 @@ nav.navbar.navbar-default.navbar-main
 														) !{translate(child.text)}
 													else
 														| !{translate(child.text)}
-										else
-											li
-												if child.url
-													a(
-														href=child.url,
-														class=child.class,
-														event-tracking=child.event
-														event-tracking-mb="true"
-														event-tracking-trigger="click"
-													) !{translate(child.text)}
-												else
-													| !{translate(child.text)}
-						else
-							li(class=item.class)
-								if item.url
-									a(
-										href=item.url,
-										class=item.class,
-										event-tracking=item.event
-										event-tracking-mb="true"
-										event-tracking-trigger="click"
-									) !{translate(item.text)}
-								else
-									| !{translate(item.text)}
+							else
+								li(class=item.class)
+									if item.url
+										a(
+											href=item.url,
+											class=item.class,
+											event-tracking=item.event
+											event-tracking-mb="true"
+											event-tracking-trigger="click"
+										) !{translate(item.text)}
+									else
+										| !{translate(item.text)}
+
+					// logged out
+					if !getSessionUser()
+						// register link
+						if hasFeature('registration-page')
+							li
+								a(
+									href="/register"
+									event-tracking="menu-clicked-register"
+									event-tracking-action="clicked"
+									event-tracking-trigger="click"
+									event-tracking-mb="true"
+									event-segmentation={ page: currentUrl }
+								) #{translate('register')}
 
-				// logged out
-				if !getSessionUser()
-					// register link
-					if hasFeature('registration-page')
+						// login link
 						li
 							a(
-								href="/register"
-								event-tracking="menu-clicked-register"
+								href="/login"
+								event-tracking="menu-clicked-login"
 								event-tracking-action="clicked"
 								event-tracking-trigger="click"
 								event-tracking-mb="true"
 								event-segmentation={ page: currentUrl }
-							) #{translate('register')}
+							) #{translate('log_in')}
 
-					// login link
-					li
-						a(
-							href="/login"
-							event-tracking="menu-clicked-login"
-							event-tracking-action="clicked"
-							event-tracking-trigger="click"
-							event-tracking-mb="true"
-							event-segmentation={ page: currentUrl }
-						) #{translate('log_in')}
-
-				// projects link and account menu
-				if getSessionUser()
-					li
-						a(href="/project") #{translate('Projects')}
-					li.dropdown(dropdown)
-						a.dropdown-toggle(href, dropdown-toggle)
-							| #{translate('Account')}
-							b.caret
-						ul.dropdown-menu
-							li
-								div.subdued {{ usersEmail }}
-							li.divider.hidden-xs.hidden-sm
-							li
-								a(href="/user/settings") #{translate('Account Settings')}
-							if nav.showSubscriptionLink
+					// projects link and account menu
+					if getSessionUser()
+						li
+							a(href="/project") #{translate('Projects')}
+						li.dropdown(dropdown)
+							a.dropdown-toggle(href, dropdown-toggle)
+								| #{translate('Account')}
+								b.caret
+							ul.dropdown-menu
 								li
-									a(href="/user/subscription") #{translate('subscription')}
-							li.divider.hidden-xs.hidden-sm
-							li
-								form(method="POST" action="/logout")
-									input(name='_csrf', type='hidden', value=csrfToken)
-									button.btn-link.text-left.dropdown-menu-button #{translate('log_out')}
+									div.subdued {{ usersEmail }}
+								li.divider.hidden-xs.hidden-sm
+								li
+									a(href="/user/settings") #{translate('Account Settings')}
+								if nav.showSubscriptionLink
+									li
+										a(href="/user/subscription") #{translate('subscription')}
+								li.divider.hidden-xs.hidden-sm
+								li
+									form(method="POST" action="/logout")
+										input(name='_csrf', type='hidden', value=csrfToken)
+										button.btn-link.text-left.dropdown-menu-button #{translate('log_out')}

services/web/app/views/subscriptions/interstitial-payment.pug

@@ -1,4 +1,4 @@
-extends ../layout-marketing
+extends ../layout
 
 include ./plans-marketing/_mixins
 include ./plans-marketing/_tables
@@ -6,6 +6,8 @@ include ./plans-marketing/v2/_mixins
 
 block vars
 	- entrypoint = 'pages/user/subscription/plans-v2/plans-v2-main'
+	- var suppressFooter = true
+	- var suppressNavbarRight = true
 
 block append meta
 	meta(name="ol-recommendedCurrency" content=recommendedCurrency)