From 0d50e1002a54afd68dfb941c200c3264e73d0e58 Mon Sep 17 00:00:00 2001 From: yacchin1205 <968739+yacchin1205@users.noreply.github.com> Date: Mon, 27 Jul 2026 15:36:33 +0900 Subject: [PATCH] Show GakuNin RDM and JAIRO Cloud in the service switcher --- website/routes.py | 1 + website/settings/defaults.py | 2 ++ website/static/css/nav.css | 16 ++++++++++++++++ website/templates/nav.mako | 12 +++--------- website/translations/en/LC_MESSAGES/messages.po | 4 ++++ website/translations/ja/LC_MESSAGES/messages.po | 4 ++++ 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/website/routes.py b/website/routes.py index 96895e8cb95..cd543f994ec 100644 --- a/website/routes.py +++ b/website/routes.py @@ -160,6 +160,7 @@ def get_globals(): 'status': status.pop_status_messages(), 'prev_status': status.pop_previous_status_messages(), 'domain': settings.DOMAIN, + 'oasys_url': settings.OASYS_URL, 'api_domain': settings.API_DOMAIN, 'disk_saving_mode': settings.DISK_SAVING_MODE, 'language': language, diff --git a/website/settings/defaults.py b/website/settings/defaults.py index 1ace7782bba..9c2d0025f63 100644 --- a/website/settings/defaults.py +++ b/website/settings/defaults.py @@ -149,6 +149,8 @@ def parent_dir(path): RDM_URL = 'https://rdm.nii.ac.jp/' #nii url NII_HOMEPAGE_URL = 'https://www.nii.ac.jp/' +#oasys url +OASYS_URL = '' # support email OSF_SUPPORT_EMAIL = 'rdm_support@nii.ac.jp' # contact email diff --git a/website/static/css/nav.css b/website/static/css/nav.css index 1dd84471eb7..33befe095c3 100644 --- a/website/static/css/nav.css +++ b/website/static/css/nav.css @@ -12,3 +12,19 @@ .osf-nav-wrapper .dropdown-menu.auth-dropdown { width: unset !important; } + +.osf-nav-wrapper .dropdown-menu.service-dropdown { + width: unset !important; +} + +@media (max-width: 767px) { + .osf-nav-wrapper .dropdown-menu.service-dropdown { + position: fixed !important; + top: 50px !important; + left: 15px !important; + right: auto !important; + } + .osf-nav-wrapper .dropdown-menu.service-dropdown ::after { + left: 60px !important; + } +} diff --git a/website/templates/nav.mako b/website/templates/nav.mako index 7204ad5a944..4de28a78f18 100644 --- a/website/templates/nav.mako +++ b/website/templates/nav.mako @@ -10,9 +10,6 @@
% if nav_dropdown: @@ -21,12 +18,9 @@ diff --git a/website/translations/en/LC_MESSAGES/messages.po b/website/translations/en/LC_MESSAGES/messages.po index 9a43606cdc8..5ead7def23e 100644 --- a/website/translations/en/LC_MESSAGES/messages.po +++ b/website/translations/en/LC_MESSAGES/messages.po @@ -1524,6 +1524,10 @@ msgstr "" msgid "INSTITUTIONS" msgstr "" +#: website/templates/nav.mako:31 +msgid "JAIRO Cloud Publication Support" +msgstr "" + #: website/templates/nav.mako:34 msgid "Toggle navigation" msgstr "" diff --git a/website/translations/ja/LC_MESSAGES/messages.po b/website/translations/ja/LC_MESSAGES/messages.po index 33ceae79bbb..21a91c7d613 100644 --- a/website/translations/ja/LC_MESSAGES/messages.po +++ b/website/translations/ja/LC_MESSAGES/messages.po @@ -1910,6 +1910,10 @@ msgstr "ミーティング" msgid "INSTITUTIONS" msgstr "インスティチューション" +#: website/templates/nav.mako:31 +msgid "JAIRO Cloud Publication Support" +msgstr "JAIRO Cloud公開支援機能" + #: website/templates/nav.mako:34 msgid "Toggle navigation" msgstr "ナビゲーションを切り替える"