kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Fixed the rest of the broken stuff after the dependency upgrade party

Browse Source
This commit is contained in:
Bernd Bestel
2018-07-12 19:12:31 +02:00
parent 778191fd11
commit 37d1377f99
27 changed files with 271 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
views/components/datepicker.blade.php
View File

@@ -1,14 +0,0 @@
@push('componentScripts')
<script src="{{ $U('/viewjs/components/datepicker.js', true) }}?v={{ $version }}"></script>
@endpush
<div class="form-group">
<label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span class="small text-muted"><time id="datepicker-timeago" class="timeago timeago-contextual"></time>@if(!empty($hint))<br>{{ $L($hint) }}@endif</span></label>
<div class="input-group date">
<input type="text" data-isodate="isodate" class="form-control datepicker" id="{{ $id }}" name="{{ $id }}" required autocomplete="off" min="2018-07-11">
<div id="datepicker-button" class="input-group-append">
<div class="input-group-text"><i class="fas fa-calendar"></i></div>
</div>
</div>
<div class="invalid-feedback"></div>
</div>

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

@@ -3,12 +3,17 @@
@endpush
<div class="form-group">
<label>{{ $L($label) }}</label>
<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>
<div class="input-group date datetimepicker" id="{{ $id }}" data-target-input="nearest">
<input type="text" class="form-control datetimepicker-input" data-target="#{{ $id }}"/>
<input type="text" required class="form-control datetimepicker-input"
data-target="#{{ $id }}" data-format="{{ $format }}"
data-init-with-now="{{ BoolToString($initWithNow) }}"
data-limit-end-to-now="{{ BoolToString($limitEndToNow) }}"
data-limit-start-to-now="{{ BoolToString($limitStartToNow) }}"
data-next-input-selector="{{ $nextInputSelector }}" />
<div class="input-group-append" data-target="#{{ $id }}" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fas fa-calendar"></i></div>
</div>
<div class="invalid-feedback">{{ $invalidFeedback }}</div>
</div>
<div class="invalid-feedback"></div>
</div>