From 59db0ed5a72647f1f26c089b9d2e450002673e47 Mon Sep 17 00:00:00 2001 From: abarrau Date: Fri, 22 Dec 2023 10:16:19 +0100 Subject: [PATCH 1/7] fix forgotten semicolon on php --- application/views/awards/details.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/awards/details.php b/application/views/awards/details.php index 59261177..f656d527 100644 --- a/application/views/awards/details.php +++ b/application/views/awards/details.php @@ -1,3 +1,3 @@ -
+
-load->view('view_log/partial/log_ajax') ?> \ No newline at end of file +load->view('view_log/partial/log_ajax'); ?> \ No newline at end of file From 372ef7604bb69724d68c225d7defcd306882c7c8 Mon Sep 17 00:00:00 2001 From: abarrau Date: Fri, 22 Dec 2023 11:12:08 +0100 Subject: [PATCH 2/7] remove class can make issue --- assets/css/general.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/css/general.css b/assets/css/general.css index c9386e75..b66e9c71 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -701,11 +701,9 @@ table.dataTable tfoot td { .dropend .dropdown-toggle { margin-left: 1em; } - -.dropdown .dropdown-menu { +/*.dropdown .dropdown-menu { display: none; -} - +}*/ .dropdown:hover>.dropdown-menu, .dropend:hover>.dropdown-menu { display: block; /* margin-top: .125em; */ @@ -718,15 +716,13 @@ table.dataTable tfoot td { top: 0; left: 100%; } - .dropend .dropdown-toggle { margin-left: .5em; } } - -.navbar-nav li:hover > ul.dropdown-menu { +/*.navbar-nav li:hover > ul.dropdown-menu { display: block; -} +}*/ .dropdown-submenu { position:relative; @@ -736,11 +732,15 @@ table.dataTable tfoot td { left:100%; margin-top:-9px; } - .dropdown-menu > li > a:hover:after { transform: rotate(-90deg); } +.table-responsive .dropdown-menu.notdisplay { + padding:0px!important; + border:0px!important; +} + #partial_view .table-responsive { overflow-x: unset; } From 19a8f60803eb7c6acd20ba6fc40eaeb4d4fbd709 Mon Sep 17 00:00:00 2001 From: abarrau Date: Fri, 22 Dec 2023 11:12:58 +0100 Subject: [PATCH 3/7] add generic function for display action menu --- assets/js/sections/common.js | 42 ++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index e4e8a2dc..9bf7490a 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -123,6 +123,9 @@ function qso_edit(id) { data: {'id': id }, success: function(html) { + // remove actions QSO menu // + $('.menuOnResultTab').hide(); + $('.menuOnBody').remove(); BootstrapDialog.show({ title: lang_general_word_qso_data, cssClass: 'edit-dialog', @@ -148,7 +151,7 @@ function qso_edit(id) { //$('#stationCntyInput')[0].selectize.destroy(); $("#stationCntyInputEdit").val(""); } - }); + }); $('#locator').change(function(){ if ($(this).val().length >= 4) { @@ -584,4 +587,39 @@ function btn_pwd_showhide() { $(this).closest('div').find('.fa-eye').removeClass('fa-eye').addClass('fa-eye-slash'); } } -$('.user_edit .btn-pwd-showhide').off('click').on('click', btn_pwd_showhide ); \ No newline at end of file +$('.user_edit .btn-pwd-showhide').off('click').on('click', btn_pwd_showhide ); + +// [QSO] show/hide actions menu on qso list (_this = div.dropdown actived) // +function showQsoActionsMenu(_this) { + $('.menuOnResultTab').hide(); + $('.menuOnBody').remove(); + var _id = _this.find('.menuOnResultTab').attr('data-qsoid'); + var _dropdownMenuClone = _this.find('.menuOnResultTab[data-qsoid="'+ _id +'"]').clone(); + _dropdownMenuClone.removeClass('menuOnResultTab').addClass('menuOnBody'); + $('body').append(_dropdownMenuClone); + var _dropdownMenu = _this.find('.menuOnResultTab[data-qsoid="'+ _id +'"]'); + var eOffset = _this.offset(); + if ((eOffset.top - $(window).scrollTop() + _dropdownMenu.outerHeight()) >= ($(window).height()-50)) { + _topMenu = eOffset.top - _dropdownMenu.outerHeight(); + } else { + _topMenu = eOffset.top + _this.outerHeight(); + } + _dropdownMenuClone.css({ + 'top': _topMenu, + 'left': eOffset.left - _dropdownMenu.width() + _this.find('.dropdown-toggle').outerWidth(), + 'display': 'block', + }); + _dropdownMenuClone.off('mouseleave').on('mouseleave', function () { + $(this).remove(); + }); + _dropdownMenuClone.find('a').off('click').on('click', function () { + if ($(this).is(':first-child') || $(this).is(':last-child')) { // Only for edit & delete action // + $(this).closest('.menuOnResultTab').remove(); + } + }); +} +if ($('.table-responsive .dropdown-toggle').length>0) { + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); +} From 3199660f9d57eb2354ef69ecf8136d55ab8d396d Mon Sep 17 00:00:00 2001 From: abarrau Date: Fri, 22 Dec 2023 11:14:25 +0100 Subject: [PATCH 4/7] add special name of this action menu (difference with top menu) --- application/views/search/search_result_ajax.php | 2 +- application/views/view_log/partial/log_ajax.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index f26870bb..16c94bfb 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -419,7 +419,7 @@ $ci =& get_instance(); -
+
COL_QSL_SENT !='Y') { ?> diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 03033aac..4942712b 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -251,7 +251,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { -
+
COL_QSL_SENT !='Y') { ?> From b4bd99050418a8fdb0aae4e931e1afc6074bcf1f Mon Sep 17 00:00:00 2001 From: abarrau Date: Fri, 22 Dec 2023 11:15:00 +0100 Subject: [PATCH 5/7] add called function on each ajax generated table result --- application/views/interface_assets/footer.php | 51 +++++++------------ assets/js/sections/distances.js | 3 ++ assets/js/sections/gridmap.js | 3 ++ assets/js/sections/gridmaster.js | 3 ++ 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 70ffb28a..4a0d3557 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -532,6 +532,9 @@ $(function () { $(".searchbutton").removeClass('running'); $(".searchbutton").prop('disabled', false); $("#btn-save").show(); + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }); } else { BootstrapDialog.show({ @@ -829,37 +832,6 @@ function showActivatorsMap(call, count, grids) { $(function () { $('[data-bs-toggle="tooltip"]').tooltip() }); - - $(function () { - // hold onto the drop down menu - var dropdownMenu; - - // and when you show it, move it to the body - $(window).on('show.bs.dropdown', function (e) { - - // grab the menu - dropdownMenu = $(e.target).find('.dropdown-menu'); - - // detach it and append it to the body - $('body').append(dropdownMenu.detach()); - - // grab the new offset position - var eOffset = $(e.target).offset(); - - // make sure to place it where it would normally go (this could be improved) - dropdownMenu.css({ - 'display': 'block', - 'top': eOffset.top + $(e.target).outerHeight(), - 'left': eOffset.left - }); - }); - - // and when you hide it, reattach the drop down, and hide it normally - $(window).on('hide.bs.dropdown', function (e) { - $(e.target).append(dropdownMenu.detach()); - dropdownMenu.hide(); - }); - }); uri->segment(1) == "search") { ?> @@ -1654,6 +1626,9 @@ $(document).ready(function(){ $('#exampleModal').modal('show'); $('[data-bs-toggle="tooltip"]').tooltip({ boundary: 'window' }); } + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); } }); } @@ -1788,6 +1763,9 @@ $(document).ready(function(){ $('#exampleModal').modal('show'); $('[data-bs-toggle="tooltip"]').tooltip({ boundary: 'window' }); } + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); } }); @@ -2197,6 +2175,9 @@ $(document).ready(function(){ message: html, onshown: function(dialog) { $('[data-bs-toggle="tooltip"]').tooltip(); + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }, buttons: [{ label: lang_admin_close, @@ -2503,6 +2484,9 @@ function viewEqsl(picture, callsign) { 'csv' ] }); + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }, buttons: [{ label: lang_admin_close, @@ -2525,7 +2509,7 @@ function viewEqsl(picture, callsign) { 'Mode': mode, 'Type': type, 'QSL' : qsl - }, + }, success: function (html) { var dialog = new BootstrapDialog({ title: lang_general_word_qso_data, @@ -2548,6 +2532,9 @@ function viewEqsl(picture, callsign) { 'csv' ] }); + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }, buttons: [{ label: lang_admin_close, diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index 5ae46b30..32c218c9 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -164,6 +164,9 @@ function getDistanceQsos(distance) { 'csv' ] }); + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }, buttons: [{ label: lang_admin_close, diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index 7a861d16..b9ea60ec 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -168,6 +168,9 @@ function spawnGridsquareModal(loc_4char) { if (isDarkModeTheme()) { $(".buttons-csv").css("color", "white"); } + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }, buttons: [{ label: lang_admin_close, diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index 239bf280..0d4a74b2 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -132,6 +132,9 @@ function spawnGridsquareModal(loc_4char) { if (isDarkModeTheme()) { $(".buttons-csv").css("color", "white"); } + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }, buttons: [{ label: lang_admin_close, From 9c8271c11920177b59f560ce73c86a3dc3e1a06f Mon Sep 17 00:00:00 2001 From: abarrau Date: Wed, 27 Dec 2023 14:18:22 +0100 Subject: [PATCH 6/7] fix hide actions menu when mouse not hover on the menu --- assets/js/sections/common.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 9bf7490a..9a10d38c 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -609,6 +609,12 @@ function showQsoActionsMenu(_this) { 'left': eOffset.left - _dropdownMenu.width() + _this.find('.dropdown-toggle').outerWidth(), 'display': 'block', }); + _dropdownMenuClone.off('mouseenter').on('mouseenter', function () { + _dropdownMenuClone.attr('data-mouseenteronmenu','1'); + }); + _this.off('mouseleave').on('mouseleave', function () { + setTimeout(function(){ if (_dropdownMenuClone.attr('data-mouseenteronmenu')!='1') { _dropdownMenuClone.remove();} }, 200); + }); _dropdownMenuClone.off('mouseleave').on('mouseleave', function () { $(this).remove(); }); From 363a88ee80fae0edc77bda904f6cee63aec7c6b5 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 30 Dec 2023 18:41:58 +0100 Subject: [PATCH 7/7] Added fix to the FFMA Award --- assets/js/sections/ffma.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index 5096b834..27ac8245 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -126,6 +126,9 @@ function spawnGridsquareModal(loc_4char) { if (isDarkModeTheme()) { $(".buttons-csv").css("color", "white"); } + $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { + showQsoActionsMenu($(this).closest('.dropdown')); + }); }, buttons: [{ label: lang_admin_close,