From c27f41aee4b62d5dbeb254e5677fc11f31fc5a52 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sat, 11 Aug 2018 14:38:17 +0200
Subject: [PATCH] Don't use buttons in tables with full row select as this is
 confusing when clicking a button of a not selected row

---
 public/viewjs/recipes.js |  7 ++-----
 views/recipes.blade.php  | 17 +++++++----------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js
index 042b4968..3782634a 100644
--- a/public/viewjs/recipes.js
+++ b/public/viewjs/recipes.js
@@ -1,9 +1,6 @@
 var recipesTables = $('#recipes-table').DataTable({
 	'paginate': false,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
+	'order': [[0, 'asc']],
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
@@ -32,7 +29,7 @@ $("#search").on("keyup", function()
 	recipesTables.search(value).draw();
 });
 
-$(document).on('click', '.recipe-delete-button', function(e)
+$("#selectedRecipeDeleteButton").on('click', function(e)
 {
 	var objectName = $(e.currentTarget).attr('data-recipe-name');
 	var objectId = $(e.currentTarget).attr('data-recipe-id');
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 2cc5899a..1158519a 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -21,10 +21,9 @@
 		<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
 		<input type="text" class="form-control" id="search">
 
-		<table id="recipes-table" class="table table-sm table-striped dt-responsive">
+		<table id="recipes-table" class="table table-striped dt-responsive">
 			<thead>
 				<tr>
-					<th>#</th>
 					<th>{{ $L('Name') }}</th>
 					<th>{{ $L('Requirements fulfilled') }}</th>
 				</tr>
@@ -32,14 +31,6 @@
 			<tbody>
 				@foreach($recipes as $recipe)
 				<tr data-recipe-id="{{ $recipe->id }}">
-					<td class="fit-content">
-						<a class="btn btn-sm btn-info" href="{{ $U('/recipe/') }}{{ $recipe->id }}">
-							<i class="fas fa-edit"></i>
-						</a>
-						<a class="btn btn-sm btn-danger recipe-delete-button" href="#" data-recipe-id="{{ $recipe->id }}" data-recipe-name="{{ $recipe->name }}">
-							<i class="fas fa-trash"></i>
-						</a>
-					</td>
 					<td>
 						{{ $recipe->name }}
 					</td>
@@ -63,6 +54,12 @@
 				</a>
 				<a class="btn btn-sm btn-outline-primary py-0 recipe-order-missing-button @if(FindObjectInArrayByPropertyValue($recipesSumFulfillment, 'recipe_id', $selectedRecipe->id)->need_fulfilled_with_shopping_list == 1){{ disabled }}@endif" href="#" data-toggle="tooltip" title="{{ $L('Put missing products on shopping list') }}" data-recipe-id="{{ $selectedRecipe->id }}" data-recipe-name="{{ $selectedRecipe->name }}">
 					<i class="fas fa-cart-plus"></i>
+				</a>&nbsp;&nbsp;
+				<a id="selectedRecipeEditButton" class="btn btn-sm btn-outline-info py-0" href="{{ $U('/recipe/') }}{{ $selectedRecipe->id }}">
+					<i class="fas fa-edit"></i>
+				</a>
+				<a id="selectedRecipeDeleteButton" class="btn btn-sm btn-outline-danger py-0" href="#" data-recipe-id="{{ $selectedRecipe->id }}" data-recipe-name="{{ $selectedRecipe->name }}">
+					<i class="fas fa-trash"></i>
 				</a>
 				<a id="selectedRecipeToggleFullscreenButton" class="btn btn-sm btn-outline-secondary py-0 float-right" href="#" data-toggle="tooltip" title="{{ $L('Expand to fullscreen') }}">
 					<i class="fas fa-expand-arrows-alt"></i>