From ef68864926faa6cd9c9af3e816d9a99729af40cb Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 27 Jul 2024 10:44:15 +0200 Subject: [PATCH 01/10] first glance of dxcc "multiselect" w/o multiselect --- application/views/logbookadvanced/index.php | 4 ++-- assets/js/sections/logbookadvanced.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 035d586c0..c7d9ea77d 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -143,7 +143,7 @@ $options = json_decode($options);
- station_id; ?>" station_id == $active_station_id) { echo " selected =\"selected\""; } ?>> - + station_callsign)); ?> (station_profile_name; ?>) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 4334deb7d..bae65b496 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -316,6 +316,18 @@ $(document).ready(function () { includeSelectAllOption: true }); + $('#dxcc').multiselect({ + // template is needed for bs5 support + templates: { + button: '', + }, + enableFiltering: true, + enableFullValueFiltering: false, + numberDisplayed: 1, + inheritClass: true, + buttonWidth: '100%' + }); + $('#searchForm').submit(function (e) { var container = L.DomUtil.get('advancedmap'); From 3660b9a74d283f75853e675fb12242a982e39af9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 27 Jul 2024 10:45:42 +0200 Subject: [PATCH 02/10] set a max height --- assets/js/sections/logbookadvanced.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index bae65b496..2b0b057a5 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -325,7 +325,8 @@ $(document).ready(function () { enableFullValueFiltering: false, numberDisplayed: 1, inheritClass: true, - buttonWidth: '100%' + buttonWidth: '100%', + maxHeight: 600 }); From 2d6f2046fc251671ea524238ddf5ad9298ef97e3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 27 Jul 2024 11:09:10 +0200 Subject: [PATCH 03/10] case insensitive filtering --- assets/js/sections/logbookadvanced.js | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 2b0b057a5..ec10ecc68 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -323,6 +323,7 @@ $(document).ready(function () { }, enableFiltering: true, enableFullValueFiltering: false, + enableCaseInsensitiveFiltering: true, numberDisplayed: 1, inheritClass: true, buttonWidth: '100%', From fb29100e6b4534aff4cedc0483bbe64c79e60fb6 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 27 Jul 2024 11:09:15 +0200 Subject: [PATCH 04/10] some margin --- assets/css/general.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/css/general.css b/assets/css/general.css index 0dd274458..054c1f2e5 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -1047,3 +1047,9 @@ label { .uppercase { text-transform: uppercase; } + +.multiselect-filter { + margin-left: 5px !important; + margin-right: 5px !important; +} + From 4e2a70a7478eedf18133c7e742f803693de1d678 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 27 Jul 2024 11:21:19 +0200 Subject: [PATCH 05/10] hide radio buttons --- assets/css/general.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/css/general.css b/assets/css/general.css index 054c1f2e5..3138d8f6b 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -1053,3 +1053,6 @@ label { margin-right: 5px !important; } +#dxcc + .btn-group .multiselect-container .multiselect-option input[type="radio"] { + display: none; +} \ No newline at end of file From 5d705d3aa8d58bda9973e1456801ee9c0d979e5d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 27 Jul 2024 11:35:29 +0200 Subject: [PATCH 06/10] some css fixes --- assets/css/general.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/assets/css/general.css b/assets/css/general.css index 3138d8f6b..8d2d6a034 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -1055,4 +1055,14 @@ label { #dxcc + .btn-group .multiselect-container .multiselect-option input[type="radio"] { display: none; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: var(--bs-border-color) !important; + --bs-btn-hover-bg: inherit !important; + --bs-btn-hover-color: inherit !important; + --bs-btn-active-bg: inherit !important; + --bs-btn-active-color: inherit !important; } \ No newline at end of file From 49b03210822c8bd60c37df08335c709a4718fe37 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 29 Jul 2024 22:14:02 +0200 Subject: [PATCH 07/10] css fixes for each theme --- application/views/logbookadvanced/index.php | 2 +- assets/css/cosmo/overrides.css | 11 +++++++++++ assets/css/cosmo_wide/overrides.css | 11 +++++++++++ assets/css/cyborg/overrides.css | 11 +++++++++++ assets/css/cyborg_wide/overrides.css | 11 +++++++++++ assets/css/darkly/overrides.css | 11 +++++++++++ assets/css/darkly_wide/overrides.css | 11 +++++++++++ assets/css/default/overrides.css | 11 +++++++++++ assets/css/default_wide/overrides.css | 11 +++++++++++ assets/css/general.css | 10 ---------- assets/css/superhero/overrides.css | 11 +++++++++++ assets/css/superhero_wide/overrides.css | 11 +++++++++++ assets/js/sections/logbookadvanced.js | 1 + 13 files changed, 112 insertions(+), 11 deletions(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index c7d9ea77d..8f07733ef 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -498,7 +498,7 @@ $options = json_decode($options); - result() as $station) { ?>