diff --git a/local/languages/de.ini b/local/languages/de.ini index 5f2f13c24ce3c7d64d7dd00915623355318286af..2d42a024872bbb64d7028cf354cbfc253e3e4458 100644 --- a/local/languages/de.ini +++ b/local/languages/de.ini @@ -717,6 +717,7 @@ errorcode_password_validation_error = "Das übergebene Password ist nicht korrek errorcode_old_password_validation_error = "Die Kombination aus Benutzernummer und Kennwort ist nicht gültig. Bitte überprüfen Sie Ihre Eingabe." errorcode_empty_req_param_error = "Um das Formular erfolgreich zu senden, müssen alle erforderlichen Felder ausgefüllt sein" exclude_newspapers = "Ohne Zeitungsartikel" +exclude_filter = "Filter "%%filter_name%%" ausschließen" export_download = "Datei herunterladen" export_exporting = "Exportdatei erstellen" export_fail = "Ihre Datensätze wurden nicht exportiert" @@ -876,6 +877,9 @@ on_reserve = "Vorgemerkt - Fragen Sie an der Ausleihe nach" online_resources = "Sonstige" or = "oder" create a new list = "erstellen Sie eine neue Liste" +page_reload_hint = "Seite wird neu geladen" +page_reload_on_select_hint = "Seite wird bei Auswahl des Filters "%%filter_name%%" neu geladen" +page_reload_on_deselect_hint = "Seite wird neu geladen, wenn der Filter "%%filter_name%%" abgewählt wird" password_too_short = "Zu kurz" password_very_weak = "Sehr schwach" password_weak = "Schwach" @@ -1984,6 +1988,8 @@ Modal_description = "Sie befinden sich in einem Dialogfenster, das über dem Hau Skip_navigation_links = "Sprunglinks zum Inhalt" Skip to search = "Zum Suchbereich" Skip to content = "Zum Inhalt" +Skip to facet = "Zu ihrem ausgewählten Suchfilter "%%filter_name%%" springen" +skip-to = "Zu" ; Overwrite, only in de.ini necessary: Search type = "Suchtyp" diff --git a/local/languages/en.ini b/local/languages/en.ini index c2a054363f63be223fe0fa3e54775e9b8f8682a7..1ecb11bff8db931fe22f25de1d743d8d7e7b9556 100644 --- a/local/languages/en.ini +++ b/local/languages/en.ini @@ -702,6 +702,7 @@ errorcode_empty_password = "Some data was missing. No password was submitted" errorcode_member_not_found = "The member number does not exist" errorcode_password_validation_error = "Your passed password is not correct" errorcode_empty_req_param_error = "All required fields have to be filled to submit successfully the form" +exclude_filter = "Exclude filter "%%filter_name%%"" exclude_newspapers = "Exclude Newspaper Articles" export_download = "Download File" export_exporting = "Creating Export File" @@ -839,6 +840,9 @@ of = of on_reserve = "Reserves - Please contact staff" online_resources = "Online Resources" create a new list = "Create a New List" +page_reload_hint = "Page will refresh immediately" +page_reload_on_select_hint = "Page will refresh when filter "%%filter_name%%" is selected" +page_reload_on_deselect_hint = "Page will refresh when filter "%%filter_name%%" is deselected" password_too_short = "Too short" password_very_weak = "Very weak" password_weak = "Weak" @@ -2082,8 +2086,8 @@ ReliefPrint = "Printmaking" Modal_description = "This is a dialog window which overlays the main content of the page. Pressing the Escape key or the Close Dialog Window button will close the modal and bring you back to where you were on the page." Skip_navigation_links = "Skip navigation links" Skip to search = "Skip to search" -; only necessary in en.ini skip-to = "Skip to " +Skip to facet = "Skip to your selected search filter "%%filter_name%%"" License = "License" diff --git a/module/fid/src/Service/DataTransferObject/User.php b/module/fid/src/Service/DataTransferObject/User.php index c36b760197444ccb9f4d6d8a6342726357b6c148..b2704cf9b31db72768096ea79f52f68098fee08d 100644 --- a/module/fid/src/Service/DataTransferObject/User.php +++ b/module/fid/src/Service/DataTransferObject/User.php @@ -409,6 +409,14 @@ class User } } + /** + * @return boolean + */ + public function isNewsletter(): bool + { + return !empty($this->getData()["newsletter"]) ? $this->getData()["newsletter"] : 0; + } + /** * @param Address[] $addresses */ diff --git a/module/finc/src/finc/View/Helper/Root/SideFacet.php b/module/finc/src/finc/View/Helper/Root/SideFacet.php index fefb2febee6eec8cb6e087a493bd12edd40a63e2..6bcabed6194318a930e57822cd303ae2ce4e70ea 100644 --- a/module/finc/src/finc/View/Helper/Root/SideFacet.php +++ b/module/finc/src/finc/View/Helper/Root/SideFacet.php @@ -71,6 +71,13 @@ class SideFacet extends AbstractHelper } } + /** + * Applied facets + * + * @var array + */ + protected $appliedFacets; + /** * Checks whether the user is logged in. * @@ -135,4 +142,29 @@ class SideFacet extends AbstractHelper return "<$element $attributesString>$term</$element>"; } } + + /** + * @param string $displayText + * @param string $id + * + * @return string $id + */ + public function setAppliedFacet($displayText, $id = null): string + { + $id = $id ?? crc32($displayText); + $tuple = [$id => $displayText]; + empty($this->appliedFacets) ? $this->appliedFacets = $tuple : $this->appliedFacets += $tuple; + + return $id; + } + + /** + * Returns an associative array of html id => facet display title + * + * @return array|null + */ + public function getAppliedFacets(): ?array + { + return $this->appliedFacets; + } } diff --git a/themes/fid/templates/ajax/resolverLinks-print.phtml b/themes/fid/templates/ajax/resolverLinks-print.phtml index 211079c3e742e1995389cfc3673b84d5ae37f128..972116bf51e618ca4c1f9f8888efdfab061bc5a6 100644 --- a/themes/fid/templates/ajax/resolverLinks-print.phtml +++ b/themes/fid/templates/ajax/resolverLinks-print.phtml @@ -51,19 +51,4 @@ JS; <?php endif; ?> <?php /* finc-specific change #9274 - END */ ?> </div> -<?php /* #17831 */ ?> -<?php $script = <<<JS - $(document).ready(function() { - if ($(window).width() >= 1200) { - var contentHeight = $('.media').height(); - var getitboxHeight = $('.getitbox').height(); - if (getitboxHeight > contentHeight) { - $('.media').css('min-height', getitboxHeight+'px'); - } - } - }); -JS; -?> -<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET');?> -<?php /* #17831 END */ ?> <!-- fid: ajax - resolverlinks-print - END --> diff --git a/themes/finc-accessibility/templates/Recommend/SideFacets/facet.phtml b/themes/finc-accessibility/templates/Recommend/SideFacets/facet.phtml new file mode 100644 index 0000000000000000000000000000000000000000..aa6790b82c6929dfadb2a86c7e25cedfb00e29e7 --- /dev/null +++ b/themes/finc-accessibility/templates/Recommend/SideFacets/facet.phtml @@ -0,0 +1,68 @@ +<!-- finc-accessibility - Recommend - SideFacets - facet.phtml --> +<?php /* #18993 copied from bootstrap to show all applied facets */ ?> +<?php + $this->results = $results = $this->recommend->getResults(); + $this->options = $options = $results->getOptions(); + $hierarchicalFacetSortOptions = $this->recommend->getHierarchicalFacetSortOptions(); + $hierarchicalFacets = $this->recommend->getHierarchicalFacets(); + $collapsedFacets = $this->recommend->getCollapsedFacets(); + $rangeFacets = $this->recommend->getAllRangeFacets(); + $facet = $this->facet; +?> +<?php if (isset($rangeFacets[$facet])): // special display for ranges ?> + <?=$this->context($this)->renderInContext( + 'Recommend/SideFacets/range-slider.phtml', + ['title' => $facet, 'facet' => $rangeFacets[$facet]] + ); ?> +<?php else: ?> + <?php + // Set some variables so we can figure out which sub-template(s) to + // render. If we have a hierarchical facet, we will need to render a + // jsTree Javascript-based template. If we also support non-JS browsers, + // we will also need to render the basic default template. If we + // do NOT support non-JS browsers, we should instead display an error + // message. + $isHierarchical = in_array($facet, $hierarchicalFacets); + $noJsSupport = $this->config()->nonJavascriptSupportEnabled(); + ?> + <?php if ($isHierarchical): // do we need hierarchical JS display? ?> + <?=$this->context($this)->renderInContext( + 'Recommend/SideFacets/hierarchical-facet.phtml', + [ + 'allowExclude' => $this->recommend->excludeAllowed($facet), + 'title' => $facet, + 'sortOptions' => $hierarchicalFacetSortOptions[$facet] ?? '', + 'collapsedFacets' => $collapsedFacets + ] + ); ?> + <noscript> + <?php if (!$noJsSupport): ?> + <span class="facet"><?=$this->transEsc('Please enable JavaScript.')?></span> + <?php endif; ?> + <?php endif; ?> + <?php if (!$isHierarchical || $noJsSupport): // do we need regular display? ?> + <?php + /* finc specific: do not hide selected facet within more-cluster */ + $facetsBeforeMore = $this->recommend->getShowMoreSetting($facet); + foreach ($cluster['list'] as $i => $clusterFacet) { + if ($clusterFacet['isApplied'] && $i + 1 > $facetsBeforeMore) { + $facetsBeforeMore = $i + 1; + } + } + /* finc specific - END */ + ?> + <?=$this->context($this)->renderInContext( + 'Recommend/SideFacets/cluster-list.phtml', + [ + 'options' => $options, 'title' => $facet, 'cluster' => $cluster, + 'allowExclude' => $this->recommend->excludeAllowed($facet), + 'facets_before_more' => $facetsBeforeMore, + 'showMoreInLightbox' => $this->recommend->getShowInLightboxSetting($facet) + ] + ); ?> + <?php endif; ?> + <?php if ($isHierarchical): // close tag opened in matching if above ?> + </noscript> + <?php endif; ?> +<?php endif; ?> +<!-- finc-accessibility - Recommend - SideFacets - facet.phtml - END --> diff --git a/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml index d7e75e1a60ccff2ce9e4bf5a8cdb58d4fe7bdc24..e2bcbb9c9e466615696ac66aaa5165e1a143d182 100644 --- a/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml +++ b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml @@ -18,7 +18,7 @@ $filter['displayText'] = $this->translate('filter_wildcard'); } ?> - <a class="facet" href="<?=$removeLink ?>" title="<?=$this->transEsc('clear_tag_filter') ?>"> + <a class="facet" href="<?=$removeLink ?>" title="<?=$this->transEsc('clear_tag_filter') ?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $filter['displayText']])?>"> <span class="sr-only"><?=$this->transEsc('clear_tag_filter') ?></span> <span class="text"> <?php if ($filter['operator'] == 'NOT'): ?><?=$this->transEsc('NOT') ?><?php endif; ?> @@ -30,4 +30,4 @@ <?php endforeach; ?> <?php endforeach; ?> </div> -<!-- finc-accessibility - Recommend - SideFacets - filter-list.phtml - END --> +<!-- finc-accessibility - Recommend - SideFacets - filter-list.phtml - END --> diff --git a/themes/finc/js/common-finc.js b/themes/finc/js/common-finc.js index 06e842b6b637e2da0e189de402954561295f1408..3b80a9ac86ae05382047455ec593beb1df9b27ad 100644 --- a/themes/finc/js/common-finc.js +++ b/themes/finc/js/common-finc.js @@ -24,3 +24,25 @@ function setupOffcanvas() { }); } } + +/* use css class 'skip-to' to jump to landmark - RL */ +$(document).ready(function () { + $(document).on('click enter',".skip-to", function (e) { + if (e.type === 'enter' && e.keyCode !== 13) { + return; + } + + if (this.hash) { + e.stopPropagation(); + e.preventDefault(); + let offset = $(this.hash).offset().top; + let banner = $('.banner .container'); + if (banner !== undefined) { + offset -= banner.height() + 10; + } + $('html, body').animate( + {scrollTop: offset}, 500, 'swing', $(this.hash).focus() + ); + } + }); +}); \ No newline at end of file diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss index 79421497168e1b1eaf06068475fd9e8e037d41fd..8a5183ea841f34b9e2d1c901662c38a50dd5ad62 100644 --- a/themes/finc/scss/compiled.scss +++ b/themes/finc/scss/compiled.scss @@ -1866,6 +1866,12 @@ footer { } } +.mainbody { + @media screen and (max-width: $screen-xs-max) { + width: 100%; + } +} + footer { border-top: 0; padding-top: ($grid-gutter-width / 1.5); diff --git a/themes/finc/templates/Helpers/branchinfo.phtml b/themes/finc/templates/Helpers/branchinfo.phtml index dc51222d8ab84606b916b3b016e9fcacc401df40..5ae9247f652fc0883bffab6e3b030f85914f6bdb 100644 --- a/themes/finc/templates/Helpers/branchinfo.phtml +++ b/themes/finc/templates/Helpers/branchinfo.phtml @@ -1,7 +1,6 @@ <!-- helpers - branchinfo.phtml --> <table> - <caption class="sr-only"> - <?= $this->transEsc('Address-Contact-Hours') ?> + <caption><span class="sr-only"><?= $this->transEsc('Address-Contact-Hours') ?></span> </caption> <tr class="holding-info"> <td colspan="4"> diff --git a/themes/finc/templates/Recommend/SideFacets/range-slider.phtml b/themes/finc/templates/Recommend/SideFacets/range-slider.phtml index 8dc4975ac49b1517a6df1e19420c422314e385f9..430be23580f50ce2ba0fccf96c7bb22bdf494db6 100644 --- a/themes/finc/templates/Recommend/SideFacets/range-slider.phtml +++ b/themes/finc/templates/Recommend/SideFacets/range-slider.phtml @@ -5,6 +5,11 @@ */ ?> <div class="facet"> + <?php if (!empty($this->facet['values'][0])): ?> + <?php $this->sideFacet()->setAppliedFacet($this->transEsc('Skip to facet', ['%%filter_name%%' => $this->transEsc('Year of Publication')]), $this->escapeHtmlAttr($this->title) . 'from')?> + <?php elseif (!empty($this->facet['values'][1])): ?> + <?php $this->sideFacet()->setAppliedFacet($this->transEsc('Skip to facet', ['%%filter_name%%' => $this->transEsc('Year of Publication')]), $this->escapeHtmlAttr($this->title) . 'to')?> + <?php endif; ?> <form name="<?=$this->escapeHtmlAttr($this->title)?>Filter" id="<?=$this->escapeHtmlAttr($this->title)?>Filter"> <?=$results->getUrlQuery()->asHiddenFields(['page' => "/./", 'filter' => "/^{$this->title}:.*/"])?> <input type="hidden" name="<?=$this->escapeHtmlAttr($this->facet['type'])?>range[]" value="<?=$this->escapeHtmlAttr($this->title)?>"/> diff --git a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml index bedb8055591bb54649d1295fab44e0d0510c0d48..054dcc31a94decb722a11827fea8b9afff4a6e0d 100644 --- a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml +++ b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml @@ -33,11 +33,23 @@ <?php if ($hasSubLinks): ?> <div class="<?=implode(' ', $classList) ?>"> <?php else: ?> - <a href="<?=$toggleUrl ?>" class="<?=implode(' ', $classList) ?>" data-title="<?=$this->escapeHtmlAttr($this->facet['displayText']) ?>" data-count="<?=$this->facet['count'] ?>"<?php if($this->facet['isApplied']): ?> title="<?=$this->transEsc('applied_filter') ?>"<?php endif;?> data-lightbox-ignore> + <a + <?php if ($this->facet['isApplied']): ?>id="<?=$this->sideFacet()->setAppliedFacet($this->transEsc('Skip to facet', ['%%filter_name%%' => $this->facet['displayText']])) ?>"<?php endif; ?> + href="<?=$toggleUrl ?>" + class="<?=implode(' ', $classList) ?>" + data-title="<?=$this->escapeHtmlAttr($this->facet['displayText']) ?>" + data-count="<?=$this->facet['count'] ?>" + title="<?php if($this->facet['isApplied']): ?><?=$this->transEsc('applied_filter')?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php else: ?><?=$this->transEsc('page_reload_on_select_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php endif;?>" + data-lightbox-ignore> <?php endif; ?> <?php if ($hasSubLinks): ?> - <a class="text" href="<?=$toggleUrl ?>" data-lightbox-ignore data-title="<?=$this->escapeHtmlAttr($this->facet['displayText']) ?>" data-count="<?=$this->facet['count'] ?>"<?php if($this->facet['isApplied']): ?> title="<?=$this->transEsc('applied_filter') ?>"<?php endif;?>> + <a class="text" + href="<?=$toggleUrl ?>" + data-lightbox-ignore + data-title="<?=$this->escapeHtmlAttr($this->facet['displayText']) ?>" + data-count="<?=$this->facet['count'] ?>" + title="<?php if($this->facet['isApplied']): ?><?=$this->transEsc('applied_filter')?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $this->facet['displayText']])?> <?=$this->escapeHtmlAttr($this->facet['displayText']) ?><?php else: ?><?=$this->transEsc('page_reload_on_select_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php endif;?>"> <?=$displayText ?> </a> <?php else: ?> @@ -48,13 +60,15 @@ <?php if (!$this->facet['isApplied']): ?> <span class="badge"> - <?=$this->localizedNumber($this->facet['count']) ?> + <?=$this->localizedNumber($this->facet['count']) ?><span class="sr-only"><?=$this->transEsc('results') ?></span> </span> <?php endif; ?> <?php if ($this->exclude && !$this->facet['isApplied']): ?> <?php $excludeURL = $this->urlBase . $this->url->addFacet($this->group, $this->facet['value'], 'NOT'); ?> - <a href="<?=$excludeURL ?>" data-lightbox-ignore class="exclude"><i class="fa fa-times" aria-hidden="true"></i><span class="sr-only"><?=$this->transEsc('exclude_facet') ?></span> </a> + <a href="<?=$excludeURL ?>" data-lightbox-ignore class="exclude" title="<?= $this->transEsc('exclude_filter', ['%%filter_name%%' => $this->facet['displayText']]) ?>, <?= $this->transEsc('page_reload_hint') ?>"> + <i class="fa fa-times" aria-hidden="true"></i> + </a> <?php endif; ?> <?=$hasSubLinks ? '</div>' : '</a>'; ?> diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/collection-info.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/collection-info.phtml index 9a632703f394087e73e9d4c8dc200cdaf71855c6..2b96c5e046628620c370044e9800c874a4346623 100644 --- a/themes/finc/templates/RecordDriver/DefaultRecord/collection-info.phtml +++ b/themes/finc/templates/RecordDriver/DefaultRecord/collection-info.phtml @@ -52,7 +52,7 @@ <?php /* finc: we use 'collapse in' to initially hide the content, we also include responsive data table - CK */ ?> <table id="collectionInfo" class="table table-striped table-resp-data collapse in"> - <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption> + <caption><span class="sr-only"><?=$this->transEsc('Bibliographic Details')?></span></caption> <?php foreach ($fields as $current): ?> <tr><th><?=$this->transEsc($current['label'])?>:</th><td data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td></tr> <?php endforeach; ?> diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml index 0b79440ae627021b65937b68a7a07480e645e6a3..d6bed8b7ffb3b6681eec400f79466cbb06a4491d 100644 --- a/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml +++ b/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml @@ -9,7 +9,7 @@ <?php if (!empty($fields)): ?> <?php /* include responsive data table - CK */ ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption> + <caption><span class="sr-only"><?=$this->transEsc('Bibliographic Details')?></span></caption> <?php foreach ($fields as $current): ?> <tr><th><?=$this->transEsc($current['label'])?>:</th><td data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td></tr> <?php endforeach; ?> diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml index 2fb24aa1bf328fb5013725bbcdce4c9de5d10252..e7b39706ee3f3f2fdd8e46c481d40ecc9c8a5d25 100644 --- a/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml +++ b/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml @@ -65,7 +65,7 @@ <?php if (!empty($coreFields)): ?> <?php /* include responsive data table - CK */ ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></caption> + <caption><span class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></span></caption> <?php foreach ($coreFields as $current): ?> <tr> <th><?= $this->transEsc($current['label']) ?>:</th> diff --git a/themes/finc/templates/RecordDriver/SolrAI/core.phtml b/themes/finc/templates/RecordDriver/SolrAI/core.phtml index 8ff58d1fdd303d8224c46529e7c1677cd7e804fb..504fe19d7dc63a99975874b717c6c1db529101af 100644 --- a/themes/finc/templates/RecordDriver/SolrAI/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrAI/core.phtml @@ -65,7 +65,7 @@ <?php if (!empty($coreFields)): ?> <?php /* include responsive data table - CK */ ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></caption> + <caption><span class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></span></caption> <?php foreach ($coreFields as $current): ?> <?php if ($current['label'] == null): ?> <?= $current['value'] ?> diff --git a/themes/finc/templates/RecordDriver/SolrLido/core.phtml b/themes/finc/templates/RecordDriver/SolrLido/core.phtml index 8eed15270f91375cb0d4162a57c86c12e0e8316d..5436e6000a8e689cb50c49edddc31049421d87b6 100644 --- a/themes/finc/templates/RecordDriver/SolrLido/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrLido/core.phtml @@ -90,7 +90,7 @@ <?php if (!empty($coreFields)): ?> <?php /* include responsive data table - CK */ ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption> + <caption><span class="sr-only"><?=$this->transEsc('Bibliographic Details')?></span></caption> <?php foreach ($coreFields as $current): ?> <?php if ($current['label'] == null): ?> <?=$current['value']?> diff --git a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml index 36078b3bbbd57eb88e6a9d5700798696e31f61e5..89f4018e26abf6c4bccd8961fed1c7a92762290e 100644 --- a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml @@ -65,7 +65,7 @@ <?php if (!empty($coreFields)): ?> <?php /* include responsive data table - CK */ ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></caption> + <caption><span class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></span></caption> <?php foreach ($coreFields as $current): ?> <?php if ($current['label'] == null): ?> <?= $current['value'] ?> diff --git a/themes/finc/templates/RecordTab/description.phtml b/themes/finc/templates/RecordTab/description.phtml index 48285ed3c4f6759364a15215453eb855c3b2b65c..0e39ff89ba9bad658a112800f42272aa2d5adde1 100644 --- a/themes/finc/templates/RecordTab/description.phtml +++ b/themes/finc/templates/RecordTab/description.phtml @@ -10,7 +10,7 @@ $mainFields = $formatter->getData($driver, $formatter->getDefaults('description' <table class="table table-striped table-resp-data"> <?php /* Table gets filled via recordDriver/.../data-... templates as referenced in RecordDataFormatterFactory */ ?> - <caption class="sr-only"><?=$this->transEsc('Description')?></caption> + <caption><span class="sr-only"><?=$this->transEsc('Description')?></span></caption> <?php if (!empty($mainFields)): ?> <?php foreach ($mainFields as $current): ?> <tr> diff --git a/themes/finc/templates/RecordTab/descriptionlido.phtml b/themes/finc/templates/RecordTab/descriptionlido.phtml index 2afd501a844b9f748c06657c879536e79a3a6a3e..939b171f95eefcc3f9f00317a898dafd25cf85b9 100644 --- a/themes/finc/templates/RecordTab/descriptionlido.phtml +++ b/themes/finc/templates/RecordTab/descriptionlido.phtml @@ -11,7 +11,7 @@ $mainFields = $formatter->getData($driver, $formatter->getDefaults('description- finc: remove schema tag here but keep in core, include responsive data table - CK */ ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"><?= $this->transEsc('Description') ?></caption> + <caption><span class="sr-only"><?= $this->transEsc('Description') ?></span></caption> <?php if (!empty($mainFields)): ?> <?php foreach ($mainFields as $current): ?> <tr><th><?=$this->transEsc($current['label'])?>:</th><td lang="" data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td></tr> diff --git a/themes/finc/templates/RecordTab/holdingsils.phtml b/themes/finc/templates/RecordTab/holdingsils.phtml index 2a1b7d38980faea8decad659732d774738ea151a..f83b8b0688e73a6b8b09f1fa3db00262f42c0bcc 100644 --- a/themes/finc/templates/RecordTab/holdingsils.phtml +++ b/themes/finc/templates/RecordTab/holdingsils.phtml @@ -106,7 +106,7 @@ if (!empty($holdingTitleHold)): ?> <?php /* finc: this next section produces an empty table in some cases - the table borders collapse, producing a thick line - should be solved more elegantly - Fixme. include responsive data table - CK */ ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"><?=$this->transEsc('holdings_details_from', ['%%location%%' => $this->transEsc($holding['location'])])?></caption> + <caption><span class="sr-only"><?=$this->transEsc('holdings_details_from', ['%%location%%' => $this->transEsc($holding['location'])])?></span></caption> <?php /* finc: change order and structure of table #13606 - VE */ ?> <?php foreach ($holding['items'] as $row): ?> <?php diff --git a/themes/finc/templates/RecordTab/topics.phtml b/themes/finc/templates/RecordTab/topics.phtml index 13f6cd369297877c28a76153a21061ac64ca420e..40d1f149f839a6b4f7ab6fa43499d9ce7711dd26 100644 --- a/themes/finc/templates/RecordTab/topics.phtml +++ b/themes/finc/templates/RecordTab/topics.phtml @@ -5,9 +5,7 @@ $this->headTitle($this->translate('Topics') . ': ' . $this->driver->getBreadcrum ?> <table class="table table-striped table-resp-data"> - <caption class="sr-only"> - <?=$this->transEsc('Topics')?> - </caption> + <caption><span class="sr-only"><?=$this->transEsc('Topics')?></span></caption> <?php if ($rvk = $this->driver->tryMethod('getRvkWithMetadata')): ?> <?php $contentDisplayed = true; ?> <tr> diff --git a/themes/finc/templates/layout/layout.phtml b/themes/finc/templates/layout/layout.phtml index 0ec319d7ed627ac142d57492d419004954a8393c..c2b6a370feb8ac53c20deecea4b26f0bd41c64b7 100644 --- a/themes/finc/templates/layout/layout.phtml +++ b/themes/finc/templates/layout/layout.phtml @@ -181,10 +181,18 @@ if (!isset($this->layout()->searchbox)) { <?php endif; ?> <a class="sr-only" href="#content"><?=$this->transEsc('Skip to content')?></a> <?php if (substr_count(strtolower($this->layout()->templateName), 'results') > 0): ?> - <?php if (strcmp($this->layout()->userLang, 'de') == 0): ?> - <a class="sr-only hidden-xs" href="#myresearch-sidebar"><?=$this->transEsc(isset($this->overrideSideFacetCaption) ? $this->overrideSideFacetCaption : 'Narrow Search')?></a> + <?php $applied = $this->sideFacet()->getAppliedFacets(); ?> + <?php if (!empty($applied)): ?> + <?php foreach ($applied as $appliedId => $appliedText): ?> + <?php if ($appliedId && $appliedText): ?> + <?php /* use css class 'skip-to' to jump to landmark - RL */?> + <a class="sr-only hidden-xs skip-to" href="#<?=$appliedId?>"><?=$appliedText?></a> + <?php endif; ?> + <?php endforeach; ?> + <?php elseif (strcmp($this->layout()->userLang, 'de') == 0): ?> + <a class="sr-only hidden-xs skip-to" href="#myresearch-sidebar"><?=$this->transEsc(isset($this->overrideSideFacetCaption) ? $this->overrideSideFacetCaption : 'Narrow Search')?></a> <?php else: ?> - <a class="sr-only hidden-xs" href="#myresearch-sidebar"><?=$this->transEsc('skip-to')?><?=strtolower($this->transEsc(isset($this->overrideSideFacetCaption) ? $this->overrideSideFacetCaption : 'Narrow Search'))?></a> + <a class="sr-only hidden-xs skip-to" href="#myresearch-sidebar"><?=$this->transEsc('skip-to')?><?=strtolower($this->transEsc(isset($this->overrideSideFacetCaption) ? $this->overrideSideFacetCaption : 'Narrow Search'))?></a> <?php endif; ?> <?php endif; ?> </div> diff --git a/themes/finc/templates/librarycards/home.phtml b/themes/finc/templates/librarycards/home.phtml index 3e952a5f02ed0e5a20263aecef1537e8933e3e78..25338aa28e5edea51bc2a71d4f43f48a6918bd21 100644 --- a/themes/finc/templates/librarycards/home.phtml +++ b/themes/finc/templates/librarycards/home.phtml @@ -21,8 +21,10 @@ <?php else: ?> <?php /* Table works without further responsiveness code inserted - CK */ ?> <table class="table table-striped"> - <caption class="sr-only"> - <?=$this->transEsc('Library Cards')?> + <caption> + <span class="sr-only"> + <?=$this->transEsc('Library Cards')?> + </span> </caption> <tr> <th><?=$this->transEsc('Library Card Name')?></th> diff --git a/themes/finc/templates/myresearch/fines.phtml b/themes/finc/templates/myresearch/fines.phtml index a77e2fdcc7e3cc103fb8599f93cd7fbf34bf63bb..a4054ab251ff02135bbac77bc1fddac309500dbb 100644 --- a/themes/finc/templates/myresearch/fines.phtml +++ b/themes/finc/templates/myresearch/fines.phtml @@ -68,7 +68,7 @@ ?> <?php /* include responsive data table - CK */ ?> <table class="table table-striped table-resp-data-md"> - <caption class="sr-only"><?=$this->transEsc('Your Fines')?></caption> + <caption><span class="sr-only"><?=$this->transEsc('Your Fines')?></span></caption> <tr> <?php foreach ($columns as $header): ?> <th><?=$this->transEsc($header)?></th>