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

Added a small right border to separate button columns in all tables better

Browse Source
This commit is contained in:
Bernd Bestel 2019-03-09 10:49:26 +01:00
parent 2d0c0bf34f
commit a3d4fd834f
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
19 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/batteries.blade.php
View File

@ -28,7 +28,7 @@
<table id="batteries-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Name') }}</th>
<th>{{ $L('Description') }}</th>
<th>{{ $L('Used in') }}</th>
@ -38,7 +38,7 @@
<tbody class="d-none">
@foreach($batteries as $battery)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/battery/') }}{{ $battery->id }}">
<i class="fas fa-edit"></i>
</a>

4
views/batteriesjournal.blade.php
View File

@ -32,7 +32,7 @@
<table id="batteries-journal-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Battery') }}</th>
<th>{{ $L('Tracked time') }}</th>
</tr>
@ -40,7 +40,7 @@
<tbody class="d-none">
@foreach($chargeCycles as $chargeCycleEntry)
<tr class="@if($chargeCycleEntry->undone == 1) text-muted @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-secondary btn-sm undo-battery-execution-button @if($chargeCycleEntry->undone == 1) disabled @endif" href="#" data-charge-cycle-id="{{ $chargeCycleEntry->id }}" data-toggle="tooltip" data-placement="left" title="{{ $L('Undo charge cycle') }}">
<i class="fas fa-undo"></i>
</a>

4
views/batteriesoverview.blade.php
View File

@ -41,7 +41,7 @@
<table id="batteries-overview-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Battery') }}</th>
<th>{{ $L('Last charged') }}</th>
<th>{{ $L('Next planned charge cycle') }}</th>
@ -51,7 +51,7 @@
<tbody class="d-none">
@foreach($current as $curentBatteryEntry)
<tr id="battery-{{ $curentBatteryEntry->battery_id }}-row" class="@if(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->charge_interval_days > 0 && $curentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s')) table-danger @elseif(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->charge_interval_days > 0 && $curentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days"))) table-warning @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-success btn-sm track-charge-cycle-button" href="#" data-toggle="tooltip" data-placement="left" title="{{ $L('Track charge cycle of battery #1', FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->name) }}"
data-battery-id="{{ $curentBatteryEntry->battery_id }}"
data-battery-name="{{ FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->name }}">

4
views/chores.blade.php
View File

@ -28,7 +28,7 @@
<table id="chores-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Name') }}</th>
<th>{{ $L('Period type') }}</th>
<th>{{ $L('Period days') }}</th>
@ -38,7 +38,7 @@
<tbody class="d-none">
@foreach($chores as $chore)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/chore/') }}{{ $chore->id }}">
<i class="fas fa-edit"></i>
</a>

4
views/choresjournal.blade.php
View File

@ -32,7 +32,7 @@
<table id="chores-journal-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Chore') }}</th>
<th>{{ $L('Tracked time') }}</th>
<th>{{ $L('Done by') }}</th>
@ -41,7 +41,7 @@
<tbody class="d-none">
@foreach($choresLog as $choreLogEntry)
<tr class="@if($choreLogEntry->undone == 1) text-muted @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-secondary btn-sm undo-chore-execution-button @if($choreLogEntry->undone == 1) disabled @endif" href="#" data-execution-id="{{ $choreLogEntry->id }}" data-toggle="tooltip" data-placement="left" title="{{ $L('Undo chore execution') }}">
<i class="fas fa-undo"></i>
</a>

4
views/choresoverview.blade.php
View File

@ -41,7 +41,7 @@
<table id="chores-overview-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Chore') }}</th>
<th>{{ $L('Next estimated tracking') }}</th>
<th>{{ $L('Last tracked') }}</th>
@ -51,7 +51,7 @@
<tbody class="d-none">
@foreach($currentChores as $curentChoreEntry)
<tr id="chore-{{ $curentChoreEntry->chore_id }}-row" class="@if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type === \Grocy\Services\ChoresService::CHORE_TYPE_DYNAMIC_REGULAR && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s')) table-danger @elseif(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type === \Grocy\Services\ChoresService::CHORE_TYPE_DYNAMIC_REGULAR && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days"))) table-warning @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-success btn-sm track-chore-button" href="#" data-toggle="tooltip" data-placement="left" title="{{ $L('Track execution of chore #1', FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->name) }}"
data-chore-id="{{ $curentChoreEntry->chore_id }}"
data-chore-name="{{ FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->name }}">

