diff --git a/public/css/grocy.css b/public/css/grocy.css index 1dd11fc6..97f4fa8d 100644 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -199,5 +199,5 @@ td { /* Third party component customizations - Popper.js */ .tooltip { - pointer-events: auto; + pointer-events: none; } diff --git a/public/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js index 6305d969..4a2248ce 100644 --- a/public/viewjs/batteriesoverview.js +++ b/public/viewjs/batteriesoverview.js @@ -54,6 +54,10 @@ $(".status-filter-button").on("click", function() $(document).on('click', '.track-charge-cycle-button', function(e) { e.preventDefault(); + + // Remove the focus from the current button + // to prevent that the tooltip stays until clicked anywhere else + document.activeElement.blur(); var batteryId = $(e.currentTarget).attr('data-battery-id'); var batteryName = $(e.currentTarget).attr('data-battery-name'); diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js index ef00ee4f..eea8def4 100644 --- a/public/viewjs/choresoverview.js +++ b/public/viewjs/choresoverview.js @@ -54,6 +54,10 @@ $(".status-filter-button").on("click", function() $(document).on('click', '.track-chore-button', function(e) { e.preventDefault(); + + // Remove the focus from the current button + // to prevent that the tooltip stays until clicked anywhere else + document.activeElement.blur(); var choreId = $(e.currentTarget).attr('data-chore-id'); var choreName = $(e.currentTarget).attr('data-chore-name'); diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 06042bd3..ddc3f9df 100644 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -66,6 +66,10 @@ $("#search").on("keyup", function() $(document).on('click', '.product-consume-button', function(e) { e.preventDefault(); + + // Remove the focus from the current button + // to prevent that the tooltip stays until clicked anywhere else + document.activeElement.blur(); var productId = $(e.currentTarget).attr('data-product-id'); var productName = $(e.currentTarget).attr('data-product-name'); diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js index ff767c34..26d27091 100644 --- a/public/viewjs/tasks.js +++ b/public/viewjs/tasks.js @@ -58,6 +58,10 @@ $(".status-filter-button").on("click", function() $(document).on('click', '.do-task-button', function(e) { e.preventDefault(); + + // Remove the focus from the current button + // to prevent that the tooltip stays until clicked anywhere else + document.activeElement.blur(); var taskId = $(e.currentTarget).attr('data-task-id'); var taskName = $(e.currentTarget).attr('data-task-name'); diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php index 80e9485f..1c11c5f9 100644 --- a/views/batteriesoverview.blade.php +++ b/views/batteriesoverview.blade.php @@ -48,7 +48,7 @@ @foreach($current as $curentBatteryEntry) - diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php index b149d0fc..a8b94616 100644 --- a/views/choresoverview.blade.php +++ b/views/choresoverview.blade.php @@ -48,7 +48,7 @@ @foreach($currentChores as $curentChoreEntry) - diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php index a33de3f2..6f744d15 100644 --- a/views/recipeform.blade.php +++ b/views/recipeform.blade.php @@ -68,7 +68,7 @@ - + @@ -80,7 +80,7 @@ @if(FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $recipePosition->id)->need_fulfilled == 1) {{ $L('Enough in stock') }} @else {{ $L('Not enough in stock, #1 missing, #2 already on shopping list', FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $recipePosition->id)->missing_amount, FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $recipePosition->id)->amount_on_shopping_list) }} @endif - + diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index 7079f46c..b48e92f8 100644 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -60,14 +60,14 @@ @foreach($currentStock as $currentStockEntry) product_id) !== null) table-info @endif"> - 1 - - name) }}" + name) }}" data-task-id="{{ $task->id }}" data-task-name="{{ $task->name }}">