From a2b6d9ae39d616387fc2b966d0196e19241e9f1d Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Thu, 26 Sep 2019 13:14:24 +0200
Subject: [PATCH] Various small UI refinements

---
 public/viewjs/equipment.js  |  1 +
 public/viewjs/mealplan.js   | 13 +++++++++++++
 views/equipment.blade.php   | 10 +++++-----
 views/productform.blade.php |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/viewjs/equipment.js b/public/viewjs/equipment.js
index 7d376510..f9198cf9 100644
--- a/public/viewjs/equipment.js
+++ b/public/viewjs/equipment.js
@@ -131,4 +131,5 @@ $("#selectedEquipmentDescriptionToggleFullscreenButton").on('click', function(e)
 	$("#selectedEquipmentDescriptionCard").toggleClass("fullscreen");
 	$("#selectedEquipmentDescriptionCard .card-header").toggleClass("fixed-top");
 	$("#selectedEquipmentDescriptionCard .card-body").toggleClass("mt-5");
+	$("body").toggleClass("fullscreen-card");
 });
diff --git a/public/viewjs/mealplan.js b/public/viewjs/mealplan.js
index 240d502c..09210559 100644
--- a/public/viewjs/mealplan.js
+++ b/public/viewjs/mealplan.js
@@ -116,6 +116,7 @@ var calendar = $("#calendar").fullCalendar({
 	{
 		RefreshLocaleNumberDisplay();
 		LoadImagesLazy();
+		$('[data-toggle="tooltip"]').tooltip();
 
 		if (GetUriParam("week") !== undefined)
 		{
@@ -213,6 +214,10 @@ $(document).on("keyodwn", "#servings", function(e)
 
 $(document).on('click', '.recipe-order-missing-button', function(e)
 {
+	// Remove the focus from the current button
+	// to prevent that the tooltip stays until clicked anywhere else
+	document.activeElement.blur();
+	
 	var objectName = $(e.currentTarget).attr('data-recipe-name');
 	var objectId = $(e.currentTarget).attr('data-recipe-id');
 	var button = $(this);
@@ -262,6 +267,10 @@ $(document).on('click', '.recipe-order-missing-button', function(e)
 
 $(document).on('click', '.recipe-consume-button', function(e)
 {
+	// Remove the focus from the current button
+	// to prevent that the tooltip stays until clicked anywhere else
+	document.activeElement.blur();
+
 	var objectName = $(e.currentTarget).attr('data-recipe-name');
 	var objectId = $(e.currentTarget).attr('data-recipe-id');
 
@@ -304,6 +313,10 @@ $(document).on('click', '.recipe-consume-button', function(e)
 
 $(document).on("click", ".recipe-popup-button", function(e)
 {
+	// Remove the focus from the current button
+	// to prevent that the tooltip stays until clicked anywhere else
+	document.activeElement.blur();
+
 	var objectId = $(e.currentTarget).attr('data-recipe-id');
 
 	bootbox.dialog({
diff --git a/views/equipment.blade.php b/views/equipment.blade.php
index 4667288b..cca752f8 100644
--- a/views/equipment.blade.php
+++ b/views/equipment.blade.php
@@ -61,10 +61,10 @@
 				<div id="selectedEquipmentInstructionManualCard" class="card">
 					<div class="card-header">
 						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
-						<a class="btn btn-sm btn-outline-info py-0 equipment-edit-button" href="#">
+						<a class="btn btn-sm btn-outline-info py-0 equipment-edit-button hide-on-fullscreen-card" href="#">
 							<i class="fas fa-edit"></i>
 						</a>
-						<a class="btn btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
+						<a class="btn btn-sm btn-outline-danger py-0 equipment-delete-button hide-on-fullscreen-card" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
 							<i class="fas fa-trash"></i>
 						</a>
 						<a id="selectedEquipmentInstructionManualToggleFullscreenButton" class="btn btn-sm btn-outline-secondary py-0 float-right" href="#" data-toggle="tooltip" title="{{ $__t('Expand to fullscreen') }}">
@@ -72,7 +72,7 @@
 						</a>
 					</div>
 					<div class="card-body py-0 px-0">
-						<p id="selected-equipment-has-no-instruction-manual-hint" class="text-muted font-italic d-none">{{ $__t('The selected equipment has no instruction manual') }}</p>
+						<p id="selected-equipment-has-no-instruction-manual-hint" class="text-muted font-italic d-none pt-3 pl-3">{{ $__t('The selected equipment has no instruction manual') }}</p>
 						<embed id="selected-equipment-instruction-manual" class="embed-responsive embed-responsive-4by3" src="" type="application/pdf">
 					</div>
 				</div>
@@ -81,10 +81,10 @@
 				<div id="selectedEquipmentDescriptionCard" class="card">
 					<div class="card-header">
 						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
-						<a class="btn btn-sm btn-outline-info py-0 equipment-edit-button" href="#">
+						<a class="btn btn-sm btn-outline-info py-0 equipment-edit-button hide-on-fullscreen-card" href="#">
 							<i class="fas fa-edit"></i>
 						</a>
-						<a class="btn btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
+						<a class="btn btn-sm btn-outline-danger py-0 equipment-delete-button hide-on-fullscreen-card" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
 							<i class="fas fa-trash"></i>
 						</a>
 						<a id="selectedEquipmentDescriptionToggleFullscreenButton" class="btn btn-sm btn-outline-secondary py-0 float-right" href="#" data-toggle="tooltip" title="{{ $__t('Expand to fullscreen') }}">
diff --git a/views/productform.blade.php b/views/productform.blade.php
index ff3dc97c..222b999f 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -179,7 +179,7 @@
 				</div>
 			</div>
 
-			<div class="form-group">
+			<div class="form-group mb-1">
 				<div class="form-check">
 					<input type="hidden" name="enable_tare_weight_handling" value="0">
 					<input @if($mode == 'edit' && $product->enable_tare_weight_handling == 1) checked @endif class="form-check-input" type="checkbox" id="enable_tare_weight_handling" name="enable_tare_weight_handling" value="1">