From 70ff02eb3d1de0932c0d03857e7f1fc6cdf20353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Siiri=20Yl=C3=B6nen?= Date: Thu, 23 Jan 2025 09:49:54 +0200 Subject: [PATCH 1/8] Item titles as title elements, tabindexes and an element at the end of table for sr. --- .../RecordDriver/DefaultRecord/account-entry.phtml | 7 +++---- themes/finna2/templates/checkouts/history.phtml | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/themes/finna2/templates/RecordDriver/DefaultRecord/account-entry.phtml b/themes/finna2/templates/RecordDriver/DefaultRecord/account-entry.phtml index 5afba3cb34e..720715b3009 100644 --- a/themes/finna2/templates/RecordDriver/DefaultRecord/account-entry.phtml +++ b/themes/finna2/templates/RecordDriver/DefaultRecord/account-entry.phtml @@ -9,14 +9,13 @@ $title = $driver->getTitle(); $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); } - echo '' . $title . ''; + echo '

' . $title . '

'; } elseif (isset($ilsDetails['title']) && !empty($ilsDetails['title'])) { // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... - echo '' . $this->escapeHtml($ilsDetails['title']) . ''; + echo '

' . $this->escapeHtml($ilsDetails['title']) . '

'; } else { // Last resort -- indicate that no title could be found. - echo '' . $this->transEsc('Title not available') . ''; + echo '

' . $this->transEsc('Title not available') . '

