A free open source IT asset/license management system
Updated datetime pickers to specify side by side or not
snipeaa0584e64cea
diff --git a/resources/views/blade/input/datepicker.blade.php b/resources/views/blade/input/datepicker.blade.phpindex b702e9c709..6f46d07b00 100644--- a/resources/views/blade/input/datepicker.blade.php+++ b/resources/views/blade/input/datepicker.blade.php@@ -3,12 +3,20 @@'required' => '','end_date' => null,'col_size_class' => null,+ 'placeholder' => trans('general.select_date'),])-<!-- Datepicker --><div class="input-group date {{ $col_size_class }}"- data-provide="datepicker" data-date-today-highlight="true" data-date-language="{{ auth()->user()->locale }}" data-date-locale="{{ auth()->user()->locale }}" data-date-format="yyyy-mm-dd" data-date-autoclose="true" data-date-clear-btn="true" data-date-today-btn="linked" {{ $end_date ? ' data-date-end-date=' . $end_date : '' }}>- <input type="text" placeholder="{{ trans('general.select_date') }}" value="{{ $value }}" maxlength="10" {{ $attributes->merge(['class' => 'form-control']) }} {{ $required=='1' ? 'required' : '' }}>+ data-provide="datetimepicker"+ data-format="YYYY-MM-DD"+ data-locale="{{ auth()->user()?->locale ?? 'en' }}"+ data-default-now="false"+ @if ($end_date) data-max-date="{{ $end_date === '0d' ? 'today' : $end_date }}" @endif>+ <input type="text"+ placeholder="{{ $placeholder }}"+ value="{{ $value }}"+ maxlength="10"+ {{ $attributes->merge(['class' => 'form-control']) }}+ {{ $required == '1' ? 'required' : '' }}><span class="input-group-addon"><x-icon type="calendar" /></span>-</div>\ No newline at end of filediff --git a/resources/views/blade/input/datetimepicker.blade.php b/resources/views/blade/input/datetimepicker.blade.phpindex 6a73cd004e..024ea4f6b5 100644--- a/resources/views/blade/input/datetimepicker.blade.php+++ b/resources/views/blade/input/datetimepicker.blade.php@@ -4,11 +4,8 @@'format' => 'YYYY-MM-DD HH:mm:ss','placeholder' => trans('general.select_datetime'),'col_size_class' => null,- // Whether an empty picker should auto-populate to the user's current- // local datetime on open. Callers that render a picker where "now" is- // not a safe default (user-defined custom fields, for example) can pass- // :default_now="false" to opt out.'default_now' => true,+ 'side_by_side' => false,])<!-- Datetimepicker (eonasdan-bootstrap-datetimepicker) -->@@ -16,7 +13,8 @@data-provide="datetimepicker"data-format="{{ $format }}"data-locale="{{ auth()->user()?->locale ?? 'en' }}"- data-default-now="{{ $default_now ? 'true' : 'false' }}">+ data-default-now="{{ $default_now ? 'true' : 'false' }}"+ data-side-by-side="{{ $side_by_side ? 'true' : 'false' }}"><input type="text"placeholder="{{ $placeholder }}"value="{{ $value }}"