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

Only changed default width of datetimepicker for date-only inputs, as this does not work for side-by-side with time picker (references #14)

Browse Source
This commit is contained in:
Bernd Bestel 2018-07-14 08:38:03 +02:00
parent 31ce7a13ea
commit 594e77ca41
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/grocy.css
View File

@ -158,6 +158,6 @@ td {
} }
/* Third party component customizations - Tempus Dominus */ /* Third party component customizations - Tempus Dominus */
.bootstrap-datetimepicker-widget.dropdown-menu { .date-only-datetimepicker .bootstrap-datetimepicker-widget.dropdown-menu {
width: auto !important; width: auto !important;
} }

4
views/components/datetimepicker.blade.php
View File

@ -3,8 +3,8 @@
@endpush @endpush
<div class="form-group"> <div class="form-group">
<label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span class="small text-muted"><time id="datetimepicker-timeago" class="timeago timeago-contextual"></time>@if(!empty($hint))<br>{{ $L($hint) }}@endif</span></label> <label for="{{ $id }}">{{ $L($label) }} <span class="small text-muted"><time id="datetimepicker-timeago" class="timeago timeago-contextual"></time>@if(!empty($hint))<br>{{ $L($hint) }}@endif</span></label>
<div class="input-group date datetimepicker" id="{{ $id }}" data-target-input="nearest"> <div class="input-group date datetimepicker @if(!empty($additionalCssClasses)){{ $additionalCssClasses }}@endif" id="{{ $id }}" data-target-input="nearest">
<input type="text" required class="form-control datetimepicker-input" <input type="text" required class="form-control datetimepicker-input"
data-target="#{{ $id }}" data-format="{{ $format }}" data-target="#{{ $id }}" data-format="{{ $format }}"
data-init-with-now="{{ BoolToString($initWithNow) }}" data-init-with-now="{{ BoolToString($initWithNow) }}"

3
views/inventory.blade.php
View File

@ -39,7 +39,8 @@
'limitEndToNow' => false, 'limitEndToNow' => false,
'limitStartToNow' => true, 'limitStartToNow' => true,
'invalidFeedback' => $L('A best before date is required and must be later than today'), 'invalidFeedback' => $L('A best before date is required and must be later than today'),
'nextInputSelector' => '#best_before_date' 'nextInputSelector' => '#best_before_date',
'additionalCssClasses' => 'date-only-datetimepicker'
)) ))
<button id="save-inventory-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button> <button id="save-inventory-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>

3
views/purchase.blade.php
View File

@ -31,7 +31,8 @@
'limitEndToNow' => false, 'limitEndToNow' => false,
'limitStartToNow' => true, 'limitStartToNow' => true,
'invalidFeedback' => $L('A best before date is required and must be later than today'), 'invalidFeedback' => $L('A best before date is required and must be later than today'),
'nextInputSelector' => '#amount' 'nextInputSelector' => '#amount',
'additionalCssClasses' => 'date-only-datetimepicker'
)) ))
<div class="form-group"> <div class="form-group">