'; } ?>
diff --git a/themes/finna2/templates/checkouts/history.phtml b/themes/finna2/templates/checkouts/history.phtml index 6defa560ed1..48d7d112dff 100644 --- a/themes/finna2/templates/checkouts/history.phtml +++ b/themes/finna2/templates/checkouts/history.phtml @@ -154,7 +154,7 @@ record($resource)->renderTemplate('account-entry.phtml')?> - + transEscWithPrefix('location_', $ilsDetails['institution_name'])?>
@@ -195,6 +195,8 @@
+ +
transEsc('Loan History')?> transEsc('päättyy')?>
From b8bf16bd507194b07e4eb0b893fb4a83f2ee271c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Siiri=20Yl=C3=B6nen?= Date: Mon, 27 Jan 2025 14:04:47 +0200 Subject: [PATCH 2/8] Tabindexes to headers and skip link to target the page header instead of menu header. --- local/languages/finna/en-gb.ini | 1 + local/languages/finna/fi.ini | 1 + local/languages/finna/sv.ini | 1 + themes/finna2/templates/checkouts/history.phtml | 6 +++--- themes/finna2/templates/holds/list.phtml | 6 ++++-- themes/finna2/templates/layout/layout.phtml | 4 +++- themes/finna2/templates/myresearch/checkedout.phtml | 6 ++++-- themes/finna2/templates/myresearch/illrequests.phtml | 6 ++++-- .../templates/myresearch/storageretrievalrequests.phtml | 6 ++++-- 9 files changed, 25 insertions(+), 12 deletions(-) diff --git a/local/languages/finna/en-gb.ini b/local/languages/finna/en-gb.ini index 5739f75ac11..5f899b233e3 100644 --- a/local/languages/finna/en-gb.ini +++ b/local/languages/finna/en-gb.ini @@ -325,6 +325,7 @@ embedded_content_heading = "Content Cannot be Displayed" embedded_content_description = "This content is displayed from %%serviceBaseUrl%%. To see the content, switch over to the external site or modify your cookie settings and allow the following categories: %%consentCategories%%." embedded_content_external_link = "See content on external site" Empty Book Bag = "Empty basket" +End of List = "End of list" Ensembles = "Ensembles" Established = "Established" event_date_end = "End date" diff --git a/local/languages/finna/fi.ini b/local/languages/finna/fi.ini index c822374d184..37852adf424 100644 --- a/local/languages/finna/fi.ini +++ b/local/languages/finna/fi.ini @@ -317,6 +317,7 @@ embedded_content_heading = "Sisältöä ei voida näyttää" embedded_content_description = "Tämä sisältö haetaan osoitteesta %%serviceBaseUrl%%. Sen näyttämiseen vaaditaan, että hyväksyt sivuston evästeet. Pääset näkemään sisällön joko siirtymällä ulkoiselle sivustolle tai sallimalla evästeasetuksista seuraavat: %%consentCategories%%." embedded_content_external_link = "Siirry ulkoiselle sivustolle" Empty Book Bag = "Tyhjennä" +End of List = "Luettelon loppu" Ensembles = "Kokoonpanot" Era = "Aiheen aika" Established = "Perustettu" diff --git a/local/languages/finna/sv.ini b/local/languages/finna/sv.ini index c8a9aea28d2..9e11d865088 100644 --- a/local/languages/finna/sv.ini +++ b/local/languages/finna/sv.ini @@ -316,6 +316,7 @@ embedded_content_heading = "Innehåll kan inte visas" embedded_content_description = "Innehåll visas från %%serviceBaseUrl%%. För att se innehållet, flytta dig till den externa webbplatsen eller kontrollera dina kakinställningar och acceptera följande kategorier: %%consentCategories%%." embedded_content_external_link = "Se innehållet på den externa webbplatsen" Empty Book Bag = "Tömma" +End of List = "Slutet av listan" Ensembles = "Ensembler" Established = "Grundad" event_date_end = "Slutdatum" diff --git a/themes/finna2/templates/checkouts/history.phtml b/themes/finna2/templates/checkouts/history.phtml index 48d7d112dff..07f1e724adc 100644 --- a/themes/finna2/templates/checkouts/history.phtml +++ b/themes/finna2/templates/checkouts/history.phtml @@ -2,6 +2,7 @@ headTitle($this->translate('Loan History')); + $this->layout()->finnaUseraccountHeader = 'useraccount-content-header'; // Set up breadcrumbs: $this->layout()->breadcrumbs = '
  • ' . $this->transEsc('Your Account') . '
  • ' . $this->transEsc('Loan History') . '
  • '; @@ -25,7 +26,7 @@
    context($this)->renderInContext('librarycards/selectcard.phtml', ['user' => $user, 'label' => 'Library Card'])?>
    -
    +

    transEsc('Loan History')?> ()

    noSupport)): ?> @@ -183,6 +184,7 @@ +

    transEsc('End of List')?>

    - -
    transEsc('Loan History')?> transEsc('päättyy')?>
    diff --git a/themes/finna2/templates/holds/list.phtml b/themes/finna2/templates/holds/list.phtml index 00f05b1aef4..95e6210c718 100755 --- a/themes/finna2/templates/holds/list.phtml +++ b/themes/finna2/templates/holds/list.phtml @@ -2,6 +2,7 @@ headTitle($this->translate('My Holds')); + $this->layout()->finnaUseraccountHeader = 'useraccount-content-header'; // Set up breadcrumbs: $this->layout()->breadcrumbs = '
  • ' . $this->transEsc('Your Account') . '
  • ' . $this->transEsc('My Holds') . '
  • '; $user = $this->auth()->getUserObject(); @@ -20,7 +21,7 @@
    context($this)->renderInContext('librarycards/selectcard.phtml', ['user' => $user, 'label' => 'Library Card'])?>
    -
    +

    transEsc('Your Holds and Recalls') ?> (recordList ?? []);?>)

    noSupport)): ?> @@ -134,7 +135,7 @@
    record($resource)->renderTemplate('account-entry.phtml')?>
    -
    +
    transEsc('hold_requested_group') ?>: transEsc('request_group_' . $ilsDetails['requestGroup'], [], $this->transEscWithPrefix('location_', $ilsDetails['requestGroup']))?>
    @@ -242,6 +243,7 @@ +

    transEsc('End of List')?>

    cancelForm): ?>