4
views/locations.blade.php
View File

@ -28,7 +28,7 @@
<table id="locations-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Name') }}</th>
<th>{{ $L('Description') }}</th>
</tr>
@ -36,7 +36,7 @@
<tbody class="d-none">
@foreach($locations as $location)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/location/') }}{{ $location->id }}">
<i class="fas fa-edit"></i>
</a>

4
views/manageapikeys.blade.php
View File

@ -32,7 +32,7 @@
<table id="apikeys-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('API key') }}</th>
<th>{{ $L('User') }}</th>
<th>{{ $L('Expires') }}</th>
@ -44,7 +44,7 @@
<tbody class="d-none">
@foreach($apiKeys as $apiKey)
<tr id="apiKeyRow_{{ $apiKey->id }}">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-danger btn-sm apikey-delete-button" href="#" data-apikey-id="{{ $apiKey->id }}" data-apikey-apikey="{{ $apiKey->api_key }}">
<i class="fas fa-trash"></i>
</a>

4
views/productgroups.blade.php
View File

@ -28,7 +28,7 @@
<table id="productgroups-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Name') }}</th>
<th>{{ $L('Description') }}</th>
</tr>
@ -36,7 +36,7 @@
<tbody class="d-none">
@foreach($productGroups as $productGroup)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/productgroup/') }}{{ $productGroup->id }}">
<i class="fas fa-edit"></i>
</a>

4
views/products.blade.php
View File

@ -31,7 +31,7 @@
<table id="products-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Name') }}</th>
<th>{{ $L('Location') }}</th>
<th>{{ $L('Min. stock amount') }}</th>
@ -44,7 +44,7 @@
<tbody class="d-none">
@foreach($products as $product)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/product/') }}{{ $product->id }}">
<i class="fas fa-edit"></i>
</a>

4
views/quantityunits.blade.php
View File

@ -28,7 +28,7 @@
<table id="quantityunits-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Name') }}</th>
<th>{{ $L('Description') }}</th>
</tr>
@ -36,7 +36,7 @@
<tbody class="d-none">
@foreach($quantityunits as $quantityunit)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/quantityunit/') }}{{ $quantityunit->id }}">
<i class="fas fa-edit"></i>
</a>

10
views/recipeform.blade.php
View File

@ -100,7 +100,7 @@
<table id="recipes-pos-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Product') }}</th>
<th>{{ $L('Amount') }}</th>
<th class="fit-content">{{ $L('Note') }}</th>
@ -111,7 +111,7 @@
@if($mode == "edit")
@foreach($recipePositions as $recipePosition)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-sm btn-info recipe-pos-edit-button" href="#" data-recipe-pos-id="{{ $recipePosition->id }}">
<i class="fas fa-edit"></i>
</a>
@ -152,7 +152,7 @@
<table id="recipes-includes-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Recipe') }}</th>
<th>{{ $L('Servings') }}</th>
</tr>
@ -161,7 +161,7 @@
@if($mode == "edit")
@foreach($recipeNestings as $recipeNesting)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-sm btn-info recipe-include-edit-button" href="#" data-recipe-include-id="{{ $recipeNesting->id }}" data-recipe-included-recipe-id="{{ $recipeNesting->includes_recipe_id }}" data-recipe-included-recipe-servings="{{ $recipeNesting->servings }}">
<i class="fas fa-edit"></i>
</a>
@ -223,7 +223,7 @@
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ $L('Cancel') }}</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ $L('Cancel') }}</button>
<button id="save-recipe-include-button" data-dismiss="modal" class="btn btn-success">{{ $L('Save') }}</button>
</div>
</div>

4
views/recipes.blade.php
View File

@ -34,7 +34,7 @@
<thead>
<tr>
<th>{{ $L('Name') }}</th>
<th class="fit-content text-right">{{ $L('Servings') }}</th>
<th>{{ $L('Servings') }}</th>
<th>{{ $L('Requirements fulfilled') }}</th>
<th class="d-none">Hidden status for sorting of "Requirements fulfilled" column</th>
</tr>
@ -45,7 +45,7 @@
<td>
{{ $recipe->name }}
</td>
<td class="fit-content text-right">
<td>
{{ $recipe->desired_servings }}
</td>
<td>

4
views/shoppinglist.blade.php
View File

