diff --git a/fid_adlr/languages/de.ini b/fid_adlr/languages/de.ini index c880a3d430a22126256a8a7f49427cb7a5cfbc27..8167de53e81a71a9dba89d62f27592344acc95b8 100644 --- a/fid_adlr/languages/de.ini +++ b/fid_adlr/languages/de.ini @@ -71,7 +71,6 @@ Authors/Corporations = "Beteiligte" Format = "Medientyp" view_worldcat = "Auch in diesen Bibliotheken vorhanden" Description = "weitere Informationen" -go_to_list = "Zurück zur Ergebnisliste" #myresearch-menu contact_adlr = "Kontakt zu adlr.link" diff --git a/fid_adlr/languages/en.ini b/fid_adlr/languages/en.ini index 2fcf1a9ca5f1aee2b43b50e5bf0a9e87b0cbf188..0d850f7c90eeb8382c440075cd35d7d6749b0122 100644 --- a/fid_adlr/languages/en.ini +++ b/fid_adlr/languages/en.ini @@ -69,7 +69,6 @@ basic_search_keep_filters = "Retain Filters" Format = "Media Type" view_worldcat = "Also available in these libraries" Description = "further information" -go_to_list = "Back to results" #myresearch-menu contact_adlr = "Contact adlr.link" diff --git a/themes/fid_adlr/js/lightbox.js b/themes/fid_adlr/js/lightbox.js index c551d2af1298f1688e14ec5e4078efb19cdba92c..baffb1c183982fe7db303643f8f7424f005d9c99 100644 --- a/themes/fid_adlr/js/lightbox.js +++ b/themes/fid_adlr/js/lightbox.js @@ -207,6 +207,11 @@ VuFind.register('lightbox', function Lightbox() { ajax({ url: _currentUrl || _originalUrl }); } + // finc: restore focus after deleting records, #20379 #21905 + function setOrigin(origin) { + _origin = origin; + } + /** * Evaluate a callback */ @@ -446,6 +451,7 @@ VuFind.register('lightbox', function Lightbox() { // Reset reset: reset, // Init - init: init + init: init, + setOrigin: setOrigin }; }); diff --git a/themes/fid_adlr/scss/components/_alerts.scss b/themes/fid_adlr/scss/components/_alerts.scss index 3eae468bf7a1ecef155e4d61715ef296a7464572..cd9f1b68082842f6b625ec29cac33a210e8b9cbd 100644 --- a/themes/fid_adlr/scss/components/_alerts.scss +++ b/themes/fid_adlr/scss/components/_alerts.scss @@ -23,6 +23,6 @@ } a { - color: $state-info-text; + color: $black; } } diff --git a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/list-entry.phtml index 8fc35c4c24742d5349e5ea8d5e7ecb3f4e2a8098..3e6c2424e3fb5ee838baf49dea46a89088acdf6c 100644 --- a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/list-entry.phtml +++ b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/list-entry.phtml @@ -251,8 +251,18 @@ 'delete':'<?=$this->escapeJs($id) ?>', 'source':'<?=$this->escapeJs($source) ?>', 'confirm':true - }, function(){ - $('input[value=<?=$id?>]').parent().remove(0); + }, function() { + let rowToRemove = $('input[value=<?=$id?>]').parent(); + if (rowToRemove && rowToRemove.length) { + let nextFocus = rowToRemove.next().first().find('input'); + rowToRemove.remove(0); + if (nextFocus && nextFocus.length) { + VuFind.lightbox.setOrigin(nextFocus); + } + } else { + setTimeout('location.reload(true);', 2000); + } + <?php /* reset needed for possible old MyResearchController::mylistAction in instances withot clearMessages */ ?> <?php if (null === $list_id) :?> VuFind.lightbox.alert('<?= $this->transEsc('Item removed from favorites')?>', 'success');