From 4225bd4df59e68e16ac9a8ffb787765b134df4bf Mon Sep 17 00:00:00 2001 From: Paul Derscheid Date: Mon, 2 Mar 2026 19:55:59 +0100 Subject: [PATCH] Bug 41963: (follow-up) Extend collapsible toolbar to search results - Add collapsible toolbar wrapper and toggle to opac-results.tt - Move toggle click handler from opac-shelves.tt to global.js so it works on both pages - Un-scope .toolbar-collapse-toggle and .toolbar-collapse CSS rules to apply globally - Add #results to .actions-menu compact override Test plan: - Open the OPAC search results page on a mobile viewport (<=608px) - Confirm the toolbar is collapsed with a toggle button visible - Click the toggle to expand/collapse the toolbar - Verify the list view (opac-shelves) still works as before - On desktop (>608px), confirm no toggle button is visible and the toolbar displays normally - yarn css:build - koha-plack --reload kohadev --- .../bootstrap/css/src/_responsive.scss | 43 ++++++----- .../bootstrap/en/modules/opac-results.tt | 76 ++++++++++--------- .../bootstrap/en/modules/opac-shelves.tt | 10 --- koha-tmpl/opac-tmpl/bootstrap/js/global.js | 10 +++ 4 files changed, 72 insertions(+), 67 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss index 684391159b6..5ea72d89d11 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss @@ -218,33 +218,34 @@ display: block; } - #opac-userlists, - #opac-lists { - .toolbar-collapse-toggle { - background-color: #EEEEEE; - color: $gray-550; - display: block !important; - font-size: .9rem; - padding: 6px 10px; - text-align: center; - width: 100%; + .toolbar-collapse-toggle { + background-color: #EEEEEE; + color: $gray-550; + display: block !important; + font-size: .9rem; + padding: 6px 10px; + text-align: center; + width: 100%; - &:hover, - &:focus { - background-color: darken( #EEEEEE, 5% ); - color: $gray-700; - text-decoration: none; - } + &:hover, + &:focus { + background-color: darken( #EEEEEE, 5% ); + color: $gray-700; + text-decoration: none; } + } - .toolbar-collapse { - display: none; + .toolbar-collapse { + display: none; - &.open { - display: block; - } + &.open { + display: block; } + } + #opac-userlists, + #opac-lists, + #results { .actions-menu .actions { display: inline; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 4034eb9633c..e6969ed2052 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -194,44 +194,48 @@ [% END # IF /searchdesc %]
-
-
[% INCLUDE 'page-numbers.inc' %]
- [% UNLESS tag %] -
- - - - - [% IF Koha.Preference('OPACnumSearchResultsDropdown') %] - - + [% INCLUDE 'resort_form.inc' %] - [% END # IF Koha.Preference('OPACnumSearchResultsDropdown') %] -
- -
- -
- - [% END # /UNLESS tag %] -
- - [% INCLUDE 'result-batch-controls.inc' results=1 %] + [% IF Koha.Preference('OPACnumSearchResultsDropdown') %] + + + [% END # IF Koha.Preference('OPACnumSearchResultsDropdown') %] +
+ +
+ +
+ + [% END # /UNLESS tag %] + + + + [% INCLUDE 'result-batch-controls.inc' results=1 %] + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index acbe6ddcc4a..cd53f555b05 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -1100,16 +1100,6 @@ Dopop( link ); }); - $(".toolbar-collapse-toggle").on("click", function(e) { - e.preventDefault(); - var $toggle = $(this); - var $collapse = $toggle.siblings(".toolbar-collapse"); - var isOpen = $collapse.hasClass("open"); - $collapse.toggleClass("open"); - $toggle.attr("aria-expanded", !isOpen ? "true" : "false"); - $toggle.find("i").toggleClass("fa-bars fa-times"); - }); - }); // document.ready function sortMenu( sorting_form ){ diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/global.js b/koha-tmpl/opac-tmpl/bootstrap/js/global.js index 2e9d20287f4..dbbd14b7ddc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/global.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/global.js @@ -304,6 +304,16 @@ $(document).ready(function () { facetMenu("hide"); } + $(".toolbar-collapse-toggle").on("click", function (e) { + e.preventDefault(); + var $toggle = $(this); + var $collapse = $toggle.siblings(".toolbar-collapse"); + var isOpen = $collapse.hasClass("open"); + $collapse.toggleClass("open"); + $toggle.attr("aria-expanded", isOpen ? "false" : "true"); + $toggle.find("i").toggleClass("fa-bars fa-times"); + }); + // clear the basket when user logs out $("#logout").click(function () { var nameCookie = "bib_list"; -- 2.53.0