From 22bf2ced219c3d513823f4ca245cb3d6d22e8f8f Mon Sep 17 00:00:00 2001 From: Jimmy Domagala-Tang Date: Tue, 11 Feb 2025 09:25:57 -0600 Subject: [PATCH] Merge pull request #23516 from overleaf/jdt-institution-buttons-temp Jdt institution buttons temp GitOrigin-RevId: 42771f3047088bfa2bd1dfdd89eb990392dd113c --- .../app/views/layout/navbar-marketing-bootstrap-5.pug | 9 +++++---- services/web/app/views/layout/navbar-marketing.pug | 9 +++++---- .../web/app/views/layout/navbar-website-redesign.pug | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug index 1c527c93d2..dc5e1abe2a 100644 --- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug +++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug @@ -66,14 +66,15 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={ +dropdown-menu-link-item()(href="/admin/split-test") Manage Feature Flags if canDisplaySurveyMenu +dropdown-menu-link-item()(href="/admin/survey") Manage Surveys + +dropdown-menu-link-item()(href="/admin/institutions") Manage Institutional Policies // loop over header_extras each item in 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)) + || (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 { @@ -195,4 +196,4 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={ action="/logout", id="logOutForm" ) - input(name='_csrf', type='hidden', value=csrfToken) + input(name='_csrf' type='hidden', value=csrfToken) diff --git a/services/web/app/views/layout/navbar-marketing.pug b/services/web/app/views/layout/navbar-marketing.pug index ebf698f726..48d4b38a8c 100644 --- a/services/web/app/views/layout/navbar-marketing.pug +++ b/services/web/app/views/layout/navbar-marketing.pug @@ -66,14 +66,15 @@ nav.navbar.navbar-default.navbar-main if canDisplaySurveyMenu li a(href="/admin/survey") Manage Surveys + a(href="/admin/institutions") Manage Institutional Policies // loop over header_extras each item in 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)) + || (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 { @@ -187,5 +188,5 @@ nav.navbar.navbar-default.navbar-main li.divider.hidden-xs.hidden-sm li form(method="POST" action="/logout") - input(name='_csrf', type='hidden', value=csrfToken) + input(name='_csrf' type='hidden', value=csrfToken) button.btn-link.text-left.dropdown-menu-button #{translate('log_out')} diff --git a/services/web/app/views/layout/navbar-website-redesign.pug b/services/web/app/views/layout/navbar-website-redesign.pug index 3e18ca94bc..cd2243e7ee 100644 --- a/services/web/app/views/layout/navbar-website-redesign.pug +++ b/services/web/app/views/layout/navbar-website-redesign.pug @@ -66,14 +66,15 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar if canDisplaySurveyMenu li a(href="/admin/survey") Manage Surveys + a(href="/admin/institutions") Manage Institutional Policies // loop over header_extras each item in 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)) + || (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 { @@ -187,5 +188,5 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar li.divider.hidden-xs.hidden-sm li form(method="POST" action="/logout") - input(name='_csrf', type='hidden', value=csrfToken) + input(name='_csrf' type='hidden', value=csrfToken) button.btn-link.text-left.dropdown-menu-button #{translate('log_out')}