kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Small visual/space improvements/changes on recipes and equipment page

Browse Source
This commit is contained in:
Bernd Bestel 2018-10-06 11:43:46 +02:00
parent b0c91f6ad1
commit 9984e8f218
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/viewjs/equipment.js
View File

@ -1,9 +1,6 @@
var equipmentTable = $('#equipment-table').DataTable({ var equipmentTable = $('#equipment-table').DataTable({
'paginate': false, 'paginate': false,
'order': [[1, 'asc']], 'order': [[0, 'asc']],
'columnDefs': [
{ 'orderable': false, 'targets': 0 }
],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false, 'scrollY': false,
'colReorder': true, 'colReorder': true,

27
views/equipment.blade.php
View File

@ -18,24 +18,15 @@
<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i> <label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
<input type="text" class="form-control" id="search"> <input type="text" class="form-control" id="search">
<table id="equipment-table" class="table table-sm table-striped dt-responsive"> <table id="equipment-table" class="table table-striped dt-responsive">
<thead> <thead>
<tr> <tr>
<th>#</th>
<th>{{ $L('Name') }}</th> <th>{{ $L('Name') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($equipment as $equipmentItem) @foreach($equipment as $equipmentItem)
<tr data-equipment-id="{{ $equipmentItem->id }}"> <tr data-equipment-id="{{ $equipmentItem->id }}">
<td class="fit-content">
<a class="btn btn-info btn-sm" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
<i class="fas fa-edit"></i>
</a>
<a class="btn btn-danger btn-sm equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
<i class="fas fa-trash"></i>
</a>
</td>
<td> <td>
{{ $equipmentItem->name }} {{ $equipmentItem->name }}
</td> </td>
@ -58,7 +49,13 @@
<div class="tab-pane fade show active" id="instruction-manual-tab"> <div class="tab-pane fade show active" id="instruction-manual-tab">
<div id="selectedEquipmentInstructionManualCard" class="card"> <div id="selectedEquipmentInstructionManualCard" class="card">
<div class="card-header"> <div class="card-header">
<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span> <i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
<i class="fas fa-edit"></i>
</a>
<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" 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="{{ $L('Expand to fullscreen') }}"> <a id="selectedEquipmentInstructionManualToggleFullscreenButton" 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> <i class="fas fa-expand-arrows-alt"></i>
</a> </a>
@ -72,7 +69,13 @@
<div class="tab-pane fade" id="description-tab"> <div class="tab-pane fade" id="description-tab">
<div id="selectedEquipmentDescriptionCard" class="card"> <div id="selectedEquipmentDescriptionCard" class="card">
<div class="card-header"> <div class="card-header">
<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span> <i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
<i class="fas fa-edit"></i>
</a>
<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" 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="{{ $L('Expand to fullscreen') }}"> <a id="selectedEquipmentDescriptionToggleFullscreenButton" 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> <i class="fas fa-expand-arrows-alt"></i>
</a> </a>

7
views/recipes.blade.php
View File

@ -6,18 +6,15 @@
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col">
<div class="col-xs-12 col-md-6 pb-3">
<h1> <h1>
@yield('title') @yield('title')
<a class="btn btn-outline-dark" href="{{ $U('/recipe/new') }}"> <a class="btn btn-outline-dark" href="{{ $U('/recipe/new') }}">
<i class="fas fa-plus"></i> {{ $L('Add') }} <i class="fas fa-plus"></i> {{ $L('Add') }}
</a> </a>
</h1> </h1>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-6 pb-3">
<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i> <label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
<input type="text" class="form-control" id="search"> <input type="text" class="form-control" id="search">