From 0672255d67e9d2b3c92296385532d7f90b15da12 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 10:57:40 -0400 Subject: [PATCH 01/12] Update font-awesome --- package.json | 5 ++++- yarn.lock | 34 +++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9502e338fe6..4204703c9f6 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,10 @@ "@centerforopenscience/markdown-it-toc": "~1.1.1", "@centerforopenscience/markdown-it-video": "1.0.0", "@centerforopenscience/osf-style": "1.9.0", + "@fortawesome/fontawesome-free": "^7.0.1", + "@fortawesome/fontawesome-svg-core": "^7.0.1", + "@fortawesome/free-brands-svg-icons": "^7.0.1", + "@fortawesome/react-fontawesome": "^3.0.2", "URIjs": "^1.14.1", "assets-webpack-plugin": "^2.3.0", "babel-core": "^6.0.0", @@ -25,7 +29,6 @@ "dropzone": "https://github.com/CenterForOpenScience/dropzone.git#aba21eb6b82cc823ac7a7a53d6e035791c082bae", "exports-loader": "0.6.3", "file-loader": "^0.11.2", - "font-awesome": "^4.4.0", "font-awesome-webpack": "0.0.5-beta.2", "gsap": "3.9.1", "highlight.js": "~9.18.2", diff --git a/yarn.lock b/yarn.lock index 7dcf3023814..70f26dd5a2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,6 +34,35 @@ resolved "https://registry.yarnpkg.com/@centerforopenscience/osf-style/-/osf-style-1.9.0.tgz#0ab5cb17e2c531aafcc19e226f36ff86b734116e" integrity sha512-R9IBVbz4eb/NkoM5TZGH46T9m5jspwK0H605O0oSMggHZPcTrf5gAHw0axeC26nKmEpz2FSXjvm84ziPNvhsvA== +"@fortawesome/fontawesome-common-types@7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-7.0.1.tgz#e9ab94b1ca93e7020e3c7eda2ef1ba8cca8ba1dc" + integrity sha512-0VpNtO5cNe1/HQWMkl4OdncYK/mv9hnBte0Ew0n6DMzmo3Q3WzDFABHm6LeNTipt5zAyhQ6Ugjiu8aLaEjh1gg== + +"@fortawesome/fontawesome-free@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz#c1ac7f07ba2df47d1de7b7236fad25c4e6ca5076" + integrity sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw== + +"@fortawesome/fontawesome-svg-core@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-7.0.1.tgz#f5f7bbfe09e7cc35fd30eefe6be018d2e9c5dd4d" + integrity sha512-x0cR55ILVqFpUioSMf6ebpRCMXMcheGN743P05W2RB5uCNpJUqWIqW66Lap8PfL/lngvjTbZj0BNSUweIr/fHQ== + dependencies: + "@fortawesome/fontawesome-common-types" "7.0.1" + +"@fortawesome/free-brands-svg-icons@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-7.0.1.tgz#2a975ae2a26710cb2b34c25d4fe706dcd4747f69" + integrity sha512-6xPmn5SrND/GM0+W33E77x05+aDn6RpR02eWd8eLdN0IxY0vXa5yU/ugaAKloOVxiG9w2330TSRsbJYL6c57Ow== + dependencies: + "@fortawesome/fontawesome-common-types" "7.0.1" + +"@fortawesome/react-fontawesome@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-3.0.2.tgz#275ab6bc04977e145b072ba18c24779eb3427073" + integrity sha512-cmp/nT0pPC7HUALF8uc3+D5ECwEBWxYQbOIHwtGUWEu72sWtZc26k5onr920HWOViF0nYaC+Qzz6Ln56SQcaVg== + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.1" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301" @@ -1580,11 +1609,6 @@ font-awesome-webpack@0.0.5-beta.2: less-loader "~2.2.3" style-loader "~0.13.1" -font-awesome@^4.4.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= - from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" From 4f0dc4797fd18059d40944ee7746afe2302ca63d Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 11:07:59 -0400 Subject: [PATCH 02/12] Update font-awesome import --- website/static/js/pages/base-page.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/static/js/pages/base-page.js b/website/static/js/pages/base-page.js index 877239bd271..4ad5229ac46 100644 --- a/website/static/js/pages/base-page.js +++ b/website/static/js/pages/base-page.js @@ -8,7 +8,8 @@ require('../../vendor/bootstrap-editable-custom/css/bootstrap-editable.css'); require('../../vendor/bower_components/jquery-ui/themes/base/resizable.css'); require('../../css/bootstrap-xl.css'); require('../../css/animate.css'); -require('font-awesome-webpack'); + +import "@fortawesome/fontawesome-free/css/all.css"; var $ = require('jquery'); var Cookie = require('js-cookie'); From 09a85b54c5b35ff13a022c2521d2b5b4ad96b93f Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 11:08:12 -0400 Subject: [PATCH 03/12] Update CSS --- website/static/css/style.css | 230 ++++++++++++++++++++++++++++++++++- 1 file changed, 228 insertions(+), 2 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index 73403900b5c..02b1f53b082 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -4,7 +4,6 @@ html, body { } body { - padding-top: 50px; /* body padding for fixed top nav */ position: relative; /* for bootstrap affix */ -webkit-font-smoothing: antialiased; font-family: 'Open Sans', 'Helvetica Neue', sans-serif; @@ -38,6 +37,19 @@ a { /* Footer -------------------------------------------------- */ +.footer-wrapper { + margin-top: 20px; + text-shadow: 0 1px 0 #fff; + width: 100%; + color: #515151; + text-align: center; + background-color: #e6f1fc; + border-radius: 0 0 0 0.75rem; + + .footer-row:first-of-type { + background-color: #f1f8fd; + } +} .footer { padding-top: 10px; margin-top: 20px; @@ -52,13 +64,25 @@ a { color: #2d6a9f; } - .footer ul, .footer li { padding: 0; margin: 0; list-style-type: none; } +.footer-row { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + align-items: center; + padding: 1.5em; +} + +.footer-logo span { + font-size: 20px; + width: 44px; +} + /* Warning Banner for cookies and browser depreciation goes on bottom of page */ .warningBanner { margin-bottom: 0px; @@ -82,6 +106,15 @@ a { color: #264F82; } +.footer-social-links-list { + display: inline-flex; +} + +.footer-links-list { + display: inline-flex; + gap: 0.5em; +} + .warningBannerText { margin-left: 10%; margin-right: 75px; @@ -954,3 +987,196 @@ table.add-links { .text-smaller { color: #4d4d4d; } + +/* Override of Bootstrap button styles */ +.container.container { + width: auto !important; +} + +.btn.btn { + border-radius: 6px; + padding-block: 0.5rem; + padding-inline: 1rem; + font-weight: 700; +} + +.btn-primary.btn-primary { + color: #fff; + background-color: #337ab7; + border-color: #2e6da4; +} + +.btn-secondary.btn-secondary { + color: #337ab7; + background: #f1f8fd; +} + +input.form-control.form-control { + border-radius: 6px; +} + +/* Utility classes */ + +.border-top { + border-top: 1px solid #eee; +} + +.flex-row { + display: flex; +} + +.gap-1 { + gap: 1em; +} + +.flex-grow-1 { + flex-grow: 1; +} + +.padding-top-2 { + padding-top: 2em; +} + +.navbar { + background: #24384a; +} + +.main-wrapper { + display: flex; + min-height: 100vh; + flex-direction: row; + background: #24384a; +} + +.content-wrapper { + flex-grow: 1; + display: flex; + flex-direction: column; + background: #f7f7f7; + height: 100vh; + overflow-y: auto; +} + +.main-content { + min-width: 80%; + max-width: 1200px; + width: 100%; + margin: 50px auto 0; + display: flex; + align-items: center; +} + +.left-logo { + display: inline-flex; + align-items: center; + margin-left: 0 !important; + height: 100%; + line-height: 27px !important; + gap: 8px; + font-size: 32px; + font-weight: lighter; + color: #f7f7f7; + + .osf-navbar-logo { + width: 33px; + height: 33px; + margin: 6px 0 0 12px; + } +} + +.toggle-nav-input { + float: right; +} + +.toggle-nav-label { + color: #f7f7f7; + float: right; + margin: 12px; +} + +.slideout { + position: fixed; + top: 0; + left: 0; + height: 100%; + background: #24384a; + color: #f7f7f7; + transition: transform 0.3s ease; + margin-left: 0 !important; +} + +.left-pane-nav { + width: 250px; + max-width: 250px; + height: 100vh; + overflow-y: auto; + scrollbar-width: thin; + scrollbar-color: #eff0f1 #24384a; +} + +.left-pane-ul { + list-style: none; + padding: 0; + margin: 0; + margin-top: 2em; + margin-bottom: 4em; + + li { + margin-bottom: 2em; + } + + a { + display: flex; + padding: 0.75em; + gap: 0.5em; + width: 100%; + font-weight: 400; + color: #F7F7F7; + text-decoration: none; + } + + a:hover { + background: #384b5c; + border-radius: 0.375em; + } +} + +.chevron-right { + margin-left: auto; +} + +@media (min-width: 1200px){ + .content-wrapper { + border-radius: 0.75rem 0 0 0.75rem; + } + .slideout { + transform: translateX(0); + } + .desktop-only { + display: block; + } + .mobile-only { + display: none; + } +} + +@media (max-width: 1199.99px){ + .slideout { + transform: translateX(-100%); + } + + input#toggle-leftnav:checked~.slideout { + transform: translateX(0); + } + .desktop-only { + display: none; + } + .mobile-only { + display: block; + } +} + +#slideout-nav { + margin-left: 0 !important; + margin-top: 50px; +} From b62a661f43be1637a1651c341b599339aa0c6ef6 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 11:09:10 -0400 Subject: [PATCH 04/12] Update footer --- website/templates/footer.mako | 118 +++++++++++++++++----------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/website/templates/footer.mako b/website/templates/footer.mako index b6ddc4f7637..8a8dac29638 100644 --- a/website/templates/footer.mako +++ b/website/templates/footer.mako @@ -1,63 +1,61 @@ + <% from datetime import datetime %> -
-
-
-
-

