diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 035d586c0..8f07733ef 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -143,7 +143,7 @@ $options = json_decode($options);
- 5000 - result() as $station) { ?> diff --git a/assets/css/cosmo/overrides.css b/assets/css/cosmo/overrides.css index f8a7705e9..c0884dac0 100644 --- a/assets/css/cosmo/overrides.css +++ b/assets/css/cosmo/overrides.css @@ -55,4 +55,15 @@ TD.qrz { #utc_header_li { color: #575757; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: #dee2e6; + --bs-btn-hover-border-color: #dee2e6; + --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 diff --git a/assets/css/cosmo_wide/overrides.css b/assets/css/cosmo_wide/overrides.css index ac13fabaa..5414ed19c 100644 --- a/assets/css/cosmo_wide/overrides.css +++ b/assets/css/cosmo_wide/overrides.css @@ -113,4 +113,15 @@ TD.qrz { #utc_header_li { color: #575757; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: #dee2e6; + --bs-btn-hover-border-color: #dee2e6; + --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 diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index 6c9f4ea16..fb70bd793 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -199,4 +199,15 @@ path.grid-worked { #quicklog-form .border, #searchbar-form .border { border-color: #4d4d4d !important; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + /* --bs-btn-border-color: #dee2e6; */ + /* --bs-btn-hover-border-color: #dee2e6; */ + --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 diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css index 14dca4f97..7a104b56a 100644 --- a/assets/css/cyborg_wide/overrides.css +++ b/assets/css/cyborg_wide/overrides.css @@ -249,4 +249,15 @@ path.grid-worked { #quicklog-form .border, #searchbar-form .border { border-color: #4d4d4d !important; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + /* --bs-btn-border-color: #dee2e6; */ + /* --bs-btn-hover-border-color: #dee2e6; */ + --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 diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index 5508ec336..c83aeb140 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -212,4 +212,15 @@ div.alert-danger { #quicklog-form .border, #searchbar-form .border { border-color: #757575 !important; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: inherit !important; + --bs-btn-hover-border-color: inherit !important; + --bs-btn-hover-bg: #1b1b1b; + --bs-btn-hover-color: inherit !important; + --bs-btn-active-bg: #1b1b1b; + --bs-btn-active-color: inherit !important; } \ No newline at end of file diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css index 39f745e6d..33199f7c0 100644 --- a/assets/css/darkly_wide/overrides.css +++ b/assets/css/darkly_wide/overrides.css @@ -263,4 +263,15 @@ div.alert-danger { #quicklog-form .border, #searchbar-form .border { border-color: #757575 !important; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: inherit !important; + --bs-btn-hover-border-color: inherit !important; + --bs-btn-hover-bg: #1b1b1b; + --bs-btn-hover-color: inherit !important; + --bs-btn-active-bg: #1b1b1b; + --bs-btn-active-color: inherit !important; } \ No newline at end of file diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 7ca047112..4b9e7d150 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -65,4 +65,15 @@ thead > tr > td { #utc_header_li { color: #575757; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: #dee2e6; + --bs-btn-hover-border-color: #dee2e6; + --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 diff --git a/assets/css/default_wide/overrides.css b/assets/css/default_wide/overrides.css index 89ecd9924..5851e7875 100644 --- a/assets/css/default_wide/overrides.css +++ b/assets/css/default_wide/overrides.css @@ -100,4 +100,15 @@ thead > tr > td { #utc_header_li { color: #575757; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: #dee2e6; + --bs-btn-hover-border-color: #dee2e6; + --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 diff --git a/assets/css/general.css b/assets/css/general.css index 0dd274458..eb33b4fa5 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -1047,3 +1047,11 @@ label { .uppercase { text-transform: uppercase; } + +.multiselect-container.dropdown-menu { + --bs-dropdown-padding-y: 0; +} + +#dxcc + .btn-group .multiselect-container .multiselect-option input[type="radio"] { + display: none; +} diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 5da20876f..28de4584a 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -210,4 +210,15 @@ div.alert-danger { #quicklog-form .border, #searchbar-form .border { border-color: #959595 !important; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: inherit !important; + --bs-btn-hover-border-color: inherit !important; + --bs-btn-hover-bg: #1e3146; + --bs-btn-hover-color: inherit !important; + --bs-btn-active-bg: #1e3146; + --bs-btn-active-color: inherit !important; } \ No newline at end of file diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css index 62808f476..f4b24582e 100644 --- a/assets/css/superhero_wide/overrides.css +++ b/assets/css/superhero_wide/overrides.css @@ -259,4 +259,15 @@ div.alert-danger { #quicklog-form .border, #searchbar-form .border { border-color: #959595 !important; +} + +.multiselect { + --bs-btn-color: inherit !important; + --bs-btn-bg: inherit !important; + --bs-btn-border-color: inherit !important; + --bs-btn-hover-border-color: inherit !important; + --bs-btn-hover-bg: #1e3146; + --bs-btn-hover-color: inherit !important; + --bs-btn-active-bg: #1e3146; + --bs-btn-active-color: inherit !important; } \ No newline at end of file diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 4334deb7d..25f70b373 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -313,9 +313,27 @@ $(document).ready(function () { button: '', }, numberDisplayed: 1, + inheritClass: true, includeSelectAllOption: true }); + $('#dxcc').multiselect({ + // template is needed for bs5 support + templates: { + button: '', + }, + enableFiltering: true, + enableFullValueFiltering: false, + enableCaseInsensitiveFiltering: true, + numberDisplayed: 1, + inheritClass: true, + buttonWidth: '100%', + maxHeight: 600 + }); + $('.multiselect-container .multiselect-filter', $('#dxcc').parent()).css({ + 'position': 'sticky', 'top': '0px', 'z-index': 1, 'background-color':'inherit', 'width':'100%', 'height':'37px' + }) + $('#searchForm').submit(function (e) { var container = L.DomUtil.get('advancedmap');