From 22c4030bbfa08f12890a250c502aad1a10c4a9d9 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Wed, 24 Apr 2024 22:30:33 +0000
Subject: [PATCH] Bug 36694: Remove HC sticky from patron search searchbar
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
---
.../intranet-tmpl/prog/css/src/staff-global.scss | 3 +++
.../prog/en/includes/patron-search.inc | 16 +++-------------
.../prog/en/modules/members/member.tt | 2 +-
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index b708bd36bf..dcb69d4323 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2019,6 +2019,9 @@ li {
}
.searchheader {
+ position: sticky;
+ top: 0;
+ z-index: 999;
background-color: #F3F4F4;
box-shadow: 0 0 2px 1px rgba( 0, 0, 0, .2 );
color: #696969;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 5320efe096..e7b45b5cd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -226,7 +226,6 @@
[%# columns: list of columns that will be displayed. Possible values are: 'checkbox', 'cardnumber', 'dateofbirth', 'address', 'name', 'name-address', 'branch', 'category', 'dateexpiry', 'borrowernotes, 'phone', 'checkouts', 'account_balance', 'sort1', 'sort2', 'action' %]
[%# preview_on_name_click: Open a modal window with patron's info when the name is clicked %]
[%# actions: list of buttons to display in the action column. Possible values are: 'select', 'add', 'edit', 'checkout' %]
-[%# sticky_header and sticky_to: If we need a sticky header %]
[%# callback: name of the JS function that will be called when a patron is selected. Only work with action=select %]
[%# display_search_description: boolean, default off. Display the description of the search %]
[%# adjust_history: boolean, default off. Change the current url when a first letter is selected %]
@@ -300,9 +299,6 @@
[% INCLUDE 'js-patron-get-age.inc' %]
[% INCLUDE 'js-patron-format.inc' %]
[% INCLUDE 'js-patron-format-address.inc' %]
- [% IF sticky_header %]
- [% Asset.js("lib/hc-sticky/hc-sticky.js") | $raw %]
- [% END %]
<script>
{
@@ -315,7 +311,6 @@
}
let first_draw = 0;
let patrons_table;
- let Sticky;
let singleBranchMode = '[% singleBranchMode | html %]';
let logged_in_library_id = "[% Branches.GetLoggedInBranchcode | html %]";
let defer_loading = Number( '[% defer_loading | html %]' || 1 );
@@ -717,14 +712,9 @@
"pagingType": 'full_numbers',
"pageLength": [% Koha.Preference('PatronsPerPage') | html %],
[% IF sticky_header %]
- "initComplete": function(settings, json) {
- $("#[% sticky_header | html %]").show();
- Sticky = $("#[% sticky_header | html %]");
- Sticky.hcSticky({
- stickTo: "#[% sticky_to | html %]",
- stickyClass: "floating"
- });
- },
+ "initComplete": function(settings, json) {
+ $("#[% sticky_header | html %]").show();
+ },
[% END %]
fixedHeader: false,
}, typeof table_settings !== 'undefined' ? table_settings : null, 1, additional_filters);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 8684ac860e..6f05c4e8dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -345,7 +345,7 @@
[% ELSE %]
[% SET redirect_url = '/cgi-bin/koha/members/moremember.pl' %]
[% END %]
- [% PROCESS patron_search_js defer_loading => defer_loading, table_id => 'memberresultst', categories => categories, libraries => libraries, columns => columns,actions => ['edit', 'checkout'], redirect_if_one_result => 1, redirect_url => redirect_url, sticky_header => "searchheader", sticky_to => "searchresults", default_sort_column => 'name-address', display_search_description => 1, remember_selections => 1, adjust_history => 1 %]
+ [% PROCESS patron_search_js defer_loading => defer_loading, table_id => 'memberresultst', categories => categories, libraries => libraries, columns => columns,actions => ['edit', 'checkout'], redirect_if_one_result => 1, redirect_url => redirect_url, default_sort_column => 'name-address', display_search_description => 1, remember_selections => 1, adjust_history => 1 %]
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--
2.46.1