diff --git a/themes/finc-accessibility/templates/myresearch/delete.phtml b/themes/finc-accessibility/templates/myresearch/delete.phtml
index b991a73aa630b5cad9b9b7d4ded39deb8a41cdcb..19fc345724ecabbc95f7602577310e30e2be84f4 100644
--- a/themes/finc-accessibility/templates/myresearch/delete.phtml
+++ b/themes/finc-accessibility/templates/myresearch/delete.phtml
@@ -1,20 +1,24 @@
<!-- finc-accessibility: myresearch - delete -->
-<?php /* #17950 - use <p> for alerts - HR */ ?>
+<?php /* #17950 - use <p> for alerts - HR */
+/* #18535 - record listings - AP */ ?>
-<h2><?=$this->transEsc('delete_selected_favorites')?></h2>
+<h1><?=$this->transEsc('delete_selected_favorites')?></h1>
<form action="<?=$this->url('myresearch-delete')?>" method="post" name="bulkDelete" data-lightbox-onclose="VuFind.refreshPage">
<div id="popupMessages"><?=$this->flashmessages()?></div>
<div id="popupDetails">
<?php if (!$this->list): ?>
<p class="alert alert-info"><?=$this->transEsc("fav_delete_warn") ?></p>
<?php else: ?>
- <h3><?=$this->transEsc("List") ?>: <?=$this->escapeHtml($this->list->title) ?></h3>
+ <h2><?=$this->transEsc("List") ?>: <?=$this->escapeHtml($this->list->title) ?></h2>
<?php endif; ?>
-
+ <ul class="record-list">
<?php foreach ($this->records as $favorite): ?>
- <strong><?=$this->transEsc('Title') ?>:</strong>
- <?=$this->escapeHtml($favorite->getBreadcrumb())?><br />
+ <li>
+ <strong><?=$this->transEsc('Title') ?>:</strong>
+ <?=$this->escapeHtml($favorite->getBreadcrumb())?>
+ </li>
<?php endforeach; ?>
+ </ul>
<br />
<input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Delete')?>"/>
<?php foreach ($this->deleteIDS as $deleteID): ?>
diff --git a/themes/finc-accessibility/templates/search/list-list.phtml b/themes/finc-accessibility/templates/search/list-list.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..b86711fdfea9516cf8b8023cd44571457fbb370f
--- /dev/null
+++ b/themes/finc-accessibility/templates/search/list-list.phtml
@@ -0,0 +1,20 @@
+<!-- finc-accessibility: search - list-list -->
+<?php /* #18535 - record listings - AP */ ?>
+<?php if (!isset($this->indexStart)) $this->indexStart = 0; ?>
+<?php $i = $this->indexStart; ?>
+<?php $listStart = $this->results->getStartRecord() + $i - $this->indexStart; ?>
+<ol class="record-list" start="<?=$listStart?>">
+<?php foreach ($this->results->getResults() as $current): ?>
+ <?php $recordNumber = $this->results->getStartRecord() + $i - $this->indexStart; ?>
+ <li id="result<?=$i++ ?>" class="result<?=$current->supportsAjaxStatus()?' ajaxItem':''?>">
+ <?php if (isset($this->showCheckboxes) && $this->showCheckboxes): ?>
+ <?=$this->record($current)->getCheckbox('', 'search-cart-form', $recordNumber)?>
+ <?php endif; ?>
+ <div class="record-number">
+ <?=$recordNumber ?>
+ </div>
+ <?=$this->record($current)->getSearchResult('list')?>
+ </li>
+<?php endforeach; ?>
+</ol>
+<!-- finc-accessibility: search - list-list - END -->
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index cb7f32ab30c1c220212a4dee737dbae29296bf87..2ec7208aa6fee819e34ae66f6cc2d778ee0fe718 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -147,7 +147,7 @@ $btn-transparent-border: $border-color !default;
$button-title-hover-bg: $brand-secondary !default;
-$btn-language-hover-bg: $brand-secondary !default;
+$btn-language-hover-bg: $brand-primary !default;
$btn-language-active-hover-bg: $steel !default;
// Padding for toolbar buttons in record view/detail view
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index 6870670f53221c7761a4047a1b77b927fd30dc9a..693a8217d1776965d6f32473e600ec1e756f6daa 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -374,10 +374,47 @@ legend {
.text-success {
background-color: $brand-success;
margin-bottom: 0;
+
+ // Warning signs in MyAccount sidebar
+ &.fa-bell,
+ &.fa-clock-o {
+ color: $brand-success;
+ }
+}
+
+.text-warning {
+ // Warning signs in MyAccount sidebar
+ &.fa-bell,
+ &.fa-clock-o {
+ color: $brand-warning;
+ }
}
.text-danger {
background-color: $brand-danger;
+
+ // Warning sign in front of Login/MyAccount in header
+ &.fa-exclamation-triangle {
+ color: $brand-danger;
+ }
+}
+
+// Warning signs in MyAccount sidebar and warning sign in front of Login/MyAccount in header
+.text-danger,
+.text-success,
+.text-warning {
+ &.fa-bell,
+ &.fa-clock-o,
+ &.fa-exclamation-triangle {
+ background: transparent;
+ padding: 0;
+
+ // icons in header navbar on Hover
+ .btn:focus &,
+ .btn:hover & {
+ color: inherit;
+ }
+ }
}
//// Required symbol
@@ -1504,13 +1541,14 @@ header,
padding-right: 0;
// Make wider to fit searchbox and right-hand nav-elements in
- @media only screen and (min-width: $screen-sm-min) {
+ @media (min-width: $screen-sm-min) {
flex: 0 1 auto;
padding-top: $button-top-padding;
+ width: auto;
}
// Float "Find" button next to searchbox on XS and SM
- @media only screen and (max-width: $screen-sm-max) {
+ @media (max-width: $screen-sm-max) {
padding-left: 0;
.searchForm {
@@ -1878,6 +1916,13 @@ footer {
padding-left: ($grid-gutter-width / 2);
}
+//// Result List ol, ul that contains li.result or facet group that contains li.facet
+.record-list {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+
//// Results (see BS SCSS/COMPONENTS/... for details)
.result {
hyphens: auto;
@@ -2324,7 +2369,7 @@ body:not(.offcanvas) .sidebar {
}
}
-//// Style my account sidebar menues to get the same look as facets
+//// Style myaccount sidebar menues to get the same look as facets
.myresearch-menu {
border: 1px solid $border-color;
@@ -2453,7 +2498,7 @@ body:not(.offcanvas) .sidebar {
}
}
-//// OR- and AND-Facets + item counts in My Account
+//// OR- and AND-Facets + item counts in MyAccount
///// Style the exclude icons
.exclude i {
color: $badge-link-color;
@@ -2491,6 +2536,15 @@ body:not(.offcanvas) .sidebar {
}
}
+ // Numbers in MyAccount sidebar
+ &.ok,
+ &.overdue {
+ .myresearch-menu & {
+ color: $white;
+ padding: 3px 7px;
+ }
+ }
+
////// light color on dark, when active (Facets + My Account) - we need the parent for specificity
.facet.active > &,
.sidebar a.active > & {
@@ -2840,4 +2894,4 @@ input {
}
}
-// AMSL - END
+// AMSL - END
\ No newline at end of file
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
index cc628b48a0c4ff22cf1488a09c1c4a77cd1af1cb..fb02204b5e109f165299c750dffcf523a98e066b 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
@@ -17,15 +17,16 @@ $coverDetails = $this->record($this->driver)->getCoverDetails('list-entry', 'med
$cover = $coverDetails['html'];
$thumbnail = false;
$thumbnailAlignment = $this->record($this->driver)->getThumbnailAlignment('list');
-if ($cover):
- ob_start(); ?>
- <div class="media-<?=$thumbnailAlignment?> <?=$this->escapeHtmlAttr($coverDetails['size'])?>">
- <?=$cover?>
- </div>
- <?php $thumbnail = ob_get_contents(); ?>
- <?php ob_end_clean(); ?>
-<?php endif; ?>
-<div class="result<?php if ($this->driver->supportsAjaxStatus()): ?> ajaxItem<?php endif ?>">
+?>
+<li class="result<?php if ($this->driver->supportsAjaxStatus()): ?> ajaxItem<?php endif ?>">
+ <?php if ($cover):
+ ob_start(); ?>
+ <div class="media-<?=$thumbnailAlignment?> <?=$this->escapeHtmlAttr($coverDetails['size'])?>">
+ <?=$cover?>
+ </div>
+ <?php $thumbnail = ob_get_contents(); ?>
+ <?php ob_end_clean(); ?>
+ <?php endif; ?>
<input type="hidden" value="<?=$this->escapeHtmlAttr($id)?>" class="hiddenId"/>
<input type="hidden" value="<?=$this->escapeHtmlAttr($source)?>" class="hiddenSource"/>
<?=$this->record($this->driver)->getCheckbox()?>
@@ -260,5 +261,5 @@ if ($cover):
<?=$thumbnail?>
<?php endif; ?>
</div>
-</div>
+</li>
<!-- finc: RecordDriver - DefaultRecord - list-entry - END -->
diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml
index e277d9d9374976bbd3e34e3f0b88dea27fefbfb2..b2019c53f1fe2c15e6e4d3b2e757cce73be8f037 100644
--- a/themes/finc/templates/header.phtml
+++ b/themes/finc/templates/header.phtml
@@ -48,7 +48,7 @@
<li class="logoutOptions<?php if ($account->dropdownEnabled()): ?> with-dropdown<?php endif ?><?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>">
<a class="btn" href="<?=$this->url('myresearch-home', [], ['query' => ['redirect' => 0]])?>">
<i id="account-icon" class="fa fa-home" aria-hidden="true"></i>
- <span class="sr-only"><?=$this->transEsc("Your Account")?></span>
+ <span><?=$this->transEsc("Your Account")?></span>
</a>
</li>
<?php if ($account->dropdownEnabled()): ?>
@@ -61,21 +61,21 @@
<?php endif; ?>
<li class="logoutOptions<?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>">
<a href="<?=$this->url('myresearch-logout')?>" class="logout btn">
- <i class="fa fa-sign-out" aria-hidden="true" title="<?=$this->transEsc('Log Out')?>"></i>
- <span class="sr-only"><?=$this->transEsc("Log Out")?></span>
+ <i class="fa fa-sign-out" aria-hidden="true"></i>
+ <span><?=$this->transEsc("Log Out")?></span>
</a>
</li>
<li id="loginOptions"<?php if ($account->isLoggedIn()): ?> class="hidden"<?php endif ?>>
<?php if ($account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?>
<a class="btn" href="<?=$this->url('myresearch-userlogin')?>">
- <i class="fa fa-sign-in" aria-hidden="true" title="<?=$this->transEsc('Institutional Login')?>"></i>
- <span class="sr-only"><?=$this->transEsc("Institutional Login")?></span>
+ <i class="fa fa-sign-in" aria-hidden="true"></i>
+ <span><?=$this->transEsc("Institutional Login")?></span>
</a>
<?php else: ?>
<a class="btn" href="<?=$this->url('myresearch-userlogin')?>" data-lightbox>
- <i class="fa fa-sign-in" aria-hidden="true" title="<?=$this->transEsc('Login')?>"></i>
- <span class="sr-only"><?=$this->transEsc("Login")?></span>
+ <i class="fa fa-sign-in" aria-hidden="true"></i>
+ <span><?=$this->transEsc("Login")?></span>
</a>
<?php endif; ?>
</li>
@@ -126,7 +126,7 @@
<?php /* finc searchbox: we use searchbox here so it becomes part of the sticky header,
we need to place this after the navbar-right for anything but mobile - see flex-container in SCSS:*/ ?>
<?php if ($this->layout()->searchbox !== false): ?>
- <div class="search container navbar">
+ <div class="search container">
<nav class="nav searchbox hidden-print" role="search">
<?=$this->layout()->searchbox?>
</nav>
diff --git a/themes/finc/templates/myresearch/checkedout.phtml b/themes/finc/templates/myresearch/checkedout.phtml
index 94e915df201858d8068ee82e43261344d50ad37c..00979e067ad3eea77db77c565373ebbb01b99c5e 100644
--- a/themes/finc/templates/myresearch/checkedout.phtml
+++ b/themes/finc/templates/myresearch/checkedout.phtml
@@ -75,10 +75,11 @@
<?php endif; ?>
<?php endforeach; ?>
+ <ul class="record-list">
<?php $i = 0; foreach ($this->transactions as $resource): ?>
<?php $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
<?php $describedById = $resource->getSourceIdentifier() . '|' . $resource->getUniqueId(); ?>
- <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="result">
+ <li id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="result">
<?php if ($this->renewForm): ?>
<div class="checkbox">
<?php if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
@@ -202,8 +203,9 @@
<?php endif ?>
</div>
<?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?>
- </div>
+ </li>
<?php endforeach; ?>
+ </ul>
<?php if ($this->renewForm): ?></form><?php endif; ?>
<?=$paginator ? $this->paginationControl($paginator, 'Sliding', 'Helpers/pagination.phtml', compact('params')) : ''?>
<?php else: ?>
diff --git a/themes/finc/templates/myresearch/historicloans.phtml b/themes/finc/templates/myresearch/historicloans.phtml
index 539b4d1c5ab4878173430e7fff43d7ca3a94322d..969bed2ec547bad90b19f7e89b04222ed21f0dfc 100644
--- a/themes/finc/templates/myresearch/historicloans.phtml
+++ b/themes/finc/templates/myresearch/historicloans.phtml
@@ -40,9 +40,10 @@
<?php endif; ?>
</nav>
+ <ul class="record-list">
<?php $i = 0; foreach ($this->transactions as $resource): ?>
<?php $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
- <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="result">
+ <li id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="result">
<?php
$coverDetails = $this->record($resource)->getCoverDetails('checkedout', 'small', $this->recordLink()->getUrl($resource));
$cover = $coverDetails['html'];
@@ -123,8 +124,9 @@
<?php endif ?>
</div>
<?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?>
- </div>
+ </li>
<?php endforeach; ?>
+ </ul>
<?=$this->paginator ? $this->paginationControl($this->paginator, 'Sliding', 'Helpers/pagination.phtml', ['params' => $this->params]) : ''?>
<?php else: ?>
<?=$this->transEsc('loan_history_empty')?>
diff --git a/themes/finc/templates/myresearch/holds.phtml b/themes/finc/templates/myresearch/holds.phtml
index e145814611680b1ac82e7bdd4ab0e30880333240..315ba230bf4cfd4cd947dff18d0dd16cc0b970a7 100644
--- a/themes/finc/templates/myresearch/holds.phtml
+++ b/themes/finc/templates/myresearch/holds.phtml
@@ -42,11 +42,12 @@
<?php endif; ?>
<?php $iteration = 0; ?>
+ <ul class="record-list">
<?php foreach ($this->recordList as $resource): ?>
<?php $iteration++; ?>
<?php $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
<?php $describedById = $resource->getSourceIdentifier() . '|' . $resource->getUniqueId(); ?>
- <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="result">
+ <li id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="result">
<?php if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?>
<?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?>
<input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" />
@@ -176,8 +177,9 @@
<?php endif ?>
</div>
<?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?>
- </div>
+ </li>
<?php endforeach; ?>
+ </ul>
<?php if ($this->cancelForm): ?></form><?php endif; ?>
<?php else: ?>
<?=$this->transEsc('You do not have any holds or recalls placed') ?>.
diff --git a/themes/finc/templates/myresearch/illrequests.phtml b/themes/finc/templates/myresearch/illrequests.phtml
index 7c56bb1e6ce0678f8d0736bfeef7bac0a6874321..c95819f7c4f53a17bc9d01f5bd165940b39fc4de 100644
--- a/themes/finc/templates/myresearch/illrequests.phtml
+++ b/themes/finc/templates/myresearch/illrequests.phtml
@@ -43,11 +43,12 @@
<?php endif; ?>
<?php $iteration = 0; ?>
+ <ul class="record-list">
<?php foreach ($this->recordList as $resource): ?>
<?php $iteration++; ?>
<?php $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
<?php $describedById = $resource->getSourceIdentifier() . '|' . $resource->getUniqueId(); ?>
- <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="result">
+ <li id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="result">
<?php if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?>
<?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?>
<div class="checkbox">
@@ -171,8 +172,9 @@
<?php endif ?>
</div>
<?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?>
- </div>
+ </li>
<?php endforeach; ?>
+ </ul>
<?php if ($this->cancelForm): ?></form><?php endif; ?>
<?php else: ?>
<?=$this->transEsc('You do not have any interlibrary loan requests placed') ?>.
diff --git a/themes/finc/templates/myresearch/mylist.phtml b/themes/finc/templates/myresearch/mylist.phtml
index 06cadc0e3a8fbad626b5ae56a3f28b288105fda0..95a00ff48f650d04520fec9938c064a6e59a9499 100644
--- a/themes/finc/templates/myresearch/mylist.phtml
+++ b/themes/finc/templates/myresearch/mylist.phtml
@@ -74,9 +74,11 @@ $user = $this->auth()->isLoggedIn();
<?php if ($recordTotal > 0): ?>
<form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-myresearchbulk')?>" data-lightbox data-lightbox-onsubmit="bulkFormHandler">
<?=$this->context($this)->renderInContext('myresearch/bulk-action-buttons.phtml', ['idPrefix' => '', 'list' => $list ?? null, 'account' => $this->account])?>
+ <ul class="record-list">
<?php foreach ($this->results->getResults() as $i => $current): ?>
<?=$this->record($current)->getListEntry($list, $user)?>
<?php endforeach; ?>
+ </ul>
</form>
<?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', ['results' => $this->results])?>
<?php else: ?>
diff --git a/themes/finc/templates/myresearch/storageretrievalrequests.phtml b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
index 8719b5f71ad15ea416d1fafebba1d604575e5781..b05bc9fb85ecb8da4d6b794ce1caf0542d3b2549 100644
--- a/themes/finc/templates/myresearch/storageretrievalrequests.phtml
+++ b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
@@ -42,11 +42,12 @@
<?php endif; ?>
<?php $iteration = 0; ?>
+ <ul class="record-list">
<?php foreach ($this->recordList as $resource): ?>
<?php $iteration++; ?>
<?php $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
<?php $describedById = $resource->getSourceIdentifier() . '|' . $resource->getUniqueId(); ?>
- <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="result">
+ <li id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="result">
<?php if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?>
<?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?>
<div class="checkbox">
@@ -167,8 +168,9 @@
<?php endif ?>
</div>
<?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?>
- </div>
+ </li>
<?php endforeach; ?>
+ </ul>
<?php if ($this->cancelForm): ?></form><?php endif; ?>
<?php else: ?>
<?=$this->transEsc('You do not have any storage retrieval requests placed') ?>.