From 11de9a366c232d26003f815da361dc62293b8bc0 Mon Sep 17 00:00:00 2001 From: Jimmy Domagala-Tang Date: Thu, 12 Dec 2024 11:37:45 -0500 Subject: [PATCH] Merge pull request #19302 from overleaf/jdt-institution-buttons-temp Jdt institution buttons temp GitOrigin-RevId: 2b2e93014e2a219a633a7ce09a00033cc1157496 --- .../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 ec16744a44..674fa76d66 100644 --- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug +++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug @@ -62,14 +62,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 { @@ -182,4 +183,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 01676bbfe7..94ddb82647 100644 --- a/services/web/app/views/layout/navbar-marketing.pug +++ b/services/web/app/views/layout/navbar-marketing.pug @@ -62,14 +62,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 { @@ -174,5 +175,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 58616f9c3e..27e90fbb1b 100644 --- a/services/web/app/views/layout/navbar-website-redesign.pug +++ b/services/web/app/views/layout/navbar-website-redesign.pug @@ -62,14 +62,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 { @@ -174,5 +175,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')}