@ -56,7 +56,7 @@
<table id="shoppinglist-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Product') }} / <em>{{ $L('Note') }}</em></th>
<th>{{ $L('Amount') }}</th>
<th class="d-none">Hiden product group</th>
@ -66,7 +66,7 @@
<tbody class="d-none">
@foreach($listItems as $listItem)
<tr id="shoppinglistitem-{{ $listItem->id }}-row" class="@if(FindObjectInArrayByPropertyValue($missingProducts, 'id', $listItem->product_id) !== null) table-info @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-sm btn-info" href="{{ $U('/shoppinglistitem/') }}{{ $listItem->id }}">
<i class="fas fa-edit"></i>
</a>

4
views/stockjournal.blade.php
View File

@ -32,7 +32,7 @@
<table id="stock-journal-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Product') }}</th>
<th>{{ $L('Amount') }}</th>
<th>{{ $L('Booking time') }}</th>
@ -42,7 +42,7 @@
<tbody class="d-none">
@foreach($stockLog as $stockLogEntry)
<tr class="@if($stockLogEntry->undone == 1) text-muted @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-secondary btn-sm undo-stock-booking-button @if($stockLogEntry->undone == 1) disabled @endif" href="#" data-booking-id="{{ $stockLogEntry->id }}" data-toggle="tooltip" data-placement="left" title="{{ $L('Undo booking') }}">
<i class="fas fa-undo"></i>
</a>

4
views/stockoverview.blade.php
View File

@ -70,7 +70,7 @@
<table id="stock-overview-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Product') }}</th>
<th>{{ $L('Amount') }}</th>
<th>{{ $L('Next best before date') }}</th>
@ -82,7 +82,7 @@
<tbody class="d-none">
@foreach($currentStock as $currentStockEntry)
<tr id="product-{{ $currentStockEntry->product_id }}-row" class="@if($currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $currentStockEntry->amount > 0) table-danger @elseif($currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("+$nextXDays days")) && $currentStockEntry->amount > 0) table-warning @elseif (FindObjectInArrayByPropertyValue($missingProducts, 'id', $currentStockEntry->product_id) !== null) table-info @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-success btn-sm product-consume-button @if($currentStockEntry->amount == 0) disabled @endif" href="#" data-toggle="tooltip" data-placement="left" title="{{ $L('Consume #3 #1 of #2', FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name, 1) }}"
data-product-id="{{ $currentStockEntry->product_id }}"
data-product-name="{{ FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name }}"

4
views/taskcategories.blade.php
View File

@ -28,7 +28,7 @@
<table id="taskcategories-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Name') }}</th>
<th>{{ $L('Description') }}</th>
</tr>
@ -36,7 +36,7 @@
<tbody class="d-none">
@foreach($taskCategories as $taskCategory)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/taskcategory/') }}{{ $taskCategory->id }}">
<i class="fas fa-edit"></i>
</a>

4
views/tasks.blade.php
View File

@ -56,7 +56,7 @@
<table id="tasks-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Task') }}</th>
<th>{{ $L('Due') }}</th>
<th class="d-none">Hidden category</th>
@ -67,7 +67,7 @@
<tbody class="d-none">
@foreach($tasks as $task)
<tr id="task-{{ $task->id }}-row" class="@if($task->done == 1) text-muted @endif @if(!empty($task->due_date) && $task->due_date < date('Y-m-d')) table-danger @elseif(!empty($task->due_date) && $task->due_date < date('Y-m-d', strtotime("+$nextXDays days"))) table-warning @endif">
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-success btn-sm do-task-button @if($task->done == 1) disabled @endif" href="#" data-toggle="tooltip" data-placement="left" title="{{ $L('Mark task "#1" as completed', $task->name) }}"
data-task-id="{{ $task->id }}"
data-task-name="{{ $task->name }}">

4
views/users.blade.php
View File

@ -28,7 +28,7 @@
<table id="users-table" class="table table-sm table-striped dt-responsive">
<thead>
<tr>
<th></th>
<th class="border-right"></th>
<th>{{ $L('Username') }}</th>
<th>{{ $L('First name') }}</th>
<th>{{ $L('Last name') }}</th>
@ -37,7 +37,7 @@
<tbody class="d-none">
@foreach($users as $user)
<tr>
<td class="fit-content">
<td class="fit-content border-right">
<a class="btn btn-info btn-sm" href="{{ $U('/user/') }}{{ $user->id }}">
<i class="fas fa-edit"></i>
</a>