From 5fe5600ade54e3b813b95fbb7e435feb521ce855 Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Tue, 24 Oct 2023 12:20:52 +0200
Subject: [PATCH] Workaround for bs5 and multiselect, see
https://github.com/davidstutz/bootstrap-multiselect/discussions/1202
---
ckanext/odsh/assets/bootstrap-multiselect.js | 4 ++--
ckanext/odsh/assets/odsh.css | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ckanext/odsh/assets/bootstrap-multiselect.js b/ckanext/odsh/assets/bootstrap-multiselect.js
index 10ece146..5a3bf861 100644
--- a/ckanext/odsh/assets/bootstrap-multiselect.js
+++ b/ckanext/odsh/assets/bootstrap-multiselect.js
@@ -461,7 +461,7 @@
},
enableHTML: false,
- buttonClass: 'btn btn-default',
+ buttonClass: 'form-select',
inheritClass: false,
buttonWidth: 'auto',
buttonContainer: '<div class="btn-group" />',
@@ -500,7 +500,7 @@
includeResetDivider: false,
resetText: 'Reset',
templates: {
- button: '<button type="button" class="multiselect dropdown-toggle" data-toggle="dropdown"><span class="multiselect-selected-text"></span> <b class="caret"></b></button>',
+ button: '<button type="button" class="multiselect dropdown-toggle" data-bs-toggle="dropdown"><span class="multiselect-selected-text"></span> <b class="caret"></b></button>',
ul: '<ul class="multiselect-container dropdown-menu"></ul>',
filter: '<li class="multiselect-item multiselect-filter"><div class="input-group"><span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span><input class="form-control multiselect-search" type="text" /></div></li>',
filterClearBtn: '<span class="input-group-btn"><button class="btn btn-default multiselect-clear-filter" type="button"><i class="glyphicon glyphicon-remove-circle"></i></button></span>',
diff --git a/ckanext/odsh/assets/odsh.css b/ckanext/odsh/assets/odsh.css
index b0bf4218..fc32a357 100644
--- a/ckanext/odsh/assets/odsh.css
+++ b/ckanext/odsh/assets/odsh.css
@@ -2697,6 +2697,14 @@ p.package-info-issued {
margin-right: 5px;
}
+.multiselect-container li > a {
+ display: block;
+}
+
+.multiselect-container > li.active > a > label {
+ color: white;
+}
+
.control-group.error .multiselect-container>li>a>label {
color: var(--odsh-color-sh-blue);
}
@@ -2760,6 +2768,7 @@ p.package-info-issued {
.dropdown-submenu:hover>a,
.dropdown-submenu:focus>a {
background-color: var(--odsh-color-sh-blue);
+ color: white !important;
background-image: none;
}
--
GitLab