diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 278089b2d..8a177b65c 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -211,441 +211,484 @@ $options = json_decode($options);
" method="post"> -
-
-
datetime->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
datetime->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
dx->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
dxcc->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
state->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
gridsquare->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
mode->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
band->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
- - -
propagation->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
cqzone->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
ituzone->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
-
-
county->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
dok->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
sota->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
pota->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
iota->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
wwff->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
operator->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
contest->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
- -
continent->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
- -
comment->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
-
- -
-
-
qsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
qsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
qsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
qsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
lotw->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
lotw->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
clublog->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
clublog->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
eqsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
eqsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
dcl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
dcl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
qsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - "> -
-
qsl->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> - - -
-
-
- -
- -
- - - - - - - - - - - - - - - - - - - -
-
- -
-
- - datetime->show ?? "true") == "true") { ?> - - dx->show ?? "true") == "true") { ?> - - dxcc->show ?? "true") == "true") { ?> - - state->show ?? "true") == "true") { ?> - - gridsquare->show ?? "true") == "true") { ?> - - cqzone->show ?? "true") == "true") { ?> - - ituzone->show ?? "true") == "true") { ?> - - mode->show ?? "true") == "true") { ?> - - band->show ?? "true") == "true") { ?> - - iota->show ?? "true") == "true") { ?> - - sota->show ?? "true") == "true") { ?> - - pota->show ?? "true") == "true") { ?> - - wwff->show ?? "true") == "true") { ?> - - operator->show ?? "true") == "true") { ?> - -
-
- - - + + + + + + + + + + + + - + + - diff --git a/assets/css/cosmo/overrides.css b/assets/css/cosmo/overrides.css index 5eac34352..f5d13ca21 100644 --- a/assets/css/cosmo/overrides.css +++ b/assets/css/cosmo/overrides.css @@ -31,10 +31,24 @@ background-color: #d4edda !important; } +.qso_call { + float: left; + width: 190px; +} + .qso_icons { float: right; } +#qsoList_wrapper th { + text-align: left !important; + white-space: nowrap; +} +#qsoList_wrapper td { + text-align: left !important; + white-space: nowrap; +} + TD.qrz { white-space: nowrap; } @@ -95,4 +109,18 @@ path.grid-confirmed { path.grid-worked { fill: rgba(172, 40, 40, 0.7) !important; stroke: rgba(248, 96, 129, 0.7) !important; +} + +::-webkit-scrollbar { + width: 12px; +} + +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; +} + +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5); } \ No newline at end of file diff --git a/assets/css/cosmo_wide/overrides.css b/assets/css/cosmo_wide/overrides.css index 251da5bb0..4018bed52 100644 --- a/assets/css/cosmo_wide/overrides.css +++ b/assets/css/cosmo_wide/overrides.css @@ -84,13 +84,22 @@ height: 400px !important; } +.qso_call { + float: left; + width: 190px; +} + +.qso_icons { + float: right; +} + #qsoList_wrapper th { text-align: left !important; white-space: nowrap; } #qsoList_wrapper td { text-align: left !important; - white-space: pre-wrap; + white-space: nowrap; } TD.qrz { diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index 16f6ebe86..2c306ac87 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -176,7 +176,7 @@ path.grid-worked { .qso_call { float: left; - width: 140px; + width: 190px; } .qso_icons { @@ -328,4 +328,18 @@ svg text.month { margin-left: -5px; position: absolute; width: 0; +} + +::-webkit-scrollbar { + width: 12px; +} + +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(196, 196, 196, 0.185); + border-radius: 10px; +} + +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.5); } \ No newline at end of file diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css index 18ccd01f8..bf7469119 100644 --- a/assets/css/cyborg_wide/overrides.css +++ b/assets/css/cyborg_wide/overrides.css @@ -176,7 +176,7 @@ path.grid-worked { .qso_call { float: left; - width: 140px; + width: 190px; } .qso_icons { @@ -189,7 +189,7 @@ path.grid-worked { } #qsoList_wrapper td { text-align: left !important; - white-space: pre-wrap; + white-space: nowrap; } @media (min-width: 1500px) { diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index 638808c0e..a6f4986bd 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -192,7 +192,7 @@ div.alert-danger { .qso_call { float: left; - width: 140px; + width: 190px; } .qso_icons { @@ -343,3 +343,16 @@ svg text.month { width: 0; } +::-webkit-scrollbar { + width: 12px; +} + +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(196, 196, 196, 0.185); + border-radius: 10px; +} + +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.5); +} \ No newline at end of file diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css index b3c0d15ca..503e76fd6 100644 --- a/assets/css/darkly_wide/overrides.css +++ b/assets/css/darkly_wide/overrides.css @@ -192,7 +192,7 @@ div.alert-danger { .qso_call { float: left; - width: 140px; + width: 180px; } .qso_icons { @@ -205,7 +205,7 @@ div.alert-danger { } #qsoList_wrapper td { text-align: left !important; - white-space: pre-wrap; + white-space: nowrap; } @media (min-width: 992px) { diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 4915191bd..5685476e4 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -28,7 +28,7 @@ thead > tr > td { .qso_call { float: left; - width: 140px; + width: 190px; } .qso_icons { diff --git a/assets/css/default_wide/overrides.css b/assets/css/default_wide/overrides.css index f16828ad6..362e35734 100644 --- a/assets/css/default_wide/overrides.css +++ b/assets/css/default_wide/overrides.css @@ -28,7 +28,7 @@ thead > tr > td { .qso_call { float: left; - width: 140px; + width: 190px; } .qso_icons { @@ -46,7 +46,7 @@ thead > tr > td { #qsoList_wrapper td { text-align: left !important; - white-space: pre-wrap; + white-space: nowrap; } @media (min-width: 1500px) { diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index ca1cd3dd0..7094240a9 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -184,7 +184,7 @@ div.alert-danger { .qso_call { float: left; - width: 140px; + width: 180px; } .qso_icons { @@ -340,4 +340,18 @@ svg text.month { margin-left: -5px; position: absolute; width: 0; +} + +::-webkit-scrollbar { + width: 12px; +} + +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; +} + +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5); } \ No newline at end of file diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css index d3584c7f3..e5eeba445 100644 --- a/assets/css/superhero_wide/overrides.css +++ b/assets/css/superhero_wide/overrides.css @@ -221,7 +221,7 @@ div.alert-danger { .qso_call { float: left; - width: 140px; + width: 180px; } .qso_icons { @@ -234,7 +234,7 @@ div.alert-danger { } #qsoList_wrapper td { text-align: left !important; - white-space: pre-wrap; + white-space: nowrap; } #edit_qso:not(.btn) { diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 31dbcd121..b3736c868 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -4,6 +4,24 @@ let inCallbookItemProcessing = false; let lastChecked = null; let silentReset = false; +document.addEventListener("DOMContentLoaded", function() { + document.querySelectorAll('.dropdown').forEach(dd => { + dd.addEventListener('hide.bs.dropdown', function (e) { + if (e.clickEvent && e.clickEvent.target.closest('.dropdown-menu')) { + e.preventDefault(); + } + }); + + dd.querySelectorAll('.dropdown-action').forEach(btn => { + btn.addEventListener('click', function() { + const dropdown = bootstrap.Dropdown.getInstance(dd.querySelector('[data-bs-toggle="dropdown"]')); + if (dropdown) dropdown.hide(); + }); + }); + }); +}); + + $('#band').change(function () { var band = $("#band option:selected").text(); if (band != "SAT") {