From 7e30adb895fb5129f70047be1e7d9d95c354364a Mon Sep 17 00:00:00 2001 From: ayumi-nishida Date: Thu, 12 Jun 2025 14:08:37 +0900 Subject: [PATCH 001/156] =?UTF-8?q?=E9=A0=85=E7=9B=AE=E3=81=8Cnull?= =?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=81=8C=E5=87=BA=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx/ams/weko-frontend/components/detail/ItemInfo.vue | 2 +- nginx/ams/weko-frontend/components/detail/SubSection.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/ams/weko-frontend/components/detail/ItemInfo.vue b/nginx/ams/weko-frontend/components/detail/ItemInfo.vue index b5deb5b128..a32cd1dccb 100644 --- a/nginx/ams/weko-frontend/components/detail/ItemInfo.vue +++ b/nginx/ams/weko-frontend/components/detail/ItemInfo.vue @@ -110,7 +110,7 @@

{{ $t('field') + ':' }} - {{ $t(itemInfo[appConf.roCrate.root.field][0]) }} + {{ $t(itemInfo[appConf.roCrate.root.field]) }} {{ $t('notSet') }}

diff --git a/nginx/ams/weko-frontend/components/detail/SubSection.vue b/nginx/ams/weko-frontend/components/detail/SubSection.vue index 2e99792805..fc5f007fa6 100644 --- a/nginx/ams/weko-frontend/components/detail/SubSection.vue +++ b/nginx/ams/weko-frontend/components/detail/SubSection.vue @@ -7,7 +7,7 @@

- {{ $t(element) }} + {{ element ? $t(element) : '' }}

From 7581a29cc3b7a08e70afe81d16b464756904947d Mon Sep 17 00:00:00 2001 From: ayumi-nishida Date: Thu, 12 Jun 2025 15:44:39 +0900 Subject: [PATCH 002/156] =?UTF-8?q?=E6=9C=AA=E7=97=85=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=AB=E5=9F=8B=E3=82=81=E8=BE=BC=E3=81=BFDS=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ams/weko-frontend/assets/sass/styles.scss | 23 ++++++ nginx/ams/weko-frontend/locales/en.json | 3 +- nginx/ams/weko-frontend/locales/ja.json | 3 +- nginx/ams/weko-frontend/pages/login.vue | 81 +++++++++++++++++++ 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/nginx/ams/weko-frontend/assets/sass/styles.scss b/nginx/ams/weko-frontend/assets/sass/styles.scss index 0668053f9a..464e703749 100644 --- a/nginx/ams/weko-frontend/assets/sass/styles.scss +++ b/nginx/ams/weko-frontend/assets/sass/styles.scss @@ -182,3 +182,26 @@ } } } + + +.text-divider { + display: flex; + align-items: center; + margin-top: 1rem; + margin-bottom: 1rem; + padding-left: 40px; + padding-right: 40px; +} +.text-divider::before, +.text-divider::after { + content: ''; + height: 1px; + background-color: #a3a3a3; + flex-grow: 1; +} +.text-divider::before { + margin-right: 1rem; +} +.text-divider::after { + margin-left: 1rem; +} \ No newline at end of file diff --git a/nginx/ams/weko-frontend/locales/en.json b/nginx/ams/weko-frontend/locales/en.json index 372503b968..d878ea29c0 100644 --- a/nginx/ams/weko-frontend/locales/en.json +++ b/nginx/ams/weko-frontend/locales/en.json @@ -293,5 +293,6 @@ "conflictOfInterestYes": "conflict of interest (Yes) ", "remarks": "Remarks", "identifierText": "identifier", - "identifierType": "identifier type" + "identifierType": "identifier type", + "Institutional Login for institutions in Japan.": "Institutional Login for institutions in Japan." } diff --git a/nginx/ams/weko-frontend/locales/ja.json b/nginx/ams/weko-frontend/locales/ja.json index 053f575d3b..95fc63b1e1 100644 --- a/nginx/ams/weko-frontend/locales/ja.json +++ b/nginx/ams/weko-frontend/locales/ja.json @@ -294,5 +294,6 @@ "conflictOfInterestYes": "利益相反の有無(有の場合)", "remarks": "備考", "identifierText": "識別子", - "identifierType": "識別子タイプ" + "identifierType": "識別子タイプ", + "Institutional Login for institutions in Japan.": "所属機関のIdPでログインする方" } diff --git a/nginx/ams/weko-frontend/pages/login.vue b/nginx/ams/weko-frontend/pages/login.vue index 53d9060ddc..2cc2a24330 100644 --- a/nginx/ams/weko-frontend/pages/login.vue +++ b/nginx/ams/weko-frontend/pages/login.vue @@ -11,6 +11,16 @@

{{ $t('login') }}

+
+ + +
+ + +
+ + +
OR