github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 23:55:33 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

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

GitOrigin-RevId: 270e11f0cfd09830e5c7600d636b8ebbfc6049a2
This commit is contained in:
M Fahru 2022-06-14 05:37:33 -04:00 committed by Copybot
parent 0204d7947f
commit 1070dd53f3
2 changed files with 116 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

223
services/web/app/views/layout/navbar.pug
View file

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

4
services/web/app/views/subscriptions/interstitial-payment.pug
View file

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