Skip to content

[GRDM-61662] サービス切り替えメニューにJAIRO Cloud公開支援機能を追加 #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yacchin1205 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

[GRDM-61662] サービス切り替えメニューにJAIRO Cloud公開支援機能を追加 #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions website/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions website/settings/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions website/static/css/nav.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
12 changes: 3 additions & 9 deletions website/templates/nav.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<div class="service-name">
<a href="${service_url}">
<span class="hidden-xs"> ${osf_page_name} </span>
% if nav_dropdown:
<span class="current-service"><strong>${service_name}</strong></span>
% endif
</a>
</div>
% if nav_dropdown:
Expand All @@ -21,12 +18,9 @@
<span class="fa fa-caret-down fa-2x"></span>
</button>
<ul class="dropdown-menu service-dropdown" role="menu">
<li><a data-bind="click: trackClick.bind($data, 'Home')" href="${domain}">${osf_page_name}<b>${_("HOME")}</b></a></li>
<li><a data-bind="click: trackClick.bind($data, 'Preprints')" href="${domain}preprints/">${osf_page_name}<b>${_("PREPRINTS")}</b></a></li>
<li><a data-bind="click: trackClick.bind($data, 'Registries')" href="${domain}registries/">${osf_page_name}<b>${_("REGISTRIES")}</b></a></li>
<li><a data-bind="click: trackClick.bind($data, 'Meetings')" href="${domain}meetings/">${osf_page_name}<b>${_("MEETINGS")}</b></a></li>
% if institutional_landing_flag:
<li><a data-bind="click: trackClick.bind($data, 'Institutions')" href="${domain}institutions/">${osf_page_name}<b>${_("INSTITUTIONS")}</b></a></li>
<li><a data-bind="click: trackClick.bind($data, 'Home')" href="${domain}">${osf_page_name}</a></li>
% if oasys_url:
<li><a data-bind="click: trackClick.bind($data, 'JAIRO Cloud Publication Support')" href="${oasys_url}">${_("JAIRO Cloud Publication Support")}</a></li>
% endif
</ul>
</div>
Expand Down
4 changes: 4 additions & 0 deletions website/translations/en/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down
4 changes: 4 additions & 0 deletions website/translations/ja/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "ナビゲーションを切り替える"
Expand Down