mirror of
https://github.com/grocy/grocy.git
synced 2025-10-31 02:36:54 +00:00
UI test/review
This commit is contained in:
Bernd Bestel
@@ -16,7 +16,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -37,14 +37,14 @@
|
||||
data-status-filter="overdue"
|
||||
class="error-message status-filter-message responsive-button"></div>
|
||||
<div class="float-right">
|
||||
<a class="btn btn-sm btn-outline-info d-md-none"
|
||||
<a class="btn btn-sm btn-outline-info d-md-none mt-2"
|
||||
data-toggle="collapse"
|
||||
href="#table-filter-row"
|
||||
role="button">
|
||||
<i class="fas fa-filter"></i>
|
||||
</a>
|
||||
<a id="clear-filter-button"
|
||||
class="btn btn-sm btn-outline-info"
|
||||
class="btn btn-sm btn-outline-info mt-2"
|
||||
href="#">
|
||||
{{ $__t('Clear filter') }}
|
||||
</a>
|
||||
@@ -89,6 +89,7 @@
|
||||
<tr>
|
||||
<th class="border-right"></th>
|
||||
<th>{{ $__t('Battery') }}</th>
|
||||
<th>{{ $__t('Used in') }}</th>
|
||||
<th>{{ $__t('Last charged') }}</th>
|
||||
<th>{{ $__t('Next planned charge cycle') }}</th>
|
||||
<th class="d-none">Hidden status</th>
|
||||
@@ -128,9 +129,9 @@
|
||||
href="#">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-info"></i></span> <span class="dropdown-item-text">{{ $__t('Show battery details') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item"
|
||||
<a class="dropdown-item show-as-dialog-link"
|
||||
type="button"
|
||||
href="{{ $U('/batteriesjournal?battery=') }}{{ $currentBatteryEntry->battery_id }}">
|
||||
href="{{ $U('/batteriesjournal?embedded&battery=') }}{{ $currentBatteryEntry->battery_id }}">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-file-alt"></i></span> <span class="dropdown-item-text">{{ $__t('Journal for this battery') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item permission-MASTER_DATA_EDIT"
|
||||
@@ -145,6 +146,9 @@
|
||||
data-battery-id="{{ $currentBatteryEntry->battery_id }}">
|
||||
{{ FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->name }}
|
||||
</td>
|
||||
<td class="fit-content">
|
||||
{{ FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->used_in }}
|
||||
</td>
|
||||
<td>
|
||||
<span id="battery-{{ $currentBatteryEntry->battery_id }}-last-tracked-time">{{ $currentBatteryEntry->last_tracked_time }}</span>
|
||||
<time id="battery-{{ $currentBatteryEntry->battery_id }}-last-tracked-time-timeago"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
||||
<h2 class="title">@yield('title')</h2>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<form id="batterytracking-form"
|
||||
novalidate>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<script>
|
||||
var fullcalendarEventSources = {!! json_encode(array($fullcalendarEventSources)) !!}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -42,14 +42,14 @@
|
||||
class="normal-message user-filter-message responsive-button"></div>
|
||||
@endif
|
||||
<div class="float-right">
|
||||
<a class="btn btn-sm btn-outline-info d-md-none"
|
||||
<a class="btn btn-sm btn-outline-info d-md-none mt-2"
|
||||
data-toggle="collapse"
|
||||
href="#table-filter-row"
|
||||
role="button">
|
||||
<i class="fas fa-filter"></i>
|
||||
</a>
|
||||
<a id="clear-filter-button"
|
||||
class="btn btn-sm btn-outline-info"
|
||||
class="btn btn-sm btn-outline-info mt-2"
|
||||
href="#">
|
||||
{{ $__t('Clear filter') }}
|
||||
</a>
|
||||
@@ -156,9 +156,9 @@
|
||||
href="#">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-info"></i></span> <span class="dropdown-item-text">{{ $__t('Show chore details') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item"
|
||||
<a class="dropdown-item show-as-dialog-link"
|
||||
type="button"
|
||||
href="{{ $U('/choresjournal?chore=') }}{{ $curentChoreEntry->chore_id }}">
|
||||
href="{{ $U('/choresjournal?embedded&chore=') }}{{ $curentChoreEntry->chore_id }}">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-file-alt"></i></span> <span class="dropdown-item-text">{{ $__t('Journal for this chore') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item permission-MASTER_DATA_EDIT"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
||||
<h2 class="title">@yield('title')</h2>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<form id="choretracking-form"
|
||||
novalidate>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<div class="card batterycard">
|
||||
<div class="card-header">
|
||||
<i class="fas fa-battery-three-quarters"></i> {{ $__t('Battery overview') }}
|
||||
<span class="float-left">{{ $__t('Battery overview') }}</span>
|
||||
<a id="batterycard-battery-edit-button"
|
||||
class="btn btn-sm btn-outline-info py-0 float-right disabled"
|
||||
href="#"
|
||||
@@ -13,7 +13,7 @@
|
||||
<i class="fas fa-edit"></i>
|
||||
</a>
|
||||
<a id="batterycard-battery-journal-button"
|
||||
class="btn btn-sm btn-outline-secondary py-0 mr-2 float-right disabled show-as-dialog-link"
|
||||
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
|
||||
href="#"
|
||||
data-toggle="tooltip"
|
||||
title="{{ $__t('Journal for this battery') }}">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<div class="card chorecard">
|
||||
<div class="card-header">
|
||||
<i class="fas fa-home"></i> {{ $__t('Chore overview') }}
|
||||
<span class="float-left">{{ $__t('Chore overview') }}</span>
|
||||
<a id="chorecard-chore-edit-button"
|
||||
class="btn btn-sm btn-outline-info py-0 float-right disabled"
|
||||
href="#"
|
||||
@@ -13,7 +13,7 @@
|
||||
<i class="fas fa-edit"></i>
|
||||
</a>
|
||||
<a id="chorecard-chore-journal-button"
|
||||
class="btn btn-sm btn-outline-secondary py-0 mr-2 float-right disabled show-as-dialog-link"
|
||||
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
|
||||
href="#"
|
||||
data-toggle="tooltip"
|
||||
title="{{ $__t('Journal for this chore') }}">
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
<div class="card productcard">
|
||||
<div class="card-header">
|
||||
<i class="fab fa-product-hunt"></i> {{ $__t('Product overview') }}
|
||||
<span class="float-left">{{ $__t('Product overview') }}</span>
|
||||
<a id="productcard-product-edit-button"
|
||||
class="btn btn-sm btn-outline-info py-0 float-right disabled"
|
||||
href="#"
|
||||
@@ -14,14 +14,14 @@
|
||||
<i class="fas fa-edit"></i>
|
||||
</a>
|
||||
<a id="productcard-product-journal-button"
|
||||
class="btn btn-sm btn-outline-secondary py-0 mr-2 float-right disabled show-as-dialog-link"
|
||||
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
|
||||
href="#"
|
||||
data-toggle="tooltip"
|
||||
title="{{ $__t('Stock journal for this product') }}">
|
||||
<i class="fas fa-file-alt"></i>
|
||||
</a>
|
||||
<a id="productcard-product-stock-button"
|
||||
class="btn btn-sm btn-outline-info py-0 float-right disabled"
|
||||
class="btn btn-sm btn-outline-info py-0 mr-1 float-right disabled show-as-dialog-link"
|
||||
href="#"
|
||||
data-toggle="tooltip"
|
||||
title="{{ $__t('Stock entries for this product') }}">
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
||||
<div class="title-related-links">
|
||||
<h2 class="title">@yield('title')</h2>
|
||||
<button class="btn btn-outline-dark d-md-none mt-2 float-right order-1 order-md-3"
|
||||
<button class="btn btn-outline-dark d-md-none mt-2 float-right order-1 order-md-3 hide-when-embedded"
|
||||
type="button"
|
||||
data-toggle="collapse"
|
||||
data-target="#related-links">
|
||||
@@ -40,7 +40,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<form id="consume-form"
|
||||
novalidate>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
||||
<h2 class="title">@yield('title')</h2>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<form id="inventory-form"
|
||||
novalidate>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="col-lg-6 offset-lg-3 col-xs-12">
|
||||
<h2 class="text-center">@yield('title')</h2>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<form method="post"
|
||||
action="{{ $U('/login') }}"
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
@@ -375,8 +375,6 @@
|
||||
'entity' => 'products'
|
||||
))
|
||||
|
||||
<button id="save-product-button-continue"
|
||||
class="btn btn-success mb-2">{{ $__t('Save & continue') }}</button>
|
||||
<button id="save-product-button"
|
||||
class="btn btn-info mb-2">{{ $__t('Save') }}</button>
|
||||
</form>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<div class="col-xs-12 col-md-6 col-xl-4">
|
||||
<div class="title-related-links">
|
||||
<h2 class="title">@yield('title')</h2>
|
||||
<button class="btn btn-outline-dark d-md-none mt-2 float-right order-1 order-md-3"
|
||||
<button class="btn btn-outline-dark d-md-none mt-2 float-right order-1 order-md-3 hide-when-embedded"
|
||||
type="button"
|
||||
data-toggle="collapse"
|
||||
data-target="#related-links">
|
||||
@@ -40,7 +40,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<form id="purchase-form"
|
||||
novalidate>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-7 pb-3">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6 col-xl-5 pb-3">
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -27,11 +27,28 @@
|
||||
@section('content')
|
||||
<div class="row d-print-none hide-on-fullscreen-card">
|
||||
<div class="col">
|
||||
<div class="row">
|
||||
<h2 class="col-sm-12 col-md-6 mb-2 title">@yield('title')</h2>
|
||||
<div class="title-related-links">
|
||||
<h2 class="title mr-2 order-0">
|
||||
@yield('title')
|
||||
</h2>
|
||||
@if(GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS)
|
||||
<div class="col-sm-12 col-md-6 d-flex align-items-end flex-wrap">
|
||||
<div class="d-inline-block flex-grow-1 pr-1 mb-1">
|
||||
<div class="float-right">
|
||||
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
|
||||
type="button"
|
||||
data-toggle="collapse"
|
||||
data-target="#table-filter-row">
|
||||
<i class="fas fa-filter"></i>
|
||||
</button>
|
||||
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
|
||||
type="button"
|
||||
data-toggle="collapse"
|
||||
data-target="#related-links">
|
||||
<i class="fas fa-ellipsis-v"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div class="related-links collapse d-md-flex order-2 width-xs-sm-100"
|
||||
id="related-links">
|
||||
<div class="my-auto float-right">
|
||||
<select class="form-control form-control-sm"
|
||||
id="selected-shopping-list">
|
||||
@foreach($shoppingLists as $shoppingList)
|
||||
@@ -39,43 +56,45 @@
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="d-inline-block mb-1">
|
||||
<a class="btn btn-outline-dark btn-sm responsive-button show-as-dialog-link"
|
||||
href="{{ $U('/shoppinglist/new?embedded') }}">
|
||||
{{ $__t('New shopping list') }}
|
||||
</a>
|
||||
<a class="btn btn-outline-dark btn-sm responsive-button show-as-dialog-link @if($selectedShoppingListId == 1) disabled @endif"
|
||||
href="{{ $U('/shoppinglist/' . $selectedShoppingListId . '?embedded') }}">
|
||||
{{ $__t('Edit shopping list') }}
|
||||
</a>
|
||||
<a id="delete-selected-shopping-list"
|
||||
class="btn btn-outline-danger btn-sm responsive-button @if($selectedShoppingListId == 1) disabled @endif"
|
||||
href="#">
|
||||
{{ $__t('Delete shopping list') }}
|
||||
</a>
|
||||
<a id="print-shopping-list-button"
|
||||
class="btn btn-outline-dark btn-sm responsive-button"
|
||||
href="#">
|
||||
{{ $__t('Print') }}
|
||||
</a>
|
||||
<a id="shopping-list-compact-view-button"
|
||||
class="btn btn-outline-dark btn-sm responsive-button switch-view-mode-button"
|
||||
href="#">
|
||||
{{ $__t('Compact view') }}
|
||||
</a>
|
||||
</div>
|
||||
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
|
||||
href="{{ $U('/shoppinglist/new?embedded') }}">
|
||||
{{ $__t('New shopping list') }}
|
||||
</a>
|
||||
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link @if($selectedShoppingListId == 1) disabled @endif"
|
||||
href="{{ $U('/shoppinglist/' . $selectedShoppingListId . '?embedded') }}">
|
||||
{{ $__t('Edit shopping list') }}
|
||||
</a>
|
||||
<a id="delete-selected-shopping-list"
|
||||
class="btn btn-outline-danger responsive-button m-1 mt-md-0 mb-md-0 float-right @if($selectedShoppingListId == 1) disabled @endif"
|
||||
href="#">
|
||||
{{ $__t('Delete shopping list') }}
|
||||
</a>
|
||||
<a id="print-shopping-list-button"
|
||||
class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right"
|
||||
href="#">
|
||||
{{ $__t('Print') }}
|
||||
</a>
|
||||
</div>
|
||||
@else
|
||||
<div class="float-right">
|
||||
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
|
||||
type="button"
|
||||
data-toggle="collapse"
|
||||
data-target="#table-filter-row">
|
||||
<i class="fas fa-filter"></i>
|
||||
</button>
|
||||
</div>
|
||||
<input type="hidden"
|
||||
name="selected-shopping-list"
|
||||
id="selected-shopping-list"
|
||||
value="1">
|
||||
@endif
|
||||
</div>
|
||||
<div class="border-top border-bottom my-2 py-1">
|
||||
<div id="related-links"
|
||||
class="border-top border-bottom my-2 py-1 collapse">
|
||||
<div data-status-filter="belowminstockamount"
|
||||
class="normal-message status-filter-message responsive-button @if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif">{{ $__n(count($missingProducts), '%s product is below defined min. stock amount', '%s products are below defined min. stock amount') }}</div>
|
||||
<div class="float-right">
|
||||
class="normal-message status-filter-message responsive-button @if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif"><span class="d-block d-md-none">{{count($missingProducts)}} <i class="fas fa-exclamation-circle"></i></span><span class="d-none d-md-block">{{ $__n(count($missingProducts), '%s product is below defined min. stock amount', '%s products are below defined min. stock amount') }}</span></div>
|
||||
<div class="float-right mt-2">
|
||||
<a class="btn btn-primary responsive-button btn-sm mb-1 show-as-dialog-link"
|
||||
href="{{ $U('/shoppinglistitem/new?embedded&list=' . $selectedShoppingListId) }}">
|
||||
{{ $__t('Add item') }}
|
||||
@@ -105,7 +124,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row d-print-none hide-on-fullscreen-card">
|
||||
<div class="row collapse d-md-flex d-print-none hide-on-fullscreen-card"
|
||||
id="table-filter-row">
|
||||
<div class="col-xs-12 col-md-5">
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
@@ -27,17 +27,6 @@
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label for="shopping-list-disable-auto-compact-view-on-mobile">
|
||||
<input type="checkbox"
|
||||
class="user-setting-control"
|
||||
id="shopping-list-disable-auto-compact-view-on-mobile"
|
||||
name="shopping-list-disable-auto-compact-view-on-mobile"
|
||||
data-setting-key="shopping_list_disable_auto_compact_view_on_mobile"> {{ $__t('Don\'t automatically switch to the compact view on mobile devices') }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-2">{{ $__t('Shopping list to stock workflow') }}</h4>
|
||||
<div class="form-group">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6 col-xl-3">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
|
||||
@@ -62,14 +62,14 @@
|
||||
data-status-filter="belowminstockamount"
|
||||
class="normal-message status-filter-message responsive-button"></div>
|
||||
<div class="float-right">
|
||||
<a class="btn btn-sm btn-outline-info d-md-none"
|
||||
<a class="btn btn-sm btn-outline-info d-md-none mt-2"
|
||||
data-toggle="collapse"
|
||||
href="#table-filter-row"
|
||||
role="button">
|
||||
<i class="fas fa-filter"></i>
|
||||
</a>
|
||||
<a id="clear-filter-button"
|
||||
class="btn btn-sm btn-outline-info"
|
||||
class="btn btn-sm btn-outline-info mt-2"
|
||||
href="#">
|
||||
{{ $__t('Clear filter') }}
|
||||
</a>
|
||||
@@ -255,20 +255,20 @@
|
||||
href="#">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-info"></i></span> <span class="dropdown-item-text">{{ $__t('Show product details') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item"
|
||||
<a class="dropdown-item show-as-dialog-link"
|
||||
type="button"
|
||||
href="{{ $U('/stockentries?product=') }}{{ $currentStockEntry->product_id }}"
|
||||
href="{{ $U('/stockentries?embedded&product=') }}{{ $currentStockEntry->product_id }}"
|
||||
data-product-id="{{ $currentStockEntry->product_id }}">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-boxes"></i></span> <span class="dropdown-item-text">{{ $__t('Show stock entries') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item"
|
||||
<a class="dropdown-item show-as-dialog-link"
|
||||
type="button"
|
||||
href="{{ $U('/stockjournal?product=') }}{{ $currentStockEntry->product_id }}">
|
||||
href="{{ $U('/stockjournal?embedded&product=') }}{{ $currentStockEntry->product_id }}">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-file-alt"></i></span> <span class="dropdown-item-text">{{ $__t('Stock journal for this product') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item"
|
||||
<a class="dropdown-item show-as-dialog-link"
|
||||
type="button"
|
||||
href="{{ $U('/stockjournal/summary?product_id=') }}{{ $currentStockEntry->product_id }}">
|
||||
href="{{ $U('/stockjournal/summary?embedded&product_id=') }}{{ $currentStockEntry->product_id }}">
|
||||
<span class="dropdown-item-icon"><i class="fas fa-file-archive"></i></span> <span class="dropdown-item-text">{{ $__t('Journal summary for this product') }}</span>
|
||||
</a>
|
||||
<a class="dropdown-item permission-MASTER_DATA_EDIT"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
@@ -67,6 +67,17 @@
|
||||
'additionalCssClasses' => 'user-setting-control'
|
||||
))
|
||||
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label for="show_icon_on_stock_overview_page_when_product_is_on_shopping_list">
|
||||
<input type="checkbox"
|
||||
class="user-setting-control"
|
||||
id="show_icon_on_stock_overview_page_when_product_is_on_shopping_list"
|
||||
data-setting-key="show_icon_on_stock_overview_page_when_product_is_on_shopping_list"> {{ $__t('Show an icon if the product is already on the shopping list') }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-2">{{ $__t('Purchase') }}</h4>
|
||||
@include('components.numberpicker', array(
|
||||
'id' => 'stock_default_purchase_amount',
|
||||
@@ -78,6 +89,17 @@
|
||||
'additionalCssClasses' => 'user-setting-control'
|
||||
))
|
||||
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label for="show_purchased_date_on_purchase">
|
||||
<input type="checkbox"
|
||||
class="user-setting-control"
|
||||
id="show_purchased_date_on_purchase"
|
||||
data-setting-key="show_purchased_date_on_purchase"> {{ $__t('Show purchased date on purchase and inventory page (otherwise the purchased date defaults to today)') }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-2">{{ $__t('Consume') }}</h4>
|
||||
@include('components.numberpicker', array(
|
||||
'id' => 'stock_default_consume_amount',
|
||||
@@ -111,25 +133,6 @@
|
||||
'additionalCssClasses' => 'user-setting-control'
|
||||
))
|
||||
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label for="show_icon_on_stock_overview_page_when_product_is_on_shopping_list">
|
||||
<input type="checkbox"
|
||||
class="user-setting-control"
|
||||
id="show_icon_on_stock_overview_page_when_product_is_on_shopping_list"
|
||||
data-setting-key="show_icon_on_stock_overview_page_when_product_is_on_shopping_list"> {{ $__t('Show an icon if the product is already on the shopping list') }}
|
||||
</label>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label for="show_purchased_date_on_purchase">
|
||||
<input type="checkbox"
|
||||
class="user-setting-control"
|
||||
id="show_purchased_date_on_purchase"
|
||||
data-setting-key="show_purchased_date_on_purchase"> {{ $__t('Show purchased date on purchase and inventory page (otherwise the purchased date defaults to today)') }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a href="{{ $U('/stockoverview') }}"
|
||||
class="btn btn-success">{{ $__t('OK') }}</a>
|
||||
</div>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
</button>
|
||||
<div class="related-links collapse d-md-flex order-2 width-xs-sm-100 m-1 mt-md-0 mb-md-0 float-right"
|
||||
id="related-links">
|
||||
<a class="btn btn-primary responsive-button"
|
||||
href="{{ $U('/task/new') }}">
|
||||
<a class="btn btn-primary responsive-button show-as-dialog-link"
|
||||
href="{{ $U('/task/new?embedded') }}">
|
||||
{{ $__t('Add') }}
|
||||
</a>
|
||||
</div>
|
||||
@@ -44,14 +44,14 @@
|
||||
data-status-filter="overdue"
|
||||
class="error-message status-filter-message responsive-button"></div>
|
||||
<div class="float-right">
|
||||
<a class="btn btn-sm btn-outline-info d-md-none"
|
||||
<a class="btn btn-sm btn-outline-info d-md-none mt-2"
|
||||
data-toggle="collapse"
|
||||
href="#table-filter-row"
|
||||
role="button">
|
||||
<i class="fas fa-filter"></i>
|
||||
</a>
|
||||
<a id="clear-filter-button"
|
||||
class="btn btn-sm btn-outline-info"
|
||||
class="btn btn-sm btn-outline-info mt-2"
|
||||
href="#">
|
||||
{{ $__t('Clear filter') }}
|
||||
</a>
|
||||
@@ -152,8 +152,8 @@
|
||||
data-task-name="{{ $task->name }}">
|
||||
<i class="fas fa-trash"></i>
|
||||
</a>
|
||||
<a class="btn btn-info btn-sm"
|
||||
href="{{ $U('/task/') }}{{ $task->id }}">
|
||||
<a class="btn btn-info btn-sm show-as-dialog-link"
|
||||
href="{{ $U('/task/') }}{{ $task->id }}?embedded">
|
||||
<i class="fas fa-edit"></i>
|
||||
</a>
|
||||
</td>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
||||
<h2 class="title">@yield('title')</h2>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<form id="transfer-form"
|
||||
novalidate>
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row collapse d-md-flex"
|
||||
id="table-filter-row">
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="my-2 py-1">
|
||||
<hr class="my-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-xs-12">
|
||||
|
||||
Reference in New Issue
Block a user