diff --git a/local/languages/de.ini b/local/languages/de.ini index 927519966e559d8298bde1ab8fd38b68bb99d06d..61c1881c8fe1ebea193d730562e64f293df478ed 100644 --- a/local/languages/de.ini +++ b/local/languages/de.ini @@ -2044,9 +2044,6 @@ form-button-submit = "Ausgefülltes Formular abschicken" ; #17601 offcanvas-toggler-search-tips = "Suchtipps einblenden" -; #18019 remove if using VuFind 7.0 -select_item = "Titel auswählen" - ; #17993 ; only for German translation Email = "Mailen" @@ -2055,3 +2052,12 @@ bookbag_email_selected = "Links zu ausgewählten Medien per E-Mail versenden" ; #18441 Skip_navigation_links = "Sprunglinks zur Suche und zum Inhalt" + +; #18019 & #18754 +select_item = "Titel wählen" +select_item_search_result = "Titel zum Mailen, Exportieren, Drucken, Speichern oder Merken auswählen" +select_item_favorite = "Titel zum Mailen, Löschen, Exportieren, Drucken oder Merken auswählen" +select_item_hold_cancel = "Titel auswählen, um Bestellung oder Vormerkung zu stornieren" +select_item_checked_out_renew = "Titel zum Verlängern auswählen" +select_item_ill_request_cancel = "Titel auswählen, um Fernleihanfrage zu stornieren" +select_item_storage_retrieval_request_cancel = "Titel auswählen, um Magazinbestellung zu stornieren" diff --git a/local/languages/en.ini b/local/languages/en.ini index e91a899716ebf85b56d1f43a1454561f868f036b..740bed2ba7c9289137aeb24cfdceb43a3db279c0 100644 --- a/local/languages/en.ini +++ b/local/languages/en.ini @@ -2132,8 +2132,14 @@ form-button-submit = "Submit the completed form" ; #17601 offcanvas-toggler-search-tips = "Show search help" -; #18019 remove if using VuFind 7.0 -select_item = "Select item" - ; #18441 Skip_navigation_links = "Skip navigation links" + +; #18019 & #18754 +select_item = "Select item" +select_item_search_result = "Select item for mailing, exporting, printing, saving as favorite or adding to book bag" +select_item_favorite = "Select item for mailing, removing from favorites, exporting, printing or adding to book bag" +select_item_hold_cancel = "Select item for canceling holds or recall" +select_item_checked_out_renew = "Select item for renewing" +select_item_ill_request_cancel = "Select item for canceling interlibrary loan requests" +select_item_storage_retrieval_request_cancel = "Select item for canceling storage retrieval requests" diff --git a/module/finc/src/finc/Controller/MyResearchController.php b/module/finc/src/finc/Controller/MyResearchController.php index 9fadc523e76e2765998465baacb5ecaf4a2f8fa0..c70b0f6cfbc9a6c7531f8892fc3b4d6e50e42730 100644 --- a/module/finc/src/finc/Controller/MyResearchController.php +++ b/module/finc/src/finc/Controller/MyResearchController.php @@ -143,7 +143,7 @@ class MyResearchController extends \VuFind\Controller\MyResearchController imple $results = $runner->run($request, 'Favorites', $setupCallback); return $this->createViewModel( - ['params' => $results->getParams(), 'results' => $results] + ['params' => $results->getParams(), 'results' => $results, 'context' => "favorite"] ); } catch (ListPermissionException $e) { if (!$this->getUser()) { diff --git a/themes/finc/templates/myresearch/checkedout.phtml b/themes/finc/templates/myresearch/checkedout.phtml index 00979e067ad3eea77db77c565373ebbb01b99c5e..be1720f672759764e8eea64b788c8fb8a76b9fe4 100644 --- a/themes/finc/templates/myresearch/checkedout.phtml +++ b/themes/finc/templates/myresearch/checkedout.phtml @@ -85,7 +85,7 @@ <?php if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?> <?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?> <label> - <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item')?>" /> + <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item_checked_out_renew')?>" /> </label> <input type="hidden" name="selectAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" /> <input type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" /> diff --git a/themes/finc/templates/myresearch/holds.phtml b/themes/finc/templates/myresearch/holds.phtml index 315ba230bf4cfd4cd947dff18d0dd16cc0b970a7..6c12d44eee705bed0ed524577bf7c4ec47aecc8d 100644 --- a/themes/finc/templates/myresearch/holds.phtml +++ b/themes/finc/templates/myresearch/holds.phtml @@ -53,7 +53,7 @@ <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> <div class="checkbox"> <label> - <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item')?>" /> + <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item_hold_cancel')?>" /> </label> </div> <?php endif; ?> diff --git a/themes/finc/templates/myresearch/illrequests.phtml b/themes/finc/templates/myresearch/illrequests.phtml index c95819f7c4f53a17bc9d01f5bd165940b39fc4de..98e25c47e9875faf11864512333fc53de6ce01b2 100644 --- a/themes/finc/templates/myresearch/illrequests.phtml +++ b/themes/finc/templates/myresearch/illrequests.phtml @@ -54,7 +54,7 @@ <div class="checkbox"> <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> <label> - <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item')?>" /> + <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item_ill_request_cancel')?>" /> </label> </div> <?php endif; ?> diff --git a/themes/finc/templates/myresearch/storageretrievalrequests.phtml b/themes/finc/templates/myresearch/storageretrievalrequests.phtml index b05bc9fb85ecb8da4d6b794ce1caf0542d3b2549..e199eee1bf5702ee634bd9bb64a35764bed64873 100644 --- a/themes/finc/templates/myresearch/storageretrievalrequests.phtml +++ b/themes/finc/templates/myresearch/storageretrievalrequests.phtml @@ -53,7 +53,7 @@ <div class="checkbox"> <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> <label class="pull-left flip"> - <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item')?>" /> + <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item_storage_retrieval_request_cancel')?>" /> </label> </div> <?php endif; ?> diff --git a/themes/finc/templates/record/checkbox.phtml b/themes/finc/templates/record/checkbox.phtml index 4a77b03ba688132f05fb98d9ebb3c5b4e9b4d49d..408f48b1a76de9533c3568044d94c2582ead29b9 100644 --- a/themes/finc/templates/record/checkbox.phtml +++ b/themes/finc/templates/record/checkbox.phtml @@ -1,6 +1,7 @@ <!-- finc: record - checkbox --> +<?php $label = isset($this->context) ? 'select_item_' . $this->context : 'select_item'; ?> <label class="record-checkbox hidden-print"> - <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->id?>"<?php if(isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-describedby="<?=$this->id?>" aria-label="<?=$this->transEsc('select_item')?>"/> + <input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->id?>"<?php if(isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<?php endif; ?> aria-describedby="<?=$this->id?>" aria-label="<?=$this->transEsc($label)?>"/> <span class="checkbox-icon"></span> <?php if (strlen($this->number ?? '') > 0): ?><span class="sr-only"><?=$this->transEsc('result_checkbox_label', ['%%number%%' => $this->number]) ?></span><?php endif; ?> </label> diff --git a/themes/finc/templates/search/results.phtml b/themes/finc/templates/search/results.phtml index aa934d4a6d4c84fee4f5487b6025e6b02bd0aa55..de9ade6fd08919a365af15829592376107b95f24 100644 --- a/themes/finc/templates/search/results.phtml +++ b/themes/finc/templates/search/results.phtml @@ -1,5 +1,7 @@ <!-- finc: search - results --> <?php +$this->context = 'search_result'; + // Set up page title: $lookfor = $this->results->getUrlQuery()->isQuerySuppressed() ? '' : $this->params->getDisplayQuery(); if (isset($this->overrideTitle)) {