- - Copyright © 2011-${datetime.utcnow().year} - - - Center for Open Science - - - | - - - Terms of Use - - - | - - - Privacy Policy - - - | - - - Status - - - | - - - API - -
- - TOP Guidelines - - - | - - - Reproducibility Project: Psychology - - - | - - - Reproducibility Project: Cancer Biology - -

-

- - - - -

-
-
+
+
+ + + Center for Open Science + + +
+ + + + +
+
+
+
+ + Terms of Use + + | + + Privacy Policy + + | + + Status + + | + + API + + | + + TOP Guidelines + +
+ + Copyright © 2011-${datetime.utcnow().year} + From ba3b9d33bfa62232b7312362839f628e312c6139 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 11:11:26 -0400 Subject: [PATCH 05/12] WIP nav and base mako --- website/templates/base.mako | 88 ++++++----- website/templates/nav.mako | 306 ++++++++++++++++++++++++++---------- 2 files changed, 271 insertions(+), 123 deletions(-) diff --git a/website/templates/base.mako b/website/templates/base.mako index 642f8ffa03c..a170179c37e 100644 --- a/website/templates/base.mako +++ b/website/templates/base.mako @@ -142,53 +142,57 @@
WARNING: This site is running in development mode.
% endif +
+ ${self.nav()} +
+ ## TODO: shouldn't always have the watermark class +
+ ${self.content_wrap()} +
- ${self.nav()} - ## TODO: shouldn't always have the watermark class - ${self.content_wrap()} -
-
-
- OSF does not support the use of Internet Explorer. For optimal performance, please switch to another browser. -
-
-
Accept
-
-
- % if not user_id: -
-
- This website relies on cookies to help provide a better user experience. By clicking Accept or continuing to use the site, you agree. For more information, - see our Privacy Policy - and information on cookie use. -
-
-
Accept
-
-
-
-
-
- -% endif + % endif ${self.footer()} @@ -279,6 +283,8 @@ % endif ${self.javascript_bottom()} +
+
diff --git a/website/templates/nav.mako b/website/templates/nav.mako index ce9733291eb..753e3e9e02c 100644 --- a/website/templates/nav.mako +++ b/website/templates/nav.mako @@ -2,97 +2,239 @@ - + + + +
From c2a9ec42e84b84f6efb0a76c22e5ce6f21ff378f Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 14:12:49 -0400 Subject: [PATCH 06/12] Update to styling for main content background --- website/static/css/style.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index 02b1f53b082..37d445f9ac7 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -1052,18 +1052,22 @@ input.form-control.form-control { flex-grow: 1; display: flex; flex-direction: column; - background: #f7f7f7; height: 100vh; overflow-y: auto; + background: linear-gradient(135deg, #e6f1fc 0%, #f7f7f7 60%, #eaf6ff 100%); + background-color: #f7f7f7; } .main-content { - min-width: 80%; - max-width: 1200px; - width: 100%; margin: 50px auto 0; display: flex; align-items: center; + + [role="main"] { + border-radius: 0.75rem; + background: #fff; + padding: 2em; + } } .left-logo { From 2e8f454f927363b0a948ae8747b0b0ac87800e78 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 14:13:29 -0400 Subject: [PATCH 07/12] Update Orcid login page --- website/templates/external_login_email.mako | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/website/templates/external_login_email.mako b/website/templates/external_login_email.mako index 69c3c168c81..46932ca859c 100644 --- a/website/templates/external_login_email.mako +++ b/website/templates/external_login_email.mako @@ -1,13 +1,15 @@ <%inherit file="base.mako"/> <%def name="title()">OSF ${external_id_provider} Login <%def name="content()"> -

OSF ${external_id_provider} Login | Register Email

+

Sign In With ${external_id_provider}

## Center the form
-

- Please enter your email to finalize the login. +

+ Please enter your email to finalize your ${external_id_provider} login. +

+

If you already have an OSF account, this will link your ${external_id_provider} profile with OSF. If not, this will create a new account for you with your ${external_id_provider} profile.

@@ -27,8 +29,10 @@ ${form.accepted_terms_of_service(required='required') | unicode, n }
- - Cancel +
+ Cancel + +
From 4c2d31b0d339365d691e7f492d5d48ecc123fd45 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 15:54:14 -0400 Subject: [PATCH 08/12] Update leftnav links and styling; Add proper icons --- website/static/css/style.css | 10 ++-- .../static/img/left-nav-icons/meetings.svg | 3 ++ .../static/img/left-nav-icons/preprints.svg | 11 ++++ .../static/img/left-nav-icons/registries.svg | 3 ++ website/templates/nav.mako | 50 +++++++++---------- 5 files changed, 48 insertions(+), 29 deletions(-) create mode 100644 website/static/img/left-nav-icons/meetings.svg create mode 100644 website/static/img/left-nav-icons/preprints.svg create mode 100644 website/static/img/left-nav-icons/registries.svg diff --git a/website/static/css/style.css b/website/static/css/style.css index 37d445f9ac7..8bff521ee8f 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -1110,8 +1110,8 @@ input.form-control.form-control { } .left-pane-nav { - width: 250px; - max-width: 250px; + width: 300px; + max-width: 300px; height: 100vh; overflow-y: auto; scrollbar-width: thin; @@ -1126,15 +1126,17 @@ input.form-control.form-control { margin-bottom: 4em; li { - margin-bottom: 2em; + margin: 0 1.5em 1em; } a { display: flex; + align-items: center; padding: 0.75em; gap: 0.5em; width: 100%; - font-weight: 400; + font-size: medium; + font-weight: 700; color: #F7F7F7; text-decoration: none; } diff --git a/website/static/img/left-nav-icons/meetings.svg b/website/static/img/left-nav-icons/meetings.svg new file mode 100644 index 00000000000..0dc4b6f11b0 --- /dev/null +++ b/website/static/img/left-nav-icons/meetings.svg @@ -0,0 +1,3 @@ + + + diff --git a/website/static/img/left-nav-icons/preprints.svg b/website/static/img/left-nav-icons/preprints.svg new file mode 100644 index 00000000000..7573b0285c8 --- /dev/null +++ b/website/static/img/left-nav-icons/preprints.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/website/static/img/left-nav-icons/registries.svg b/website/static/img/left-nav-icons/registries.svg new file mode 100644 index 00000000000..02bf3043451 --- /dev/null +++ b/website/static/img/left-nav-icons/registries.svg @@ -0,0 +1,3 @@ + + + diff --git a/website/templates/nav.mako b/website/templates/nav.mako index 753e3e9e02c..42e706a2ce6 100644 --- a/website/templates/nav.mako +++ b/website/templates/nav.mako @@ -13,19 +13,19 @@
  • - - + + Donate
    • From 3da18405c32ea181d7f7595f2b90756200ad79bb Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 17:11:20 -0400 Subject: [PATCH 09/12] Move maintenance banner to a more appropriate place --- website/static/css/style.css | 4 ++++ website/templates/base.mako | 21 +++++++++++++++++++++ website/templates/nav.mako | 22 ---------------------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index 8bff521ee8f..1a1949158ec 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -1180,6 +1180,10 @@ input.form-control.form-control { .mobile-only { display: block; } + + #maintenance { + margin-top: 50px; + } } #slideout-nav { diff --git a/website/templates/base.mako b/website/templates/base.mako index a170179c37e..45858ebb5d5 100644 --- a/website/templates/base.mako +++ b/website/templates/base.mako @@ -145,6 +145,27 @@
    ${self.nav()}
    +
    +
    +
    + ## Maintenance alert + % if maintenance: + + % endif + ## End Maintenance alert +
    +
    +
    ## TODO: shouldn't always have the watermark class
    ${self.content_wrap()} diff --git a/website/templates/nav.mako b/website/templates/nav.mako index 42e706a2ce6..3295efd7af5 100644 --- a/website/templates/nav.mako +++ b/website/templates/nav.mako @@ -234,27 +234,5 @@
- -
-
-
- ## Maintenance alert - % if maintenance: - - % endif - ## End Maintenance alert -
-
-
From b48b338fd8224978fa60a1b24f33809523ef8fb9 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 9 Oct 2025 17:12:02 -0400 Subject: [PATCH 10/12] Remove old navbar --- website/templates/nav.mako | 101 ------------------------------------- 1 file changed, 101 deletions(-) diff --git a/website/templates/nav.mako b/website/templates/nav.mako index 3295efd7af5..288dbe069e7 100644 --- a/website/templates/nav.mako +++ b/website/templates/nav.mako @@ -69,107 +69,6 @@ - -
- -
- - - -
- - - -
- From f07a82309e0c2d3397f7193aea42b15bacb0e3e9 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Fri, 10 Oct 2025 14:40:40 -0400 Subject: [PATCH 11/12] Appease jshint --- website/static/js/pages/base-page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/static/js/pages/base-page.js b/website/static/js/pages/base-page.js index 4ad5229ac46..5dc79417698 100644 --- a/website/static/js/pages/base-page.js +++ b/website/static/js/pages/base-page.js @@ -9,7 +9,7 @@ require('../../vendor/bower_components/jquery-ui/themes/base/resizable.css'); require('../../css/bootstrap-xl.css'); require('../../css/animate.css'); -import "@fortawesome/fontawesome-free/css/all.css"; +import '@fortawesome/fontawesome-free/css/all.css'; var $ = require('jquery'); var Cookie = require('js-cookie'); From fb49b4adff6e00287c9855899af5e68b47109820 Mon Sep 17 00:00:00 2001 From: Longze Chen Date: Thu, 16 Oct 2025 13:26:31 -0400 Subject: [PATCH 12/12] Rework external_login_email_get&post without push status message --- framework/auth/views.py | 22 +++++---- website/language.py | 5 +-- website/templates/external_login_email.mako | 49 +++++++++++---------- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/framework/auth/views.py b/framework/auth/views.py index 26aa494ddd4..cdb03062d88 100644 --- a/framework/auth/views.py +++ b/framework/auth/views.py @@ -1072,6 +1072,8 @@ def external_login_email_post(): destination = campaign break + status_message = None + error_list = [] if form.validate(): clean_email = form.email.data user = get_user(email=clean_email) @@ -1104,11 +1106,11 @@ def external_login_email_post(): destination=destination ) # 3. notify user - message = language.EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS.format( + status_message = language.EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS.format( + fullname=fullname, external_id_provider=external_id_provider, email=user.username ) - kind = 'success' # 4. Clear session data clear_external_first_login_anonymous_session_data(session) else: @@ -1134,22 +1136,26 @@ def external_login_email_post(): destination=destination ) # 4. notify user - message = language.EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS.format( + status_message = language.EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS.format( + fullname=fullname, external_id_provider=external_id_provider, email=user.username ) - kind = 'success' - # 5. Clear session data + # 5. clear session data clear_external_first_login_anonymous_session_data(session) - status.push_status_message(message, kind=kind, trust=False) else: - forms.push_errors_to_status(form.errors) + form_errors = form.errors + for field, _ in form_errors.items(): + for error in form_errors[field]: + error_list.append(error) # Don't go anywhere return { 'form': form, 'external_id_provider': external_id_provider, - 'auth_user_fullname': fullname + 'auth_user_fullname': fullname, + 'status_message': status_message, + 'error_list': error_list, } diff --git a/website/language.py b/website/language.py index 80936924e6a..2189d21da0c 100644 --- a/website/language.py +++ b/website/language.py @@ -57,9 +57,8 @@ REGISTRATION_SUCCESS = """Registration successful. Please check {email} to confirm your email address.""" -EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS = """A new OSF account has been created with your {external_id_provider} profile. Please check {email} to confirm your email address.""" - -EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS = """Your OSF account has been linked with your {external_id_provider}. Please check {email} to confirm this action.""" +EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS = """Hello {fullname}, a new OSF account has been created with your {external_id_provider} profile. Please check {email} to confirm your email address.""" +EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS = """Hello {fullname}, your OSF account has been linked with your {external_id_provider}. Please check {email} to confirm this action.""" # Shown if registration is turned off in website.settings REGISTRATION_UNAVAILABLE = 'Registration currently unavailable.' diff --git a/website/templates/external_login_email.mako b/website/templates/external_login_email.mako index 46932ca859c..ba24eb68f3a 100644 --- a/website/templates/external_login_email.mako +++ b/website/templates/external_login_email.mako @@ -6,34 +6,35 @@
## Center the form
-

- Please enter your email to finalize your ${external_id_provider} login. -

-

- If you already have an OSF account, this will link your ${external_id_provider} profile with OSF. - If not, this will create a new account for you with your ${external_id_provider} profile. -

- -
- % if not auth_user_fullname: + % if status_message: +

${status_message}

+ % else: +

Please enter your email to finalize your ${external_id_provider} login.

+

If you already have an OSF account, this will link your ${external_id_provider} profile with OSF. If not, this will create a new account for you with your ${external_id_provider} profile.

+
Full name: ${form.name(placeholder='Albert Einstein', autofocus=True, required='required') | unicode, n }
- % endif -
- Email address: - ${form.email(placeholder='support@osf.io', autofocus=True, required=True) | unicode, n } -
-
- ${form.accepted_terms_of_service(required='required') | unicode, n } - -
-
- Cancel - -
-
+
+ Email address: + ${form.email(placeholder='support@osf.io', autofocus=True, required=True) | unicode, n } +
+ % if error_list: + % for error in error_list: +
${error}
+ % endfor + % endif +
+ ${form.accepted_terms_of_service(required='required') | unicode, n } + +
+
+ Cancel + +
+ + % endif