Merge pull request #2869 from abarrau/ans-fix-menudropdown

[QSO] fix menu action display

application/views/awards/details.php

@@ -1,3 +1,3 @@
-<h5><?php echo lang('general_word_filtering_on'); ?> <?php echo $filter ?></h5>
+<h5><?php echo lang('general_word_filtering_on'); ?> <?php echo $filter; ?></h5>
 
-<?php $this->load->view('view_log/partial/log_ajax') ?>
+<?php $this->load->view('view_log/partial/log_ajax'); ?>

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({
@@ -817,37 +820,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();
-    });
-  });
 </script>
 
 <?php if ($this->uri->segment(1) == "search") { ?>
@@ -1642,6 +1614,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'));
+                    });
 			  }
 		  });
   }
@@ -1776,6 +1751,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'));
+                    });
 			  }
 		  });
 		  <?php } ?>
@@ -2185,6 +2163,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,
@@ -2491,6 +2472,9 @@ function viewEqsl(picture, callsign) {
                                 'csv'
                             ]
                         });
+                        $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () {
+                            showQsoActionsMenu($(this).closest('.dropdown'));
+                        });
                     },
                     buttons: [{
                         label: lang_admin_close,
@@ -2513,7 +2497,7 @@ function viewEqsl(picture, callsign) {
 			    'Mode': mode,
 			    'Type': type,
 			    'QSL' : qsl
-    },
+        },
 	    success: function (html) {
 		    var dialog = new BootstrapDialog({
 		    title: lang_general_word_qso_data,
@@ -2536,6 +2520,9 @@ function viewEqsl(picture, callsign) {
 						    'csv'
 					    ]
 				    });
+                    $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () {
+                        showQsoActionsMenu($(this).closest('.dropdown'));
+                    });
 			    },
 			    buttons: [{
 			    label: lang_admin_close,

application/views/search/search_result_ajax.php

@@ -419,7 +419,7 @@ $ci =& get_instance();
                             <i class="fas fa-cog"></i>
                         </a>
 
-                        <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
+                        <div class="dropdown-menu menuOnResultTab" aria-labelledby="dropdownMenuLink" data-qsoid="qso_<?php echo $row->COL_PRIMARY_KEY; ?>">
                             <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo lang('general_edit_qso'); ?></a>
 
                             <?php if($row->COL_QSL_SENT !='Y') { ?>

application/views/view_log/partial/log_ajax.php

@@ -251,7 +251,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
                             <i class="fas fa-cog"></i>
                         </a>
 
-                        <div class="dropdown-menu" aria-labelledby="dropdownMenuLink" data-bs-toggle="popover" data-bs-placement="auto">
+                        <div class="dropdown-menu menuOnResultTab" data-bs-toggle="popover" data-bs-placement="auto" data-qsoid="qso_<?php echo $row->COL_PRIMARY_KEY; ?>">
                             <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo lang('general_edit_qso'); ?></a>
 
                             <?php if($row->COL_QSL_SENT !='Y') { ?>

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;
 }

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,45 @@ 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 );
+$('.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('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();
+    });
+    _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'));
+    });
+}

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,

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,

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,

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,