diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index cb5895de1b468b878ac72865688514bfdfcd6c52..73eaa990f36b40d96afc4d9b144ba6884555c26f 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -579,20 +579,37 @@ $slick-next-prev-icon-font-size: 38px !default;
// ************ Carousels ******************************************
+
+$similar-items-carousel-tab-active-margin-bottom: 2rem !default;
+$similar-items-carousel-tab-active-margin-top: 1rem !default;
+
+
$carousel-control-elements-color: $brand-primary !default;
$carousel-control-elements-text-shadow: none !default;
+$carousel-control-elements-left-margin: -1rem !default;
+$carousel-control-elements-right-margin: -1rem !default;
$carousel-control-elements-left-right-background-image: none !default;
$carousel-control-elements-left-right-background-image-hover-background-image: none !default;
$carousel-control-elements-left-right-background-image-hover-color: lighten($brand-primary, 2%) !default;
+$carousel-control-inner-left-margin: -1rem !default;
+$carousel-item-padding: 0 2rem !default;
+
+$similar-items-carousel-indicators-bottom-distance: -3rem !default;
$similar-items-carousel-indicators-li-border-color: $brand-primary !default;
+$similar-items-carousel-indicators-li-border-radius: 0 !default;
$similar-items-carousel-indicators-li-box-shadow: none !default;
$similar-items-carousel-indicators-li-height: $font-size-base * 1.5 !default;
$similar-items-carousel-indicators-li-width: $font-size-base * 1.5 !default;
$similar-items-carousel-indicators-active-box-shadow: none !default;
+$similar-items-carousel-pause-button-border: 1px solid $brand-primary !default;
+$similar-items-carousel-pause-button-border-radius: 0 !default;
+$similar-items-carousel-pause-button-top-distance: -25px !default;
+$similar-items-carousel-pause-button-left-distance: 1rem !default;
+$similar-items-carousel-pause-button-z-index: 6000 !default;
diff --git a/themes/finc/scss/components/_carousel-similar-items-channels-slider.scss b/themes/finc/scss/components/_carousel-similar-items-channels-slider.scss
index a8c5353b947497bf60f45ebd674ba6f0130c1b1c..233406dc2143c016b1bc3e036ff85aea0c6fc67e 100644
--- a/themes/finc/scss/components/_carousel-similar-items-channels-slider.scss
+++ b/themes/finc/scss/components/_carousel-similar-items-channels-slider.scss
@@ -4,6 +4,22 @@
// ************ Carousels ******************************************
// *****************************************************************
+.similar-tab.active {
+ // Make room for indicator buttons
+ margin-bottom: $similar-items-carousel-tab-active-margin-bottom;
+ // Make room for Pause button
+ margin-top: $similar-items-carousel-tab-active-margin-top;
+}
+
+.carousel-pause-button,
+.carousel-pause-button.focus {
+ border-radius: $similar-items-carousel-pause-button-border-radius;
+ border: $similar-items-carousel-pause-button-border;
+ left: $similar-items-carousel-pause-button-left-distance;
+ top: $similar-items-carousel-pause-button-top-distance;
+ z-index: $similar-items-carousel-pause-button-z-index;
+}
+
.carousel-control {
color: $carousel-control-elements-color;
text-shadow: $carousel-control-elements-text-shadow;
@@ -12,19 +28,46 @@
&.right {
background-image: $carousel-control-elements-left-right-background-image;
+ &:focus {
+ background-image: $carousel-control-elements-left-right-background-image-hover-background-image;
+ color: $carousel-control-elements-left-right-background-image-hover-color;
+ }
+
&:hover {
background-image: $carousel-control-elements-left-right-background-image-hover-background-image;
color: $carousel-control-elements-left-right-background-image-hover-color;
}
}
+
+ &.left {
+ margin-left: $carousel-control-elements-left-margin;
+ }
+
+ &.right {
+ margin-right: $carousel-control-elements-right-margin;
+ }
+}
+
+.carousel-inner {
+ margin-left: $carousel-control-inner-left-margin;
}
+#similar-items-carousel .item {
+ padding: $carousel-item-padding;
+}
+
+
// ID selector required for specificity
-#similar-items-carousel .carousel-indicators li {
- border-color: $similar-items-carousel-indicators-li-border-color;
- box-shadow: $similar-items-carousel-indicators-li-box-shadow;
- height: $similar-items-carousel-indicators-li-height;
- width: $similar-items-carousel-indicators-li-width;
+#similar-items-carousel .carousel-indicators {
+ bottom: $similar-items-carousel-indicators-bottom-distance;
+
+ li {
+ border-color: $similar-items-carousel-indicators-li-border-color;
+ border-radius: $similar-items-carousel-indicators-li-border-radius;
+ box-shadow: $similar-items-carousel-indicators-li-box-shadow;
+ height: $similar-items-carousel-indicators-li-height;
+ width: $similar-items-carousel-indicators-li-width;
+ }
}
.carousel-indicators .active {
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
index de21dea7f4447e90b28528e46366483bb4851037..f05ce5f53e1f1136e8cc6248445668b8492f6d2c 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
@@ -238,9 +238,10 @@
aria-label="<?=$this->transEscAttr('Delete').': '.$this->record($this->driver)->getTitleHtml()?>">
<?=$this->transEsc('Delete') ?>
</a>
- <?php /* finc: remove role="none" of li-elements */ ?>
+ <?php /* finc: remove role="none" of li-elements */
+ /* finc adds roles 'menu', 'presentation' (to mark <li> as irrelevant for content) and 'menuitem' for correct accessibility - CK */ ?>
<ul class="dropdown-menu" role="menu" aria-labelledby="<?= $dLabel ?>">
- <li>
+ <li role="presentation">
<?php /* #17711 give user feedback and dont reload page after deleting */ ?>
<a role="menuitem" href="javascript:document.getElementById('<?=$dLabel?>').focus();" title="<?= $this->transEscAttr('confirm_delete_brief') ?>" onClick="
let next = $(this).closest('.result.ajaxItem').next('.result.ajaxItem').find('.del-button');
@@ -270,7 +271,7 @@
<?=$this->transEsc('confirm_dialog_yes')?>
</a>
</li>
- <li>
+ <li role="presentation">
<a role="menuitem" href="javascript:document.getElementById('<?=$dLabel?>').focus();"><?=$this->transEsc('confirm_dialog_no')?></a>
</li>
</ul>
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/toolbar.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/toolbar.phtml
index 5a4520f3236359115a3130cf4fe2ec2145654be2..7f3d42b762c9bef4040e8aa10b6c14e0c555497e 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/toolbar.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/toolbar.phtml
@@ -18,7 +18,9 @@
?>
<ul class="nav nav-pills nav-stacked hidden-print">
<?php if (count($this->driver->getCitationFormats()) > 0): ?>
- <li><a class="cite-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk" aria-hidden="true"></i> <?=$this->transEsc('Cite this')?></a></li>
+ <li>
+ <a class="cite-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk" aria-hidden="true"></i> <?=$this->transEsc('Cite this')?></a>
+ </li>
<?php endif; ?>
<?php if ($this->tabs['Details'] ?? false
&& $this->config()->get('config')->Site->showStaffViewInLightbox ?? false): ?>
@@ -37,15 +39,18 @@
<li><a class="sms-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile" aria-hidden="true"></i> <?=$this->transEsc('Text this')?></a></li>
<?php endif; ?>
*/ ?>
- <li><a class="mail-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope" aria-hidden="true"></i> <?=$this->transEsc('Email this')?></a></li>
+ <li>
+ <a class="mail-record" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope" aria-hidden="true"></i> <?=$this->transEsc('Email this')?></a>
+ </li>
<?php $exportFormats = $this->export()->getFormatsForRecord($this->driver); ?>
<?php if(count($exportFormats) > 0): ?>
<li class="dropdown">
<?php /* finc: remove classname toolbar-btn */ ?>
<a class="export-toggle btn-type-export dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>" rel="nofollow" aria-expanded="false" aria-controls="export-options"><?=$this->transEsc('Export Record') ?></a>
+ <?php /* finc adds roles 'menu', 'presentation' (to mark <li> as irrelevant for content) and 'menuitem' for correct accessibility - CK */ ?>
<ul class="dropdown-menu" id="export-options" role="menu">
<?php foreach ($exportFormats as $exportFormat): ?>
- <li>
+ <li role="presentation">
<a <?php if ($this->export()->needsRedirect($exportFormat)): ?>target="<?=$this->escapeHtmlAttr($exportFormat)?>Main" <?php endif; ?>href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>?style=<?=$this->escapeHtmlAttr($exportFormat)?>" rel="nofollow" role="menuitem">
<?=$this->transEsc('Export to')?> <?=$this->transEsc($this->export()->getLabelForFormat($exportFormat))?>
</a>
diff --git a/themes/finc/templates/RecordDriver/FincMissing/record-icon.phtml b/themes/finc/templates/RecordDriver/FincMissing/record-icon.phtml
index 5214b8aaf8d58b4a9cea1067f091a9007fae6421..1cc933f7a4a038b8a51d3409c34d6f58b20e31e7 100644
--- a/themes/finc/templates/RecordDriver/FincMissing/record-icon.phtml
+++ b/themes/finc/templates/RecordDriver/FincMissing/record-icon.phtml
@@ -1,18 +1,21 @@
<!-- finc - RecordDriver - fincMissing - record-icon -->
<?php
/**
- *
* origin: finc
*
- * called by view helper/controller: --
- *
- * usage: renders an icon for missing records
+ * called by view helper/controller:
*
- * modified for de_l152:
+ * usage:
+ * - renders an icon for missing records in FincMissing/result-list.phtml
+ * - this is used for bulk printing display
+ * (e.g. have a record in favorites that doesn't exist anymore,
+ * then select all in page and select 'print')
*
- * configured in: --
+ * modified for finc:
+ * -
*
- **/
+ * configured in: {}
+ */
?>
<span class="access-icon hidden-print">
<i class="fa fa-times-circle" aria-hidden="true"></i>
diff --git a/themes/finc/templates/RecordDriver/FincMissing/result-list.phtml b/themes/finc/templates/RecordDriver/FincMissing/result-list.phtml
index 025825b978b779f94988cbf6d0376f756c5606c9..846634e63e989005d6b11a1a9548a0fe80180cb7 100644
--- a/themes/finc/templates/RecordDriver/FincMissing/result-list.phtml
+++ b/themes/finc/templates/RecordDriver/FincMissing/result-list.phtml
@@ -1,11 +1,24 @@
<!-- finc: recordDriver - FincMissing - result-list -->
-<?php /*
- this is mostly a copy of finc: recordDriver - DefaultRecord - result-list
- it is only used for the print view of FincMissingRecords in bulk mode;
- Fixme: Please remove any code we don't need here! - CK
+<?php
+/**
+ * origin: finc
+ *
+ * called by view helper/controller:
+ *
+ * usage:
+ * - renders missing records in FincMissing/result-list.phtml
+ * - this is used for bulk printing display only
+ * (e.g. have a record in favorites that doesn't exist anymore,
+ * then select all in page and select 'print')
+ * - remove all elements here that we don't need for Missing Items!
+ * compare the rest with RecordDriver/defaultRecord/result-list
+ *
+ * modified for finc:
+ * -
+ *
+ * configured in: {}
*/
?>
-
<?php
$coverDetails = $this->record($this->driver)->getCoverDetails('result-list', 'medium', $this->recordLink()->getUrl($this->driver));
$cover = $coverDetails['html'];
diff --git a/themes/finc/templates/RecordTab/staffviewai.phtml b/themes/finc/templates/RecordTab/staffviewai.phtml
index 8f0300d1ab3b3386a7172c6e8b037eaf9a5c0b48..be1122a6ebee65a086bd69614a5f50d89c1239fe 100644
--- a/themes/finc/templates/RecordTab/staffviewai.phtml
+++ b/themes/finc/templates/RecordTab/staffviewai.phtml
@@ -5,14 +5,11 @@ $this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBread
?>
<?php /* finc adds code for responsive data table here - CK */ ?>
<table class="citation table table-striped table-resp-data">
- <?php foreach ($this->driver->getAIRecord() as $field => $values): ?>
+ <?php foreach ($this->driver->getRawData() as $field => $values): ?>
<tr>
<th><?=$this->escapeHtml($field)?></th>
<td data-title="<?= $this->escapeHtml($field) ?>:">
- <?php if (!is_array($values)) {
- $values = array($values);
- } ?>
- <?php foreach ($values as $value): ?>
+ <?php foreach ((array)$values as $value): ?>
<?=$this->escapeHtml(is_array($value) ? print_r($value, true) : $value)?><br/>
<?php endforeach; ?>
</td>
diff --git a/themes/finc/templates/cart/cart.phtml b/themes/finc/templates/cart/cart.phtml
index c047a4542771b0bcf417f429e69dfc08362c6336..4f097f059fdbfafaf1421da598938f5ba2262574 100644
--- a/themes/finc/templates/cart/cart.phtml
+++ b/themes/finc/templates/cart/cart.phtml
@@ -42,12 +42,13 @@
<button type="submit" name="delete" class="toolbar-btn btn-type-delete dropdown-toggle" data-toggle="dropdown" id="cart-delete-label" value="1">
<?=$this->transEsc('Delete')?>
</button>
- <?php /* finc: remove role="none" of li-elements */ ?>
+ <?php /* finc: remove role="none" of li-elements */
+ /* finc adds roles 'menu', 'presentation' (to mark <li> as irrelevant for content) and 'menuitem' for correct accessibility - CK */ ?>
<ul class="dropdown-menu" role="menu" aria-labelledby="cart-delete-label">
- <li>
+ <li role="presentation">
<a href="javascript:" id="cart-confirm-delete" title="<?=$this->transEscAttr('confirm_delete')?>" role="menuitem"><?=$this->transEscAttr('confirm_dialog_yes')?></a>
</li>
- <li>
+ <li role="presentation">
<a role="menuitem"><?=$this->transEsc('confirm_dialog_no')?></a>
</li>
</ul>
@@ -56,11 +57,12 @@
<button type="submit" class="toolbar-btn btn-type-empty dropdown-toggle" name="empty" data-toggle="dropdown" id="cart-empty-label" value="1">
<?=$this->transEsc('Empty Book Bag')?>
</button>
+ <?php /* finc adds roles 'menu', 'presentation' (to mark <li> as irrelevant for content) and 'menuitem' for correct accessibility - CK */ ?>
<ul class="dropdown-menu" role="menu" aria-labelledby="cart-empty-label">
- <li>
+ <li role="presentation">
<a href="javascript:" id="cart-confirm-empty" title="<?=$this->transEscAttr('bookbag_confirm_empty')?>" role="menuitem"><?=$this->transEsc('confirm_dialog_yes')?></a>
</li>
- <li>
+ <li role="presentation">
<a id="cart-refuse-empty" role="menuitem"><?=$this->transEsc('confirm_dialog_no')?></a>
</li>
</ul>
diff --git a/themes/finc/templates/collection/view.phtml b/themes/finc/templates/collection/view.phtml
index e0837a046e77f1b17273b27b194e0e9c3b220dc4..f802b6c7b623069b3bc1f32a7063badcb1ced75b 100644
--- a/themes/finc/templates/collection/view.phtml
+++ b/themes/finc/templates/collection/view.phtml
@@ -61,7 +61,8 @@
<div class="record source<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>">
<?php /* finc - don't use '<?=count($sidebarList) < 1 ? ' solo' : '' ?>' or toolbar won't fit; BS count sidebars but our toolbar isn't counted */ ?>
- <div<?php if (!$tree): /* in tree mode, do not constrain width with a class */ ?> class="<?= $this->layoutClass('mainbody') ?>" <?php else: ?> class="mainbody left" <?php endif; ?>>
+ <div<?php if (!$tree): /* in tree mode, do not constrain width with a class */ ?>
+ class="<?= $this->layoutClass('mainbody') ?>" <?php else: ?> class="mainbody left" <?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() ?>
@@ -70,7 +71,7 @@
</div>
<?php /* finc: pull the first toolbar for top area here; add id for accessibility; use nav for sidebar #23430 */ ?>
-<nav class="<?= $this->layoutClass('sidebar') ?>" id="myresearch-sidebar" role="search" aria-label="<?= $this->transEscAttr('sidebar_expand_collections') ?>">
+<nav class="<?= $this->layoutClass('sidebar') ?>" id="myresearch-sidebar" aria-label="<?= $this->transEscAttr('sidebar_expand_collections') ?>">
<?= $this->record($this->driver)->getToolbar() ?>
</nav>
@@ -117,7 +118,7 @@
</div>
<?php endif; ?>
-<?=$this->driver->supportsCoinsOpenURL()?'<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>':''?>
+<?=$this->driver->supportsCoinsOpenURL()?'<span class="Z3988" aria-hidden="true" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>':''?>
<?=$this->inlineScript(\Laminas\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET'); ?>
<!-- finc: collection - view - END -->