kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-15 10:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Fixed contextual time ago display was missing (references #513)

Browse Source
This commit is contained in:
Bernd Bestel
2020-02-02 17:55:35 +01:00
parent 9e519e0841
commit b9e32a9795
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/56_UNRELEASED_2020-xx-xx.md
View File

@@ -14,3 +14,4 @@
### General & other improvements/fixes ### General & other improvements/fixes
- Optimized the top navbar height to waste less space - Optimized the top navbar height to waste less space
- Fixed that the "contextual time ago" of date/time pickers was not displayed

2
public/viewjs/components/datetimepicker.js
View File

@@ -268,7 +268,7 @@ Grocy.Components.DateTimePicker.GetInputElement().on('input', function(e)
{ {
$('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker.GetValue()); $('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker.GetValue());
EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan')); EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan'));
RefreshContextualTimeago(".datetimepicker"); RefreshContextualTimeago("#datetimepicker-wrapper");
}); });
$('.datetimepicker').on('update.datetimepicker', function(e) $('.datetimepicker').on('update.datetimepicker', function(e)

2
public/viewjs/components/datetimepicker2.js
View File

@@ -268,7 +268,7 @@ Grocy.Components.DateTimePicker2.GetInputElement().on('input', function(e)
{ {
$('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue()); $('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue());
EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan')); EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan'));
RefreshContextualTimeago(".datetimepicker2"); RefreshContextualTimeago("#datetimepicker2-wrapper");
}); });
$('.datetimepicker2').on('update.datetimepicker', function(e) $('.datetimepicker2').on('update.datetimepicker', function(e)

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

@@ -15,7 +15,7 @@
@php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
@php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
<div class="form-group {{ $additionalGroupCssClasses }}"> <div id="datetimepicker-wrapper" class="form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $__t($label) }} <label for="{{ $id }}">{{ $__t($label) }}
<span class="small text-muted"> <span class="small text-muted">
@if(!empty($hint)){{ $__t($hint) }}@endif @if(!empty($hint)){{ $__t($hint) }}@endif

2
views/components/datetimepicker2.blade.php
View File

@@ -15,7 +15,7 @@
@php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
@php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
<div class="form-group {{ $additionalGroupCssClasses }}"> <div id="datetimepicker2-wrapper" class="form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $__t($label) }} <label for="{{ $id }}">{{ $__t($label) }}
<span class="small text-muted"> <span class="small text-muted">
@if(!empty($hint)){{ $__t($hint) }}@endif @if(!empty($hint)){{ $__t($hint) }}@endif