From fe623d2297b0e06dc751c1f1841b1f9655e43ab0 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Fri, 10 Jan 2025 09:57:52 +0100 Subject: [PATCH] Merge pull request #22264 from overleaf/msm-login_support_text-env [web] Add `OVERLEAF_LOGIN_SUPPORT_TEXT` for CE/SP login pages GitOrigin-RevId: 7f473b6a3448b4cb73c0c954d0ea1db34b980d6c --- server-ce/config/settings.js | 4 ++++ services/web/app/src/Features/User/UserPagesController.mjs | 1 + services/web/app/views/user/login.pug | 4 ++++ services/web/frontend/stylesheets/components/buttons.less | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/server-ce/config/settings.js b/server-ce/config/settings.js index 365b3314a2..a4b5ed1781 100644 --- a/server-ce/config/settings.js +++ b/server-ce/config/settings.js @@ -331,6 +331,10 @@ if (process.env.OVERLEAF_HEADER_EXTRAS != null) { } } +if (process.env.OVERLEAF_LOGIN_SUPPORT_TEXT != null) { + settings.nav.login_support_text = process.env.OVERLEAF_LOGIN_SUPPORT_TEXT +} + // Sending Email // ------------- // diff --git a/services/web/app/src/Features/User/UserPagesController.mjs b/services/web/app/src/Features/User/UserPagesController.mjs index edf8b72e8e..3c9e747d3b 100644 --- a/services/web/app/src/Features/User/UserPagesController.mjs +++ b/services/web/app/src/Features/User/UserPagesController.mjs @@ -222,6 +222,7 @@ const UserPagesController = { } res.render('user/login', { title: 'login', + login_support_text: Settings.nav?.login_support_text, }) }, diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug index 7e4148bcad..522aff3cde 100644 --- a/services/web/app/views/user/login.pug +++ b/services/web/app/views/user/login.pug @@ -40,3 +40,7 @@ block content span(data-ol-inflight="idle") #{translate("login")} span(hidden data-ol-inflight="pending") #{translate("logging_in")}… a.pull-right(href='/user/password/reset') #{translate("forgot_your_password")}? + if login_support_text + hr + p.text-center !{login_support_text} + diff --git a/services/web/frontend/stylesheets/components/buttons.less b/services/web/frontend/stylesheets/components/buttons.less index 4ce8459bc2..ec2b5df2e1 100755 --- a/services/web/frontend/stylesheets/components/buttons.less +++ b/services/web/frontend/stylesheets/components/buttons.less @@ -285,3 +285,7 @@ input[type='button'] { padding-left: 20px; padding-right: 0; } + +.login-btn-dynamic-text { + white-space: normal; +}