diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index 8052ab93cffa16d6a01a29d6ebba7d549d6eaed0..495b3d4aa75e2904102d6d74101955c2cff82c31 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -2223,7 +2223,21 @@ footer ul {
border: $border-default-styles;
color: $btn-default-color;
left: auto;
+ opacity: 1;
right: 0;
+
+ @media (min-width: 768px) {
+ right: -60px;
+
+ body.rtl & {
+ left: -60px;
+ }
+ }
+
+ &:hover {
+ background-color: $black;
+ }
+
}
// MODALS - END
diff --git a/themes/finc/templates/collection/view.phtml b/themes/finc/templates/collection/view.phtml
index 9bf735648959ae619108283cb44eabf60e0703e5..940d193f5559d3b1fd672a1af1f7895454613880 100644
--- a/themes/finc/templates/collection/view.phtml
+++ b/themes/finc/templates/collection/view.phtml
@@ -1,137 +1,140 @@
<!-- finc: collection - view -->
<?php
-// Set up standard record scripts:
-$this->headScript()->appendFile("record.js");
-$this->headScript()->appendFile("check_save_statuses.js");
-// Activate Syndetics Plus if necessary:
-if ($this->syndeticsPlus()->isActive()) {
- $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
-}
-
-// Add RDF header link if applicable:
-if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) {
- $this->headLink()->appendAlternate($this->recordLink()->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
-}
-
-// Set flag for special cases relating to full-width hierarchy tree tab:
-$tree = (strtolower($this->activeTab) == 'hierarchytree');
-
-// Set up breadcrumbs:
-$lastSearch = $this->searchMemory()->getLastSearchLink($this->transEsc('Search'));
-if (!empty($lastSearch)) {
- $this->layout()->breadcrumbs = '<li>' . $lastSearch . '</li> ';
-}
-$this->layout()->breadcrumbs .= '<li><a href="' . $this->url('collections-home') . '">' . $this->transEsc('Collections') . '</a></li> '
- . '<li class="active">' . $this->recordLink()->getBreadcrumb($this->driver) . '</li>';
+ // Set up standard record scripts:
+ $this->headScript()->appendFile("record.js");
+ $this->headScript()->appendFile("check_save_statuses.js");
+ // Activate Syndetics Plus if necessary:
+ if ($this->syndeticsPlus()->isActive()) {
+ $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
+ }
+
+ // Add RDF header link if applicable:
+ if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) {
+ $this->headLink()->appendAlternate($this->recordLink()->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
+ }
+
+ // Set flag for special cases relating to full-width hierarchy tree tab:
+ $tree = (strtolower($this->activeTab) == 'hierarchytree');
+
+ // Set up breadcrumbs:
+ $lastSearch = $this->searchMemory()->getLastSearchLink($this->transEsc('Search'));
+ if (!empty($lastSearch)) {
+ $this->layout()->breadcrumbs = '<li>' . $lastSearch . '</li> ';
+ }
+ $this->layout()->breadcrumbs .= '<li><a href="' . $this->url('collections-home') . '">' . $this->transEsc('Collections') . '</a></li> '
+ . '<li class="active">' . $this->recordLink()->getBreadcrumb($this->driver) . '</li>';
?>
<?php if (isset($this->scrollData) && ($this->scrollData['previousRecord'] || $this->scrollData['nextRecord'])): ?>
- <?php /* Pager is identical to pager in record - view! - CK */ ?>
- <ul class="pager hidden-print">
- <?php if ($this->scrollData['previousRecord']): ?>
- <?php if ($this->scrollData['firstRecord']): ?>
- <li class="left">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">« <?=$this->transEsc('First')?></a>
- </li>
- <?php endif; ?>
- <li class="left">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">« <?=$this->transEsc('Prev')?></a>
- </li>
- <?php else: ?>
- <?php if ($this->scrollData['firstRecord']): ?>
- <li class="disabled left"><a href="#">« <?=$this->transEsc('First')?></a></li>
- <?php endif; ?>
- <li class="disabled left"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
- <?php endif; ?>
- <?php /* finc-specific: li + hidden-xs, and li right below CK */ ?>
- <li class="hidden-xs">
- <?=$this->transEsc('of_num_results', [
- '%%position%%' => $this->localizedNumber($this->scrollData['currentPosition']),
- '%%total%%' => $this->localizedNumber($this->scrollData['resultTotal'])
- ]) ?>
- </li>
- <?php if ($this->scrollData['nextRecord']): ?>
- <li class="right">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> »</a>
+ <?php /* Pager is identical to pager in record - view! - CK */ ?>
+ <nav aria-label="<?= $this->transEsc('pagination_navigation') ?>">
+ <ul class="pager hidden-print">
+ <?php if ($this->scrollData['previousRecord']): ?>
+ <?php if ($this->scrollData['firstRecord']): ?>
+ <li class="left">
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['firstRecord']) ?>" title="<?= $this->transEsc('First Search Result') ?>" rel="nofollow" aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('First Search Result') ?>"><span aria-hidden="true">«</span> <?= $this->transEsc('First') ?></a>
+ </li>
+ <?php endif; ?>
+ <li class="left">
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['previousRecord']) ?>" title="<?= $this->transEsc('Previous Search Result') ?>" rel="nofollow" aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('Previous Search Result') ?>"><span aria-hidden="true">«</span> <?= $this->transEsc('Prev') ?></a>
+ </li>
+ <?php else: ?>
+ <?php if ($this->scrollData['firstRecord']): ?>
+ <li class="disabled left"><a href="#"><span aria-hidden="true">«</span> <?= $this->transEsc('First') ?></a></li>
+ <?php endif; ?>
+ <li class="disabled left"><a href="#"><span aria-hidden="true">«</span> <?= $this->transEsc('Prev') ?></a></li>
+ <?php endif; ?>
+ <?php /* finc-specific: li + hidden-xs, and li right below CK */ ?>
+ <li class="hidden-xs">
+ <?= $this->transEsc('of_num_results', [
+ '%%position%%' => $this->localizedNumber($this->scrollData['currentPosition']),
+ '%%total%%' => $this->localizedNumber($this->scrollData['resultTotal'])
+ ]) ?>
</li>
- <?php if ($this->scrollData['lastRecord']): ?>
- <li class="right">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> »</a>
- </li>
- <?php endif; ?>
- <?php else: ?>
- <li class="disabled right"><a href="#"><?=$this->transEsc('Next')?> »</a></li>
- <?php if ($this->scrollData['lastRecord']): ?>
- <li class="disabled right"><a href="#"><?=$this->transEsc('Last')?> »</a></li>
- <?php endif; ?>
- <?php endif; ?>
- </ul>
+ <?php if ($this->scrollData['nextRecord']): ?>
+ <li class="right">
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['nextRecord']) ?>" title="<?= $this->transEsc('Next Search Result') ?>" rel="nofollow" aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('Next Search Result') ?>"><?= $this->transEsc('Next') ?> <span aria-hidden="true">»</span></a>
+ </li>
+ <?php if ($this->scrollData['lastRecord']): ?>
+ <li class="right">
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['lastRecord']) ?>" title="<?= $this->transEsc('Last Search Result') ?>" rel="nofollow"
+ aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('Last Search Result') ?>"><?= $this->transEsc('Last') ?> <span aria-hidden="true">»</span></a>
+ </li>
+ <?php endif; ?>
+ <?php else: ?>
+ <li class="disabled right" aria-hidden="true"><a href="#"><?= $this->transEsc('Next') ?> »</a></li>
+ <?php if ($this->scrollData['lastRecord']): ?>
+ <li class="disabled right" aria-hidden="true"><a href="#"><?= $this->transEsc('Last') ?> »</a></li>
+ <?php endif; ?>
+ <?php endif; ?>
+ </ul>
+ </nav>
<?php endif; ?>
<?php /* DON'T pull the toolbar in here but below, finc-specific, CK */ ?>
<div class="record">
- <div<?php if (!$tree): /* in tree mode, do not constrain width with a class */ ?> class="<?=$this->layoutClass('mainbody') ?>"<?php endif; ?>>
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId" id="record_id"/>
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>" class="hiddenSource"/>
- <?=$this->flashmessages()?>
- <?=$this->record($this->driver)->getCollectionMetadata()?>
+ <div<?php if (!$tree): /* in tree mode, do not constrain width with a class */ ?> class="<?= $this->layoutClass('mainbody') ?>"<?php endif; ?>>
+ <input type="hidden" value="<?= $this->escapeHtmlAttr($this->driver->getUniqueId()) ?>" class="hiddenId" id="record_id"/>
+ <input type="hidden" value="<?= $this->escapeHtmlAttr($this->driver->getSourceIdentifier()) ?>" class="hiddenSource"/>
+ <?= $this->flashmessages() ?>
+ <?= $this->record($this->driver)->getCollectionMetadata() ?>
+
+ <?php if (count($this->tabs) > 0): ?>
+ <a name="tabnav"></a>
+ <div class="record-tabs">
+ <ul class="nav nav-tabs">
+ <?php foreach ($this->tabs as $tab => $obj): ?>
+ <?php // add current tab to breadcrumbs if applicable:
+ $desc = $obj->getDescription();
+ $tab_classes = [];
+ if (0 === strcasecmp($this->activeTab, $tab)) {
+ if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
+ $tab_classes[] = 'active';
+ }
+ $tab_classes[] = 'initiallyActive';
+ $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
+ $activeTabObj = $obj;
+ }
+ if (!$obj->isVisible()) {
+ $tab_classes[] = 'hidden';
+ }
+ if (!$obj->supportsAjax()) {
+ $tab_classes[] = 'noajax';
+ }
+ ?>
+ <li <?= count($tab_classes) > 0 ? ' class="' . implode(' ', $tab_classes) . '"' : '' ?>>
+ <a class="<?= strtolower($tab) ?>"
+ href="<?= $this->recordLink()->getTabUrl($this->driver, $tab) ?>#tabnav"<?php if ($obj->supportsAjax() && in_array($tab, $this->backgroundTabs)): ?> data-background<?php endif ?>><?= $this->transEsc($desc) ?></a>
+ </li>
+ <?php endforeach; ?>
+ </ul>
-
- <?php if (count($this->tabs) > 0): ?>
- <a name="tabnav"></a>
- <div class="record-tabs">
- <ul class="nav nav-tabs">
- <?php foreach ($this->tabs as $tab => $obj): ?>
- <?php // add current tab to breadcrumbs if applicable:
- $desc = $obj->getDescription();
- $tab_classes = [];
- if (0 === strcasecmp($this->activeTab, $tab)) {
- if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
- $tab_classes[] = 'active';
- }
- $tab_classes[] = 'initiallyActive';
- $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
- $activeTabObj = $obj;
- }
- if (!$obj->isVisible()) {
- $tab_classes[] = 'hidden';
- }
- if (!$obj->supportsAjax()) {
- $tab_classes[] = 'noajax';
- }
- ?>
- <li<?=count($tab_classes) > 0 ? ' class="' . implode(' ', $tab_classes) . '"' : ''?>>
- <a class="<?=strtolower($tab)?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>#tabnav"<?php if ($obj->supportsAjax() && in_array($tab, $this->backgroundTabs)): ?> data-background<?php endif ?>><?=$this->transEsc($desc)?></a>
- </li>
- <?php endforeach; ?>
- </ul>
-
- <div class="tab-content collectionDetails<?=$tree ? 'Tree' : ''?>">
- <?php if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
- <div class="tab-pane active <?=$this->activeTab?>-tab">
- <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
- </div>
- <?php endif; ?>
+ <div class="tab-content collectionDetails<?= $tree ? 'Tree' : '' ?>">
+ <?php if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+ <div class="tab-pane active <?= $this->activeTab ?>-tab">
+ <?= isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : '' ?>
+ </div>
+ <?php endif; ?>
+ </div>
</div>
+ <?php endif; ?>
+
+ <?= $this->driver->supportsCoinsOpenURL() ? '<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>' : '' ?>
+ </div>
+
+ <?php if (isset($activeTabObj) && is_callable([$activeTabObj, 'getSideRecommendations'])): ?>
+ <div class="<?= $this->layoutClass('sidebar') ?>">
+
+ <?php /* pull the toolbar here, finc-specific, CK */ ?>
+ <?= $this->record($this->driver)->getToolbar() ?>
+
+ <?php foreach ($activeTabObj->getSideRecommendations() as $current): ?>
+ <?= $this->recommend($current) ?>
+ <?php endforeach; ?>
</div>
<?php endif; ?>
-
- <?=$this->driver->supportsCoinsOpenURL() ? '<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>' : ''?>
- </div>
-
- <?php if (isset($activeTabObj) && is_callable([$activeTabObj, 'getSideRecommendations'])): ?>
- <div class="<?=$this->layoutClass('sidebar')?>">
-
- <?php /* pull the toolbar here, finc-specific, CK */ ?>
- <?=$this->record($this->driver)->getToolbar()?>
-
- <?php foreach ($activeTabObj->getSideRecommendations() as $current): ?>
- <?=$this->recommend($current)?>
- <?php endforeach; ?>
- </div>
- <?php endif; ?>
</div>
-<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET');?>
+<?= $this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET'); ?>
<!-- finc: collection - view - END -->
diff --git a/themes/finc/templates/layout/layout.phtml b/themes/finc/templates/layout/layout.phtml
index 22c1d8c7dedd536e280c568c7f682f5c34b2d8eb..3af2712633cadc404d5b730852a5fd8009a1aac1 100644
--- a/themes/finc/templates/layout/layout.phtml
+++ b/themes/finc/templates/layout/layout.phtml
@@ -207,14 +207,16 @@ if (!isset($this->layout()->searchbox)) {
<div id="modal" class="modal fade hidden-print" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-title" aria-hidden="true" aria-describedby="modal-description">
<div class="modal-dialog">
<div class="modal-content">
+ <button type="button" class="close" data-dismiss="modal" tabindex="0">
+ <span class="sr-only"><?= $this->transEsc('CloseModal') ?></span>
+ <i class="fa fa-times" aria-hidden="true"></i>
+ </button>
<div class="sr-only" id="modal-description">
<?=$this->transEsc('Modal_description')?>
</div>
- <div class="modal-body"><?=$this->transEsc('Loading')?> ...</div>
- <button type="button" class="close" data-dismiss="modal" tabindex="0">
- <span class="sr-only"><?=$this->transEsc('CloseModal')?></span>
- <i class="fa fa-times" aria-hidden="true"></i>
- </button>
+ <div class="modal-body">
+ <span id="modal-title"><?=$this->transEsc('Loading')?> ...</span>
+ </div>
</div>
</div>
</div>
diff --git a/themes/finc/templates/record/cover.phtml b/themes/finc/templates/record/cover.phtml
index 35c7793efa121f56820a1141bfe88680dc4cc235..25c3a4a83873fab0b842a65d405672b1ab8d1537 100644
--- a/themes/finc/templates/record/cover.phtml
+++ b/themes/finc/templates/record/cover.phtml
@@ -4,7 +4,7 @@
the class .nocover prevents nocover images from loading in lightbox or can be used to hide the images */ ?>
<?php if ($cover): ?>
<?php if ($this->link): ?><a href="<?=$this->escapeHtmlAttr($this->link)?>" data-lightbox-image aria-hidden="true"><?php endif; ?>
- <img alt="<?=$this->transEsc('Cover Image')?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="recordcover" src="<?=$this->escapeHtmlAttr($cover); ?>"/>
+ <img alt="<?=$this->transEsc('Cover Image')?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="recordcover" src="<?=$this->escapeHtmlAttr($cover); ?>" aria-hidden="true"/>
<?php if ($this->link): ?></a><?php endif; ?>
<?php else: ?>
<img src="<?=$this->url('cover-unavailable')?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="nocover" alt="<?=$this->transEsc('No Cover Image')?>" aria-hidden="true" />
diff --git a/themes/finc/templates/record/view.phtml b/themes/finc/templates/record/view.phtml
index f9442b2b3e731a5bce282ca51e35c61fb4ab8ac2..5ba792c5e1c03fcd248edadde3a2385158ab5007 100644
--- a/themes/finc/templates/record/view.phtml
+++ b/themes/finc/templates/record/view.phtml
@@ -1,136 +1,141 @@
<!-- finc: record - view -->
<?php
-// Set up standard record scripts:
-$this->headScript()->appendFile("record.js");
-$this->headScript()->appendFile("check_save_statuses.js");
-// Activate Syndetics Plus if necessary:
-if ($this->syndeticsPlus()->isActive()) {
- $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
-}
-
-// Add RDF header link if applicable:
-if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) {
- $this->headLink()->appendAlternate($this->recordLink()->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
-}
-
-// Set up breadcrumbs:
-$this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ') .
- '<li class="active">' . $this->recordLink()->getBreadcrumb($this->driver) . '</li> ';
-$this->layout()->title = $this->driver->getShortTitle();
+ // Set up standard record scripts:
+ $this->headScript()->appendFile("record.js");
+ $this->headScript()->appendFile("check_save_statuses.js");
+ // Activate Syndetics Plus if necessary:
+ if ($this->syndeticsPlus()->isActive()) {
+ $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
+ }
+
+ // Add RDF header link if applicable:
+ if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) {
+ $this->headLink()->appendAlternate($this->recordLink()->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
+ }
+
+ // Set up breadcrumbs:
+ $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ') .
+ '<li class="active">' . $this->recordLink()->getBreadcrumb($this->driver) . '</li> ';
+ $this->layout()->title = $this->driver->getShortTitle();
?>
- <?php if (isset($this->scrollData) && ($this->scrollData['previousRecord'] || $this->scrollData['nextRecord'])): ?>
- <?php
- /* Pager is identical to pager in collection - view!
- Keep .left/.right classes for alignment on left/right edge - CK */
- ?>
- <ul class="pager hidden-print">
- <?php if ($this->scrollData['previousRecord']): ?>
- <?php if ($this->scrollData['firstRecord']): ?>
- <li class="left">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">« <?=$this->transEsc('First')?></a>
+<?php if (isset($this->scrollData) && ($this->scrollData['previousRecord'] || $this->scrollData['nextRecord'])): ?>
+ <?php
+ /* Pager is identical to pager in collection - view!
+ Keep .left/.right classes for alignment on left/right edge - CK */
+ ?>
+ <nav aria-label="<?= $this->transEsc('pagination_navigation') ?>">
+ <ul class="pager hidden-print">
+ <?php if ($this->scrollData['previousRecord']): ?>
+ <?php if ($this->scrollData['firstRecord']): ?>
+ <li class="left">
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['firstRecord']) ?>" title="<?= $this->transEsc('First Search Result') ?>" rel="nofollow" aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('First Search Result') ?>"><span aria-hidden="true">«</span> <?= $this->transEsc('First') ?></a>
+ </li>
+ <?php endif; ?>
+ <li class="left">
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['previousRecord']) ?>" title="<?= $this->transEsc('Previous Search Result') ?>" rel="nofollow" aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('Previous Search Result') ?>"><span aria-hidden="true">«</span> <?= $this->transEsc('Prev') ?></a>
</li>
+ <?php else: ?>
+ <?php if ($this->scrollData['firstRecord']): ?>
+ <li class="disabled left"><a href="#"><span aria-hidden="true">«</span> <?= $this->transEsc('First') ?></a></li>
+ <?php endif; ?>
+ <li class="disabled left"><a href="#"><span aria-hidden="true">«</span> <?= $this->transEsc('Prev') ?></a></li>
<?php endif; ?>
- <li class="left">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">« <?=$this->transEsc('Prev')?></a>
- </li>
- <?php else: ?>
- <?php if ($this->scrollData['firstRecord']): ?>
- <li class="disabled left"><a href="#">« <?=$this->transEsc('First')?></a></li>
- <?php endif; ?>
- <li class="disabled left"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
- <?php endif; ?>
- <?php
- /* finc-specific wrapping: li + hidden-xs for consistency - CK */
- ?>
+ <?php /* finc-specific wrapping: li + hidden-xs for consistency - CK */ ?>
<li class="hidden-xs">
- <?=$this->transEsc('of_num_results', [
- '%%position%%' => $this->localizedNumber($this->scrollData['currentPosition']),
- '%%total%%' => $this->localizedNumber($this->scrollData['resultTotal'])
- ]) ?>
+ <?= $this->transEsc('of_num_results', [
+ '%%position%%' => $this->localizedNumber($this->scrollData['currentPosition']),
+ '%%total%%' => $this->localizedNumber($this->scrollData['resultTotal'])
+ ]) ?>
</li>
- <?php if ($this->scrollData['nextRecord']): ?>
- <li class="right">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> »</a>
- </li>
- <?php if ($this->scrollData['lastRecord']): ?>
+ <?php if ($this->scrollData['nextRecord']): ?>
<li class="right">
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> »</a>
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['nextRecord']) ?>" title="<?= $this->transEsc('Next Search Result') ?>" rel="nofollow" aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('Next Search Result') ?>"><?= $this->transEsc('Next') ?> <span aria-hidden="true">»</span></a>
</li>
+ <?php if ($this->scrollData['lastRecord']): ?>
+ <li class="right">
+ <a href="<?= $this->recordLink()->getUrl($this->scrollData['lastRecord']) ?>" title="<?= $this->transEsc('Last Search Result') ?>" rel="nofollow" aria-label="<?= $this->transEsc('go_to') ?> <?= $this->transEsc('Last Search Result') ?>"><?= $this->transEsc('Last') ?> <span aria-hidden="true">»</span></a>
+ </li>
+ <?php endif; ?>
+ <?php else: ?>
+ <li class="disabled right" aria-hidden="true"><a href="#"><?= $this->transEsc('Next') ?> »</a></li>
+ <?php if ($this->scrollData['lastRecord']): ?>
+ <li class="disabled right" aria-hidden="true"><a href="#"><?= $this->transEsc('Last') ?> »</a></li>
+ <?php endif; ?>
<?php endif; ?>
- <?php else: ?>
- <li class="disabled right"><a href="#"><?=$this->transEsc('Next')?> »</a></li>
- <?php if ($this->scrollData['lastRecord']): ?>
- <li class="disabled right"><a href="#"><?=$this->transEsc('Last')?> »</a></li>
- <?php endif; ?>
- <?php endif; ?>
</ul>
- <?php endif; ?>
+ </nav>
+<?php endif; ?>
- <?php
- /* finc-specific: Remove getToolbar from here and add it to sidebar below - CK
- <?=$this->record($this->driver)->getToolbar()?> */
- ?>
+<?php
+ /* finc-specific: Remove getToolbar from here and add it to sidebar below - CK
+ <?=$this->record($this->driver)->getToolbar()?> */
+?>
- <div class="record source<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>">
+<div class="record source<?= $this->escapeHtmlAttr($this->driver->getSourceIdentifier()) ?>">
<?php /* finc: remove related-sidebar count and "solo" class since we use a custom sidebar,
keep print classes, CK */ ?>
<?php $sidebarList = $this->related()->getList($this->driver); ?>
- <div class="<?=$this->layoutClass('mainbody')?> print-full-width">
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId"/>
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>" class="hiddenSource"/>
- <?=$this->flashmessages()?>
- <?=$this->record($this->driver)->getCoreMetadata()?>
-
+ <div class="<?= $this->layoutClass('mainbody') ?> print-full-width">
+ <input type="hidden" value="<?= $this->escapeHtmlAttr($this->driver->getUniqueId()) ?>" class="hiddenId"/>
+ <input type="hidden" value="<?= $this->escapeHtmlAttr($this->driver->getSourceIdentifier()) ?>" class="hiddenSource"/>
+ <?= $this->flashmessages() ?>
+ <?= $this->record($this->driver)->getCoreMetadata() ?>
+
<?php if (count($this->tabs) > 0): ?>
<a name="tabnav"></a>
<div class="record-tabs">
<ul class="nav nav-tabs">
- <?php foreach ($this->tabs as $tab => $obj): ?>
- <?php // add current tab to breadcrumbs if applicable:
- $desc = $obj->getDescription();
- $tabName = preg_replace("/\W/", "-", strtolower($tab));
- $tabClasses = [ 'record-tab', $tabName ];
- if (0 === strcasecmp($this->activeTab, $tab)) {
- if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
- $tabClasses[] = 'active';
- }
- $tabClasses[] = 'initiallyActive';
- $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
- $activeTabObj = $obj;
- }
- if (!$obj->isVisible()) { $tabClasses[] = 'hidden'; }
- if (!$obj->supportsAjax()) { $tabClasses[] = 'noajax'; }
- ?>
- <li class="<?=implode(' ', $tabClasses)?>" data-tab="<?=$tabName?>">
- <a href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>#tabnav"<?php if ($obj->supportsAjax() && in_array($tab, $this->backgroundTabs)):?> data-background<?php endif ?>><?=$this->transEsc($desc)?></a>
- </li>
- <?php endforeach; ?>
+ <?php foreach ($this->tabs as $tab => $obj): ?>
+ <?php // add current tab to breadcrumbs if applicable:
+ $desc = $obj->getDescription();
+ $tabName = preg_replace("/\W/", "-", strtolower($tab));
+ $tabClasses = ['record-tab', $tabName];
+ if (0 === strcasecmp($this->activeTab, $tab)) {
+ if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
+ $tabClasses[] = 'active';
+ }
+ $tabClasses[] = 'initiallyActive';
+ $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
+ $activeTabObj = $obj;
+ }
+ if (!$obj->isVisible()) {
+ $tabClasses[] = 'hidden';
+ }
+ if (!$obj->supportsAjax()) {
+ $tabClasses[] = 'noajax';
+ }
+ ?>
+ <li class="<?= implode(' ', $tabClasses) ?>" data-tab="<?= $tabName ?>">
+ <a
+ href="<?= $this->recordLink()->getTabUrl($this->driver, $tab) ?>#tabnav"<?php if ($obj->supportsAjax() && in_array($tab, $this->backgroundTabs)): ?> data-background<?php endif ?>><?= $this->transEsc($desc) ?></a>
+ </li>
+ <?php endforeach; ?>
</ul>
<div class="tab-content">
- <?php if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
- <div class="tab-pane active <?=$this->escapeHtmlAttr($this->activeTab) ?>-tab">
- <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
- </div>
- <?php endif; ?>
+ <?php if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+ <div class="tab-pane active <?= $this->escapeHtmlAttr($this->activeTab) ?>-tab">
+ <?= isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : '' ?>
+ </div>
+ <?php endif; ?>
</div>
</div>
<?php endif; ?>
-
- <?=$this->driver->supportsCoinsOpenURL() ? '<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>' : ''?>
- </div>
+
+ <?= $this->driver->supportsCoinsOpenURL() ? '<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>' : '' ?>
+ </div>
- <div class="<?=$this->layoutClass('sidebar')?>">
+ <div class="<?= $this->layoutClass('sidebar') ?>">
<?php /* finc-specific: add toolbar to sidebar - CK */ ?>
- <?=$this->record($this->driver)->getToolbar()?>
-
+ <?= $this->record($this->driver)->getToolbar() ?>
+
<?php foreach ($sidebarList as $current): ?>
- <?=$this->related()->render($current)?>
+ <?= $this->related()->render($current) ?>
<?php endforeach; ?>
- </div>
</div>
+</div>
- <?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET');?>
- <!-- finc: record - view - END -->
+<?= $this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET'); ?>
+<!-- finc: record - view - END -->
diff --git a/themes/finc/templates/search/pagination.phtml b/themes/finc/templates/search/pagination.phtml
index 74708050efea7cfeea85875e4b59b50511ec30f3..55aecec9cbc288220586e75fea10b8d971c716cd 100644
--- a/themes/finc/templates/search/pagination.phtml
+++ b/themes/finc/templates/search/pagination.phtml
@@ -1,29 +1,32 @@
<!-- finc: search - pagination -->
<?php if ($this->pageCount): ?>
- <ul class="pagination">
- <?php if (isset($this->previous)): ?>
- <?php if (!isset($this->options['disableFirst']) || !$this->options['disableFirst']): ?>
- <li class="first"><a href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage(1)?>">[1]</a></li>
- <?php endif; ?>
- <li class="page-prev"><a href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->previous)?>">« <span class="hidden-xs"><?=$this->transEsc('Prev')?></span></a></li>
- <?php endif; ?>
-
- <?php if (count($this->pagesInRange) > 1): ?>
- <?php foreach ($this->pagesInRange as $page): ?>
- <?php if ($page != $this->current): ?>
- <li><a href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($page)?>"><?=$page?></a></li>
- <?php else: ?>
- <li class="active"><span><?=$page?></span></li>
+ <nav aria-label="<?= $this->transEsc('pagination_navigation') ?>">
+ <ul class="pagination">
+ <?php if (isset($this->previous)): ?>
+ <?php if (!isset($this->options['disableFirst']) || !$this->options['disableFirst']): ?>
+ <li class="first"><a href="<?= $this->currentPath() . $this->results->getUrlQuery()->setPage(1) ?>" aria-label="<?= $this->transEsc('go_to_first_page') ?>">[1]</a></li>
+ <?php endif; ?>
+ <li class="page-prev"><a href="<?= $this->currentPath() . $this->results->getUrlQuery()->setPage($this->previous) ?>"><span class="sr-only"><?= $this->transEsc('go_to_prev_page') ?></span><span aria-hidden="true"><span aria-hidden="true">«</span> <?= $this->transEsc('Prev') ?></span></a></li>
<?php endif; ?>
- <?php endforeach; ?>
- <?php endif; ?>
-
- <?php if (isset($this->next)): ?>
- <li class="page-next"><a href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->next)?>"><span class="hidden-xs"><?=$this->transEsc('Next');?></span> »</a></li>
- <?php if (!isset($this->options['disableLast']) || !$this->options['disableLast']): ?>
- <li class="last"><a href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->pageCount)?>">[<?=$this->pageCount?>]</a></li>
- <?php endif; ?>
- <?php endif; ?>
- </ul>
+
+ <?php if (count($this->pagesInRange) > 1): ?>
+ <?php foreach ($this->pagesInRange as $page): ?>
+ <?php if ($page != $this->current): ?>
+ <li><a href="<?= $this->currentPath() . $this->results->getUrlQuery()->setPage($page) ?>" aria-label="<?= $this->transEsc('go_to_page') ?> <?= $page ?>"><?= $page ?></a></li>
+ <?php else: ?>
+ <li class="active" aria-current="true" aria-label="<?= $this->transEsc('current_page') ?>, <?=$this->transEsc('page_no', ['%%page%%' => $page])?>"><span><?= $page ?></span></li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ <?php endif; ?>
+
+ <?php if (isset($this->next)): ?>
+ <li class="page-next"><a href="<?= $this->currentPath() . $this->results->getUrlQuery()->setPage($this->next) ?>"> <span class="sr-only"><?= $this->transEsc('go_to_next_page') ?></span>
+ <span aria-hidden="true"><?= $this->transEsc('Next'); ?> <span aria-hidden="true">»</span></span></a></li>
+ <?php if (!isset($this->options['disableLast']) || !$this->options['disableLast']): ?>
+ <li class="last"><a href="<?= $this->currentPath() . $this->results->getUrlQuery()->setPage($this->pageCount) ?>" aria-label="<?= $this->transEsc('go_to_last_page') ?>, <?= $this->transEsc('page') ?> <?= $this->pageCount ?>">[<?= $this->pageCount ?>]</a></li>
+ <?php endif; ?>
+ <?php endif; ?>
+ </ul>
+ </nav>
<?php endif; ?>
<!-- finc: search - pagination - END -->