From ea5b3dcd5119fc3ed28952ee849441fe2c0ccf3f Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 8 Nov 2020 19:51:56 +0100 Subject: [PATCH] UI test/review --- public/css/grocy.css | 4 ++ public/viewjs/equipment.js | 12 ++++-- public/viewjs/equipmentform.js | 9 +++++ views/equipment.blade.php | 43 +++++++++----------- views/equipmentform.blade.php | 72 +++++++++++++++++++++------------- views/recipes.blade.php | 1 + 6 files changed, 85 insertions(+), 56 deletions(-) diff --git a/public/css/grocy.css b/public/css/grocy.css index adc4c228..dac48b68 100755 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -239,6 +239,10 @@ input::-webkit-inner-spin-button { width: 96vw; /* Set width of popup menu to screen size */ } +a:not([href]) { + color: inherit; + text-decoration: none; +} /* Set width of popup menu to fixed value on larger devices */ @media (min-width: 400px) { diff --git a/public/viewjs/equipment.js b/public/viewjs/equipment.js index 616152cf..e675b5a6 100644 --- a/public/viewjs/equipment.js +++ b/public/viewjs/equipment.js @@ -1,6 +1,14 @@ var equipmentTable = $('#equipment-table').DataTable({ 'order': [[0, 'asc']], - 'select': 'single', + 'columnDefs': [ + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 }, + { 'orderData': 2, 'targets': 1 } + ], + select: { + style: 'single', + selector: 'tr td:not(:first-child)' + }, 'initComplete': function() { this.api().row({ order: 'current' }, 0).select(); @@ -29,8 +37,6 @@ function DisplayEquipment(id) $(".selected-equipment-name").text(equipmentItem.name); $("#description-tab-content").html(equipmentItem.description); $(".equipment-edit-button").attr("href", U("/equipment/" + equipmentItem.id.toString())); - $(".equipment-delete-button").attr("data-equipment-id", equipmentItem.id); - $(".equipment-delete-button").attr("data-equipment-name", equipmentItem.name); if (equipmentItem.instruction_manual_file_name !== null && !equipmentItem.instruction_manual_file_name.isEmpty()) { diff --git a/public/viewjs/equipmentform.js b/public/viewjs/equipmentform.js index bfe7a765..2de8b8aa 100644 --- a/public/viewjs/equipmentform.js +++ b/public/viewjs/equipmentform.js @@ -137,3 +137,12 @@ ResizeResponsiveEmbeds(); Grocy.Components.UserfieldsForm.Load(); $('#name').focus(); Grocy.FrontendHelpers.ValidateForm('equipment-form'); + +$("#instruction-manual").on("change", function(e) +{ + $("#instruction-manual-label").removeClass("d-none"); + $("#instruction-manual-label-none").addClass("d-none"); + $("#delete-current-instruction-manual-on-save-hint").addClass("d-none"); + $("#current-instruction-manuale").addClass("d-none"); + Grocy.DeleteProductPictureOnSave = false; +}); diff --git a/views/equipment.blade.php b/views/equipment.blade.php index 32a62064..45846920 100644 --- a/views/equipment.blade.php +++ b/views/equipment.blade.php @@ -58,9 +58,10 @@ + class="table table-sm table-striped nowrap w-100"> + @include('components.userfields_thead', array( @@ -72,6 +73,18 @@ @foreach($equipment as $equipmentItem) + @@ -88,7 +101,7 @@
-
{{ $__t('Name') }}
+ + + + + + + {{ $equipmentItem->name }}