From eff614a89b4354280fbcefc34fdda36e7a577949 Mon Sep 17 00:00:00 2001
From: Heike Reinken <reinken@ub.uni-leipzig.de>
Date: Wed, 21 Oct 2020 10:01:39 +0200
Subject: [PATCH] refs #17993 [master] streamline some labels
* Review German translation for E-Mail
** Set German translation to "Mailen"
** Show the bulk action button list on search result page by default
** Bulk action button list: Change the order of the buttons
** Favorites:
*** Add aria-label to the edit and delete button for every item
*** Show action and title for the new aria-label
* Review bulk action buttons
** Change order
*** Change order for the result list
*** Change order for the favorite list
** Change German translation for Print
* Review variable bookbag_email_selected
** Use it again in h2 tag
** Change German translation
---
local/config/vufind/config.ini | 2 +-
local/languages/de.ini | 8 +++++++-
.../templates/RecordDriver/DefaultRecord/list-entry.phtml | 4 ++--
themes/finc/templates/search/bulk-action-buttons.phtml | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
index be6fd603ce9..336c633977e 100644
--- a/local/config/vufind/config.ini
+++ b/local/config/vufind/config.ini
@@ -99,7 +99,7 @@ showBookBag = true
; Set the maximum amount of items allowed in the Book Bag - Default is 100
bookBagMaxSize = 20
; Display bulk items (export, save, etc.) and checkboxes on search result screens?
-showBulkOptions = false
+showBulkOptions = true
; Should users be allowed to save searches in their accounts?
allowSavedSearches = true
; Generator value to display in an HTML header <meta> tag:
diff --git a/local/languages/de.ini b/local/languages/de.ini
index 8e28bc7ef6b..29ae8c90af5 100644
--- a/local/languages/de.ini
+++ b/local/languages/de.ini
@@ -2043,4 +2043,10 @@ form-button-submit = "Ausgefülltes Formular abschicken"
offcanvas-toggler-search-tips = "Suchtipps einblenden"
; #18019 remove if using VuFind 7.0
-select_item = "Titel auswählen"
\ No newline at end of file
+select_item = "Titel auswählen"
+
+; #17993
+; only for German translation
+Email = "Mailen"
+Print = "Drucken"
+bookbag_email_selected = "Links zu ausgewählten Medien per E-Mail versenden"
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
index d71618e3d64..cc628b48a0c 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
@@ -201,7 +201,7 @@ if ($cover):
<?php if ($isEditable): ?>
<i class="fa fa-fw fa-edit" aria-hidden="true"></i> <a
href="<?=$this->url('myresearch-edit')?>?id=<?=urlencode($id)?>&source=<?=urlencode($source)?><?php if (null !== $list_id): ?>&list_id=<?=urlencode($list_id)?><?php endif; ?>"
- class="edit tool"><?=$this->transEsc('Edit')?></a><br/>
+ class="edit tool" aria-label="<?=$this->transEsc('Edit').': '.$this->record($this->driver)->getTitleHtml()?>"><?=$this->transEsc('Edit')?></a><br/>
<?php /* Use a different delete URL if we're removing from a specific list or the overall favorites: */
$deleteUrl = null === $list_id
? $this->url('myresearch-favorites')
@@ -216,7 +216,7 @@ if ($cover):
<i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>
<a class="dropdown-toggle del-button" id="<?= $dLabel ?>"
role="button" data-toggle="dropdown"
- href="<?= $deleteUrlGet ?>">
+ href="<?= $deleteUrlGet ?>" aria-label="<?=$this->transEsc('Delete').': '.$this->record($this->driver)->getTitleHtml()?>">
<?= $this->transEsc('Delete') ?>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="<?= $dLabel ?>">
diff --git a/themes/finc/templates/search/bulk-action-buttons.phtml b/themes/finc/templates/search/bulk-action-buttons.phtml
index 00065718487..cc40884afe2 100644
--- a/themes/finc/templates/search/bulk-action-buttons.phtml
+++ b/themes/finc/templates/search/bulk-action-buttons.phtml
@@ -12,7 +12,7 @@
<?php if (isset($this->showBulkOptions) && $this->showBulkOptions): ?>
<input id="ribbon-email" class="btn btn-transparent" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
<?php $exportOptions = $this->export()->getBulkOptions(); if (count($exportOptions) > 0): ?>
- <input id="ribbon-export" class="btn btn-transparent" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
+ <input id="ribbon-export" class="btn btn-transparent" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
<?php endif; ?>
<input id="ribbon-print" class="btn btn-transparent" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"<?php if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
--
GitLab