From 8dabdf8e574a19d8127193ed581592e650012b6e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 23 Jun 2025 19:09:19 +0000 Subject: [PATCH] Bug 40222: Bootstrap popover components not updated for BS5 This patch corrects a couple of templates which include a Bootstrap popover component, updating the data attributes which were missed during the BS5 upgrade. The patch also makes a minor change to CSS in order for the popover heading to not have unwanted margins. To test, apply the patch and rebuild the staff interface CSS. - Perform a catalog search in the staff interface. - Add one or more items to the cart. - Open the cart and hover your cursor over the "Items" heading. A popover should be triggered with a message about item sorting. - Go to Administration -> Circulation and Fine rules. - Edit a rule to add content to the "Note" field. - Save the rule and then hover your cursor over the "View note" text. The note you added should appear in a popover. Sponsored-by: Athens County Public Libraries --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 4 ++-- 3 files changed, 7 insertions(+), 3 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 5798abfd153..c8e54882387 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -802,6 +802,10 @@ h2 { h3 { color: #696969; + + &.popover-header { + margin: 0; + } } h4 { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index e128aa50b2a..49301081770 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -259,7 +259,7 @@ [% IF note.defined && note != '' %] - View note + View note [% ELSE %]   [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index df4b5fb6111..e032a57227d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -274,11 +274,11 @@ Items -- 2.39.5