diff --git a/local/alpha/config/vufind/config.ini b/local/alpha/config/vufind/config.ini
index 1c7226621f4890adfa33f5baded63092881ca113..cec27aa5a0588aed803a8226442bf3d54d05f671 100644
--- a/local/alpha/config/vufind/config.ini
+++ b/local/alpha/config/vufind/config.ini
@@ -26,6 +26,7 @@ driver=Demo
library_cards=true
[Site]
showBookBag=true
+offcanvas=true
[Browse]
tag=true
[Social]
diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
index b37242be590372b08e457aab190fc7b2afd2cba8..be6fd603ce9b01c28bcdd32c6fb084df72461362 100644
--- a/local/config/vufind/config.ini
+++ b/local/config/vufind/config.ini
@@ -93,9 +93,9 @@ sidebarOnLeft = false
; Invert the sidebarOnLeft setting for right-to-left languages?
mirrorSidebarInRTL = true
; Handle menu as an offcanvas slider at mobile sizes (in bootstrap3-based themes)
-offcanvas = false
+offcanvas = true
; Show (true) / Hide (false) Book Bag - Default is Hide.
-showBookBag = false
+showBookBag = true
; Set the maximum amount of items allowed in the Book Bag - Default is 100
bookBagMaxSize = 20
; Display bulk items (export, save, etc.) and checkboxes on search result screens?
diff --git a/local/languages/de.ini b/local/languages/de.ini
index b2a372c2da3c276fd4ea5373dcefb23bccdf1446..b9ce710d22e612e56cbf143f87cb22df229c2840 100644
--- a/local/languages/de.ini
+++ b/local/languages/de.ini
@@ -2038,3 +2038,6 @@ Range-from-to = "Bereich von/bis"
; #17833
form-legend = "Bitte füllen Sie alle Felder aus"
form-button-submit = "Ausgefülltes Formular abschicken"
+
+; #17601
+offcanvas-toggler-search-tips = "Suchtipps einblenden"
diff --git a/local/languages/en.ini b/local/languages/en.ini
index b40a155ef597688a9f3d7dcec6fa4043352604a1..791449b2a2f9be5e9712e720fd81d4a2aee980e5 100644
--- a/local/languages/en.ini
+++ b/local/languages/en.ini
@@ -2126,3 +2126,6 @@ Range-from-to = "Range from/to"
; #17833
form-legend = "Please fill in all fields to create an account"
form-button-submit = "Submit the completed form"
+
+; #17601
+offcanvas-toggler-search-tips = "Show search help"
diff --git a/themes/finc/js/common-finc.js b/themes/finc/js/common-finc.js
new file mode 100644
index 0000000000000000000000000000000000000000..06e842b6b637e2da0e189de402954561295f1408
--- /dev/null
+++ b/themes/finc/js/common-finc.js
@@ -0,0 +1,26 @@
+/* #17601 - set focus on sidebar back button - HR */
+
+function setupOffcanvas() {
+ if ($('.sidebar').length > 0 && $(document.body).hasClass("offcanvas")) {
+ $('[data-toggle="offcanvas"]').click(function offcanvasClick(e) {
+ e.preventDefault();
+ $('body.offcanvas').toggleClass('active');
+ $('.close-offcanvas').focus(); // Set focus to the back button of the sidebar
+ $('.sidebar .active').focus(); // Special case: account sidebar: set focus on the active element
+ });
+ }
+ // Handle sidebar in case of config.ini [Site] offcanvas=false configuration
+ if ($('.sidebar').length > 0 && !($(document.body).hasClass("offcanvas"))) {
+ $('[data-toggle="offcanvas"]').click(function offcanvasClick(e) {
+ e.preventDefault();
+ window.location.href = '#myresearch-sidebar';
+ $('.close-offcanvas').focus(); // Set focus to the back button of the sidebar
+ $('.sidebar .active').focus(); // Special case: account sidebar: set focus on the active element
+ });
+ $('.close-offcanvas').click(function offcanvasClick(e) {
+ e.preventDefault();
+ window.location.href = '#content';
+ $('.search-filter-toggle').focus(); // Set focus on the toggle button
+ });
+ }
+}
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index 7fb9740f1dfc0104a1136b5a2d1c9055416acdb3..3222365dc9bab93d963a24d913240f6daf7d7057 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -94,13 +94,6 @@ body {
// for mobile
padding-top: $navbar-height-xs;
- // make xception for adv. search home
- &.template-name-advanced {
- @media (max-width: $screen-xs-max) {
- padding-top: 3.25rem;
- }
- }
-
// make exception for adv. search results
&.template-name-advanced {
@media (max-width: $screen-xs-max) {
@@ -197,8 +190,12 @@ h4 {
.sidebar h4 {
margin-top: 0;
+ @media (max-width: $screen-sm-max) {
+ text-align: center;
+ }
+
// keep level with left-hand content
- @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
font-size: $font-size-base + 2px;
margin-top: ($grid-gutter-width / 2);
}
@@ -234,10 +231,8 @@ h4 {
border: 1px solid $brand-secondary;
// make columns adapt to content
table-layout: auto;
-}
-// Remove top borders (_tables.scss)
-.table {
+ // Remove top borders (_tables.scss)
thead,
tbody,
tfoot {
@@ -251,8 +246,10 @@ h4 {
}
//// Tables in Tabs, Record View etc
-.tab-content table {
- width: 100%;
+table {
+ .tab-content & {
+ width: 100%;
+ }
}
//// Responsive data tables for small (xs) resolution (e.g. search history table)
@@ -294,6 +291,28 @@ form {
label {
font-weight: normal;
}
+
+ // red-bordered input field, when empty, requires "form" for specifity, CK
+ // create enough space for red border
+ input:invalid,
+ textarea:invalid {
+ margin-right: 2px;
+ }
+
+ input {
+ // show red border only when submitted empty or when in focus
+ &:invalid {
+ box-shadow: inherit;
+ }
+
+ &:focus {
+ &:invalid,
+ &:required:invalid {
+ border-color: $brand-danger-transparent;
+ box-shadow: 0 0 2px 1px $brand-danger-transparent;
+ }
+ }
+ }
}
//// Set max-width to make sure boxes don't bleed over the edge on XS (e.g. acquisitionpda, source_id:3
@@ -406,30 +425,6 @@ input[type='text'] {
}
}
-// red-bordered input field, when empty, requires "form" for specifity, CK
-form {
- // create enough space for red border
- input:invalid,
- textarea:invalid {
- margin-right: 2px;
- }
-
- input {
- // show red border only when submitted empty or when in focus
- &:invalid {
- box-shadow: inherit;
- }
-
- &:focus {
- &:invalid,
- &:required:invalid {
- border-color: $brand-danger-transparent;
- box-shadow: 0 0 2px 1px $brand-danger-transparent;
- }
- }
- }
-}
-
.form-control {
box-shadow: none;
}
@@ -438,15 +433,15 @@ form {
////// remove browser styles on select boxes and add custom styles (below)
select,
select.form-control {
- -webkit-appearance: none !important;
-moz-appearance: none !important;
+ -webkit-appearance: none !important;
background-color: $select-bg-color;
// This is the litte down arrow
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgeD0iMTJweCIgeT0iMHB4IiB3aWR0aD0iMjRweCIgaGVpZ2h0PSIzcHgiIHZpZXdCb3g9IjAgMCA2IDMiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYgMyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBvbHlnb24gcG9pbnRzPSI1Ljk5MiwwIDIuOTkyLDMgLTAuMDA4LDAgIi8+PC9zdmc+);
background-position: 100% center;
background-repeat: no-repeat;
- border-radius: 0;
border: $border-default-styles;
+ border-radius: 0;
height: $navigation-element-default-height;
min-width: 5em;
padding: .25em .75em .25em .5em;
@@ -595,14 +590,15 @@ a.toggle {
}
&::after {
- font-family: 'FontAwesome';
content: $fa-var-angle-down;
+ font-family: 'FontAwesome', sans-serif;
padding-left: 2px;
}
}
span.notation ul {
padding-inline-start: 1.5em;
+
@media (max-width: $screen-md-min) {
padding-inline-start: 0;
}
@@ -611,10 +607,10 @@ span.notation ul {
list-style-type: none;
}
- li:before {
- margin-right: 0.5em;
- font-family: 'FontAwesome';
+ li::before {
content: $fa-var-level-down;
+ font-family: 'FontAwesome', sans-serif;
+ margin-right: .5em;
}
}
@@ -644,10 +640,6 @@ span.notation ul {
}
}
-.text-danger {
- background-color: $brand-danger;
-}
-
//// DATE-RANGE slider (CSS is included in bootstrap-slider.min.css - currently no SCSS version!)
////// Keep enough room for slider handles; PLS note: there are sliders in sidefacets and adv. search
.slider-container {
@@ -1024,7 +1016,7 @@ table.collapse.in {
////// NO margin bottom
.no-margin-btm {
- margin-btm: 0;
+ margin-bottom: 0;
}
////// NO margin left
@@ -1328,7 +1320,7 @@ header,
}
// Make smaller to fit searchbox and right-hand nav-elements
- @media only screen and (min-width: $screen-sm-min) {
+ @media (min-width: $screen-sm-min) {
flex: 1 0 30%;
}
@@ -1338,25 +1330,26 @@ header,
flex: 0 1 100%;
}
}
-}
-//// Define header navbar on mobile
-#header-collapse.collapse.in {
- @media (max-width: $screen-sm-max) {
- background-color: $header-bg-color;
- // margin-top: -($navbar-height-xs) - 10px; // pull over searchbox
+ //// Define header navbar on mobile
+ &.collapse.in {
+ @media (max-width: $screen-sm-max) {
+ background-color: $header-bg-color;
+ // margin-top: -($navbar-height-xs) - 10px; // pull over searchbox
- li > a.btn {
- text-align: left;
- }
+ li > a.btn {
+ text-align: left;
+ }
- #langmenu {
- padding-left: ($grid-gutter-width / 2);
- width: 100%;
+ #langmenu {
+ padding-left: ($grid-gutter-width / 2);
+ width: 100%;
+ }
}
}
}
+
// Remove cart text to make searchbox fit on intermediate tablets
.cart-label {
@media only screen and (min-width: $screen-sm-min) and (max-width: 994px) {
@@ -1368,7 +1361,7 @@ header,
.navbar-brand {
float: left;
padding: ($grid-gutter-width / 4) ($grid-gutter-width / 2) ($grid-gutter-width / 4) 0;
-
+
img {
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
height: $navigation-element-default-height;
@@ -1384,7 +1377,7 @@ header,
@media (max-width: $screen-xs-max) {
height: auto;
}
-
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
padding-right: ($grid-gutter-width / 4);
}
@@ -1404,7 +1397,7 @@ header,
&:hover,
&:focus {
background-color: $navbar-default-toggle-hover-bg;
-
+
}
}
@@ -1474,15 +1467,15 @@ header,
@media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
flex: content;
-
+
.btn,
.form-control {
float: left;
}
-
+
.searchForm {
display: block;
-
+
.checkbox {
position: static;
}
@@ -1623,22 +1616,18 @@ header,
padding-left: ($grid-gutter-width / 2 - 2px); // take 2 px off for borders
padding-top: 10px;
- // Divider:
+ // Divider (li + li::before) + Last element (li):
+ > li,
> li + li::before {
color: $white;
}
- // Last element
- > li {
- color: $white;
- }
-
//// color of links in breadcrumbs
a,
> .active a {
color: darken($breadcrumb-active-color, 10%);
}
-
+
//// more contrast: switch the colors
a:focus,
a:hover {
@@ -1648,7 +1637,7 @@ header,
}
////// Prevent overlapping of header on breadcrumb on 100% zoom on advanced search result list
-////// (works only correctly for one line in cell "Your search terms")
+////// (works only correctly for one line in cell "Your search terms")
.template-dir-search.template-name-results .search .navbar-form {
margin-bottom: 5px;
}
@@ -1737,6 +1726,10 @@ footer {
//// Off-Canvas
@media only screen and (max-width: $screen-sm-max) {
+ .close-offcanvas {
+ display: block;
+ }
+
// Define position of VF5.1 offcanvas toggler
// FIXME: CHECK THIS! CK
.search-stats,
@@ -1754,8 +1747,15 @@ footer {
.search-filter-toggle::before {
content: '\f100\00a0';
}
+
+ .media-left {
+ @media (min-width: $screen-sm-min) {
+ float: right;
+ }
+ }
}
+// push record view icon to right (Desktop) on left-aligned sidebars -- pls NOTE: required offcanvas = true
.offcanvas-right {
.close-offcanvas::before {
content: '\f104\00a0';
@@ -2072,11 +2072,11 @@ footer {
padding-left: $jstree-li-left-padding;
}
- li li:before {
+ li li::before {
// FontAwesome Unicode fa-file-o
- content: "\f016";
- font-family: FontAwesome;
+ content: '\f016';
display: inline-block;
+ font-family: FontAwesome;
// same as padding-left set on li, above
margin-left: -$jstree-li-left-padding;
//same as padding-left set on li, above
@@ -2233,10 +2233,9 @@ footer {
// MAIN CONTENT - END
// SIDEBAR
-@media only screen and (max-width: $screen-sm-max) {
- .sidebar h4 {
- text-align: center;
- }
+// Width when offcanvas if off
+body:not(.offcanvas) .sidebar {
+ width: 100%;
}
//// pull content to right border for sidebar right
@@ -2359,10 +2358,10 @@ footer {
// #13625 avoid ugly linebreaks with overlong words, RL
.sidebar {
- -webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
-o-hyphens: auto;
+ -webkit-hyphens: auto;
hyphens: auto;
.facet {
@@ -2680,9 +2679,9 @@ footer ul {
a.exclude {
&:hover,
&:focus {
- color: $badge-link-hover-color;
-
@include outline(1px);
+
+ color: $badge-link-hover-color;
outline-offset: -2px;
}
@@ -2836,7 +2835,6 @@ input {
}
}
-
// AMSL
.template-dir-amsl.template-name-sources-list {
diff --git a/themes/finc/templates/Recommend/ExpandFacets.phtml b/themes/finc/templates/Recommend/ExpandFacets.phtml
index b25b7223f8fe837b8be816aa42f39e27731c1cfc..1b0ee79dd003b3ec602a3f0ae3b6fb8473e6d2aa 100644
--- a/themes/finc/templates/Recommend/ExpandFacets.phtml
+++ b/themes/finc/templates/Recommend/ExpandFacets.phtml
@@ -1,11 +1,13 @@
<!-- finc - templates - Recommend - ExpandFacets -->
<?php /* copied from bootstrap3 - h4 becomes h2 - #17607 - HR */?>
+<?php /* add a back button #17601 - HR */?>
<?php
$expandFacetSet = $this->recommend->getExpandedSet();
// Get empty search object to use as basis for parameter generation below:
$blankResults = $this->recommend->getEmptyResults();
?>
+<button class="close-offcanvas btn btn-primary" data-toggle="offcanvas"><?=$this->transEsc('navigate_back') ?></button>
<?php if ($expandFacetSet): ?>
<div class="sidegroup">
<?php foreach ($expandFacetSet as $title => $cluster): ?>
diff --git a/themes/finc/templates/librarycards/home.phtml b/themes/finc/templates/librarycards/home.phtml
index aa272f988dfcc902786529b75be77e73e4fd6931..3e952a5f02ed0e5a20263aecef1537e8933e3e78 100644
--- a/themes/finc/templates/librarycards/home.phtml
+++ b/themes/finc/templates/librarycards/home.phtml
@@ -1,4 +1,4 @@
-<!-- find: librarycards - home -->
+<!-- finc: librarycards - home -->
<?php
// Set up page title:
$this->headTitle($this->translate('Library Cards'));
@@ -6,6 +6,11 @@
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Library Cards') . '</li>';
?>
+
+ <a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
+ <?=$this->transEsc('Your Account') ?>
+ </a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<?=$this->flashmessages()?>
@@ -63,4 +68,4 @@
<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'librarycards'])?>
</div>
-<!-- find: librarycards - home - END -->
+<!-- finc: librarycards - home - END -->
diff --git a/themes/finc/templates/myresearch/acquisition.phtml b/themes/finc/templates/myresearch/acquisition.phtml
index ec13fd1bfc84894c2ffde5ab1dab069025486e3f..62d81badc6f0194afb2e0de9effce3391e3e3ab6 100644
--- a/themes/finc/templates/myresearch/acquisition.phtml
+++ b/themes/finc/templates/myresearch/acquisition.phtml
@@ -7,7 +7,7 @@ $this->headTitle($this->translate('PDA::pda_form_title'));
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('PDA::pda_form_title') . '</li>';
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?= $this->transEsc('Your Account') ?>
</a>
diff --git a/themes/finc/templates/myresearch/checkedout.phtml b/themes/finc/templates/myresearch/checkedout.phtml
index 8f19100634f8ce669f73c8eb302b6b34e8655702..a004ba5b0b99714875ad6e6b5e7f3c37da1807ee 100644
--- a/themes/finc/templates/myresearch/checkedout.phtml
+++ b/themes/finc/templates/myresearch/checkedout.phtml
@@ -10,7 +10,7 @@
$renewAll = !$this->ilsPaging || !$paginator;
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
diff --git a/themes/finc/templates/myresearch/fines.phtml b/themes/finc/templates/myresearch/fines.phtml
index 5c840caf85cd396a82dc7183744c506f182eeb14..32080215e7fcfcda8546320329019bd96d9514d2 100644
--- a/themes/finc/templates/myresearch/fines.phtml
+++ b/themes/finc/templates/myresearch/fines.phtml
@@ -7,7 +7,7 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Fines') . '</li>';
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
diff --git a/themes/finc/templates/myresearch/historicloans.phtml b/themes/finc/templates/myresearch/historicloans.phtml
index 12466e0632ff5324631e42a678d22c7ee839cbce..539b4d1c5ab4878173430e7fff43d7ca3a94322d 100644
--- a/themes/finc/templates/myresearch/historicloans.phtml
+++ b/themes/finc/templates/myresearch/historicloans.phtml
@@ -7,7 +7,7 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Loan History') . '</li>';
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
diff --git a/themes/finc/templates/myresearch/holds.phtml b/themes/finc/templates/myresearch/holds.phtml
index 3411313aa62811d8999cebf9d09b93192a7b48d5..a56c24f8d94134a858957ccd987aff1025b45a7e 100644
--- a/themes/finc/templates/myresearch/holds.phtml
+++ b/themes/finc/templates/myresearch/holds.phtml
@@ -7,7 +7,7 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('My Holds') . '</li>';
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
diff --git a/themes/finc/templates/myresearch/illrequests.phtml b/themes/finc/templates/myresearch/illrequests.phtml
index eab38c18839cd61ac5fd6f9436fe4916aa234760..4fbba305d4d0dede164fcfc960c15ffe3152a89a 100644
--- a/themes/finc/templates/myresearch/illrequests.phtml
+++ b/themes/finc/templates/myresearch/illrequests.phtml
@@ -8,7 +8,7 @@
. '<li class="active">' . $this->transEsc('Interlibrary Loan Requests') . '</li>';
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
diff --git a/themes/finc/templates/myresearch/mylist.phtml b/themes/finc/templates/myresearch/mylist.phtml
index 03e2f86889e32d9302a1ee2c3b08dd74a015ba3d..06cadc0e3a8fbad626b5ae56a3f28b288105fda0 100644
--- a/themes/finc/templates/myresearch/mylist.phtml
+++ b/themes/finc/templates/myresearch/mylist.phtml
@@ -26,7 +26,7 @@ $account = $this->auth()->getManager();
$user = $this->auth()->isLoggedIn();
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
<div class="<?=$this->layoutClass('mainbody')?>">
diff --git a/themes/finc/templates/myresearch/newpassword.phtml b/themes/finc/templates/myresearch/newpassword.phtml
index 5757cd2a1d2068eaff80450bc60327747648a437..b2102e7315a77aac2af970fed31039ebc427488a 100644
--- a/themes/finc/templates/myresearch/newpassword.phtml
+++ b/themes/finc/templates/myresearch/newpassword.phtml
@@ -8,6 +8,9 @@
. '<li class="active">' . $this->transEsc('Create New Password') . '</li>';
?>
<?php if ($this->auth()->isLoggedIn()): ?>
+ <a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
+ <?=$this->transEsc('Your Account') ?>
+ </a>
<div class="<?=$this->layoutClass('mainbody')?>">
<?php endif; ?>
diff --git a/themes/finc/templates/myresearch/profile.phtml b/themes/finc/templates/myresearch/profile.phtml
index 17be7a17faa1fe2e38c4ef5ecec0d36721fe74ee..c5be5678f25c4b72e5504658f67ba08856ea784b 100644
--- a/themes/finc/templates/myresearch/profile.phtml
+++ b/themes/finc/templates/myresearch/profile.phtml
@@ -10,7 +10,7 @@
$arrTemplate = '<tr><th>%%LABEL%%:</th><td> %%VALUE%%</td></tr>';
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
@@ -47,7 +47,7 @@
<input class="btn btn-default" type="submit" value="<?= $this->transEsc('Save') ?>"/>
</form>
</td>
- <?php endif; ?>
+ <?php endif; ?>
</table>
<div id="account-actions">
diff --git a/themes/finc/templates/myresearch/storageretrievalrequests.phtml b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
index e01f8e1d7d2243e8d0170c9b08fe5a9d159b3cb9..115894920ccac17fe5a8bedf77c573d44f45e51a 100644
--- a/themes/finc/templates/myresearch/storageretrievalrequests.phtml
+++ b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
@@ -7,7 +7,7 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Storage Retrieval Requests') . '</li>';
?>
-<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
diff --git a/themes/finc/templates/search/advanced/layout.phtml b/themes/finc/templates/search/advanced/layout.phtml
index a2b6a6e2f4120eb483f1d7e568681f642b8a6816..9298d19437392defad3a3205ad534266e2fe72b1 100644
--- a/themes/finc/templates/search/advanced/layout.phtml
+++ b/themes/finc/templates/search/advanced/layout.phtml
@@ -76,6 +76,12 @@ if (isset($searchDetails) && is_object($searchDetails)) {
<input type="hidden" name="sort" value="<?=$this->escapeHtmlAttr($lastSort)?>" />
<?php endif; ?>
<div class="clearfix">
+ <?php ?>
+ <span class="offcanvas-toggler">
+ <a class="search-filter-toggle btn btn-primary visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
+ <?=$this->transEsc('offcanvas-toggler-search-tips')?>
+ </a>
+ </span>
<h1 class="pull-left flip"><?=$this->transEsc('Advanced Search')?></h1>
<div id="groupJoin" class="form-inline pull-right flip">
<label for="groupJoinOptions"><?=$this->transEsc("search_match")?>:</label>
@@ -152,7 +158,7 @@ if (isset($searchDetails) && is_object($searchDetails)) {
<div class="clearfix">
<?=$this->extraAdvancedControls ?>
</div>
- <div class="adv-submit margin-t">
+ <div class="adv-submit margin-t margin-btm">
<input class="clear-btn btn btn-transparent" type="button" value="<?=$this->transEsc('Clear')?>">
<input class="fnd-btn btn btn-primary" type="submit" value="<?= $this->transEsc('Find')?>">
</div>
@@ -160,6 +166,7 @@ if (isset($searchDetails) && is_object($searchDetails)) {
</div>
<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
+ <button class="close-offcanvas btn btn-primary" data-toggle="offcanvas"><?=$this->transEsc('navigate_back') ?></button>
<?php if ($hasDefaultsApplied): ?>
<input type="hidden" name="dfApplied" value="1" />
<?php endif ?>
diff --git a/themes/finc/templates/search/history.phtml b/themes/finc/templates/search/history.phtml
index c02bed89bc87cb8b513a8f680693f0a4a70e7e34..ae21fffccbc1f474d1f9ec26e5cab4617dd76a30 100644
--- a/themes/finc/templates/search/history.phtml
+++ b/themes/finc/templates/search/history.phtml
@@ -13,7 +13,7 @@
?>
<?php if ($saveSupported): ?>
- <a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('Your Account') ?>
</a>
<?php endif; ?>
diff --git a/themes/finc/theme.config.php b/themes/finc/theme.config.php
index bf5726986a17fb9ec87eebcbed702bc10d8a40bb..d8ccfb67f974a065e14c9f4d74a4d34155223633 100644
--- a/themes/finc/theme.config.php
+++ b/themes/finc/theme.config.php
@@ -4,7 +4,8 @@ return [
'js' => [
'check_item_statuses.js',
'lightbox_form_cache.js',
- 'covers.js'
+ 'covers.js',
+ 'common-finc.js'
],
'helpers' => [
'aliases' => [