Skip to content

A free open source IT asset/license management system

Replace Form:: email_format

Marcus Moore71d622b6ddbd
diff --git a/resources/views/blade/input/email-format-select.blade.php b/resources/views/blade/input/email-format-select.blade.php
new file mode 100644
index 0000000000..fcb750d10c
--- /dev/null
+++ b/resources/views/blade/input/email-format-select.blade.php
@@ -0,0 +1,27 @@
+@php
+ $formats = [
+ 'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),
+ 'firstname' => trans('admin/settings/general.email_formats.first_name_format'),
+ 'lastname' => trans('admin/settings/general.email_formats.last_name_format'),
+ 'filastname' => trans('admin/settings/general.email_formats.filastname_format'),
+ 'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),
+ 'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),
+ 'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'),
+ 'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),
+ 'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),
+ 'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),
+ 'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),
+ 'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),
+ ];
+@endphp
+
+<x-input.select {{ $attributes }}>
+ @foreach($formats as $format => $label)
+ <option
+ value="{{ $format }}"
+ @selected($selected == $format)
+ >
+ {{ $label }}
+ </option>
+ @endforeach
+</x-input.select>
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 43ce9aa1aa..ac3330be73 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -87,7 +87,12 @@
<label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
</div>
<div class="col-md-8">
- {!! Form::email_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
+ <x-input.email-format-select
+ name="email_format"
+ :selected="old('email_format', $setting->email_format)"
+ style="width: 100%"
+ aria-label="email_format"
+ />
{!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>