DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Hide icons in error messages

Browse source
This commit is contained in:
snipe 2020-04-01 03:21:15 -07:00
parent 4dcc1ffdbc
commit 9ab3370be5
92 changed files with 399 additions and 384 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/macros/macros.php
View file

@ -380,7 +380,7 @@ Form::macro('date_display_format', function ($name = "date_display_format", $sel
$date_display_formats[$format] = Carbon::parse(date('Y').'-'.date('m').'-25')->format($format); $date_display_formats[$format] = Carbon::parse(date('Y').'-'.date('m').'-25')->format($format);
} }
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:250px">'; $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:250px" aria-label="'.$name.'">';
foreach ($date_display_formats as $format => $date_display_format) { foreach ($date_display_formats as $format => $date_display_format) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$date_display_format.'</option> '; $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$date_display_format.'</option> ';
} }
@ -402,7 +402,7 @@ Form::macro('time_display_format', function ($name = "time_display_format", $sel
foreach ($formats as $format) { foreach ($formats as $format) {
$time_display_formats[$format] = Carbon::now()->format($format); $time_display_formats[$format] = Carbon::now()->format($format);
} }
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:150px">'; $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:150px" aria-label="'.$name.'">';
foreach ($time_display_formats as $format => $time_display_format) { foreach ($time_display_formats as $format => $time_display_format) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$time_display_format.'</option> '; $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$time_display_format.'</option> ';
} }
@ -426,7 +426,7 @@ Form::macro('alt_barcode_types', function ($name = "alt_barcode", $selected = nu
); );
$select = '<select name="'.$name.'" class="'.$class.'">'; $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
foreach ($barcode_types as $barcode_type) { foreach ($barcode_types as $barcode_type) {
$select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected"' : '').'>'.$barcode_type.'</option> '; $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected"' : '').'>'.$barcode_type.'</option> ';
} }
@ -450,7 +450,7 @@ Form::macro('barcode_types', function ($name = "barcode_type", $selected = null,
); );
$select = '<select name="'.$name.'" class="'.$class.'">'; $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
foreach ($barcode_types as $barcode_type) { foreach ($barcode_types as $barcode_type) {
$select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected"' : '').'>'.$barcode_type.'</option> '; $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected"' : '').'>'.$barcode_type.'</option> ';
} }
@ -472,7 +472,7 @@ Form::macro('username_format', function ($name = "username_format", $selected =
); );
$select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%">'; $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
foreach ($formats as $format => $label) { foreach ($formats as $format => $label) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n"; $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
} }
@ -492,7 +492,7 @@ Form::macro('two_factor_options', function ($name = "two_factor_enabled", $selec
); );
$select = '<select name="'.$name.'" class="'.$class.'">'; $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
foreach ($formats as $format => $label) { foreach ($formats as $format => $label) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n"; $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
} }
@ -547,7 +547,7 @@ Form::macro('skin', function ($name = "skin", $selected = null, $class = null) {
'contrast' => 'High Contrast', 'contrast' => 'High Contrast',
); );
$select = '<select name="'.$name.'" class="'.$class.'" style="width: 250px">'; $select = '<select name="'.$name.'" class="'.$class.'" style="width: 250px" aria-label="'.$name.'">';
foreach ($formats as $format => $label) { foreach ($formats as $format => $label) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n"; $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
} }

2
resources/views/accessories/checkin.blade.php
View file

@ -51,7 +51,7 @@
<label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $accessory->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $accessory->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>

2
resources/views/accessories/checkout.blade.php
View file

@ -84,7 +84,7 @@
<label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $accessory->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $accessory->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>

2
resources/views/accessories/edit.blade.php
View file

@ -30,7 +30,7 @@
<div class="col-md-5"> <div class="col-md-5">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/accessories/{{ $item->image }}" alt="{{ $item->name }}"> <img src="{{ url('/') }}/uploads/accessories/{{ $item->image }}" alt="{{ $item->name }}">
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

6
resources/views/account/change-password.blade.php
View file

@ -24,7 +24,7 @@
</label> </label>
<div class="col-md-5 required"> <div class="col-md-5 required">
<input class="form-control" type="password" name="current_password" id="current_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}> <input class="form-control" type="password" name="current_password" id="current_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
{!! $errors->first('current_password', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('current_password', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -32,7 +32,7 @@
<label for="password" class="col-md-3 control-label">New Password</label> <label for="password" class="col-md-3 control-label">New Password</label>
<div class="col-md-5 required"> <div class="col-md-5 required">
<input class="form-control" type="password" name="password" id="password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}> <input class="form-control" type="password" name="password" id="password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
{!! $errors->first('password', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -41,7 +41,7 @@
<label for="password_confirm" class="col-md-3 control-label">New Password</label> <label for="password_confirm" class="col-md-3 control-label">New Password</label>
<div class="col-md-5 required"> <div class="col-md-5 required">
<input class="form-control" type="password" name="password_confirmation" id="password_confirmation" {{ (config('app.lock_passwords') ? ' disabled' : '') }}> <input class="form-control" type="password" name="password_confirmation" id="password_confirmation" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
{!! $errors->first('password_confirmation', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
<p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p> <p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p>
@endif @endif

16
resources/views/account/profile.blade.php
View file

@ -21,7 +21,7 @@
</label> </label>
<div class="col-md-8 required"> <div class="col-md-8 required">
<input class="form-control" type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" /> <input class="form-control" type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" />
{!! $errors->first('first_name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -32,7 +32,7 @@
</label> </label>
<div class="col-md-8 required"> <div class="col-md-8 required">
<input class="form-control" type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" /> <input class="form-control" type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" />
{!! $errors->first('last_name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -50,7 +50,7 @@
@if (!config('app.lock_passwords')) @if (!config('app.lock_passwords'))
{!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@else @else
<p class="help-block">{{ trans('general.feature_disabled') }}</p> <p class="help-block">{{ trans('general.feature_disabled') }}</p>
@endif @endif
@ -63,7 +63,7 @@
<label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label> <label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control" type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" /> <input class="form-control" type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" />
{!! $errors->first('phone', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('phone', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -74,7 +74,7 @@
<label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label> <label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label>
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" type="text" name="website" id="website" value="{{ Input::old('website', $user->website) }}" /> <input class="form-control" type="text" name="website" id="website" value="{{ Input::old('website', $user->website) }}" />
{!! $errors->first('website', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('website', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -85,7 +85,7 @@
</label> </label>
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" type="text" name="gravatar" id="gravatar" value="{{ Input::old('gravatar', $user->gravatar) }}" /> <input class="form-control" type="text" name="gravatar" id="gravatar" value="{{ Input::old('gravatar', $user->gravatar) }}" />
{!! $errors->first('gravatar', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('gravatar', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
<p> <p>
<img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" alt="{{ $user->present()->fullName() }} avatar image"> <img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" alt="{{ $user->present()->fullName() }} avatar image">
<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>. <a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.
@ -100,7 +100,7 @@
<div class="col-md-8"> <div class="col-md-8">
{{ Form::checkbox('avatar_delete') }} {{ Form::checkbox('avatar_delete') }}
<img src="{{ url('/') }}/uploads/avatars/{{ $user->avatar }}" class="avatar img-circle" alt="{{ $user->present()->fullName() }} avatar image"> <img src="{{ url('/') }}/uploads/avatars/{{ $user->avatar }}" class="avatar img-circle" alt="{{ $user->present()->fullName() }} avatar image">
{!! $errors->first('avatar_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('avatar_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif
@ -113,7 +113,7 @@
<input type="file" name="avatar" accept="image/gif,image/jpeg,image/png,image/svg" hidden> <input type="file" name="avatar" accept="image/gif,image/jpeg,image/png,image/svg" hidden>
</label> </label>
<p class="help-block">{{ trans('general.image_filetypes_help') }}</p> <p class="help-block">{{ trans('general.image_filetypes_help') }}</p>
{!! $errors->first('avatar', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('avatar', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>

10
resources/views/asset_maintenances/edit.blade.php
View file

@ -52,7 +52,7 @@
</label> </label>
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'title')) ? ' required' : '' }}"> <div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'title')) ? ' required' : '' }}">
<input class="form-control" type="text" name="title" id="title" value="{{ Input::old('title', $item->title) }}" /> <input class="form-control" type="text" name="title" id="title" value="{{ Input::old('title', $item->title) }}" />
{!! $errors->first('title', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('title', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -65,7 +65,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="start_date" id="start_date" value="{{ Input::old('start_date', $item->start_date) }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="start_date" id="start_date" value="{{ Input::old('start_date', $item->start_date) }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('start_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('start_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -80,7 +80,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="completion_date" id="completion_date" value="{{ Input::old('completion_date', $item->completion_date) }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="completion_date" id="completion_date" value="{{ Input::old('completion_date', $item->completion_date) }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('completion_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('completion_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -108,7 +108,7 @@
@endif @endif
</span> </span>
<input class="col-md-2 form-control" type="text" name="cost" id="cost" value="{{ Input::old('cost', \App\Helpers\Helper::formatCurrencyOutput($item->cost)) }}" /> <input class="col-md-2 form-control" type="text" name="cost" id="cost" value="{{ Input::old('cost', \App\Helpers\Helper::formatCurrencyOutput($item->cost)) }}" />
{!! $errors->first('cost', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('cost', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>
@ -118,7 +118,7 @@
<label for="notes" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.notes') }}</label> <label for="notes" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.notes') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<textarea class="col-md-6 form-control" id="notes" name="notes">{{ Input::old('notes', $item->notes) }}</textarea> <textarea class="col-md-6 form-control" id="notes" name="notes">{{ Input::old('notes', $item->notes) }}</textarea>
{!! $errors->first('notes', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> <!-- .box-body --> </div> <!-- .box-body -->

4
resources/views/auth/login.blade.php
View file

@ -45,12 +45,12 @@
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<label for="username">{{ trans('admin/users/table.username') }}</label> <label for="username">{{ trans('admin/users/table.username') }}</label>
<input class="form-control" placeholder="{{ trans('admin/users/table.username') }}" name="username" type="text" id="username" autocomplete="off" autofocus> <input class="form-control" placeholder="{{ trans('admin/users/table.username') }}" name="username" type="text" id="username" autocomplete="off" autofocus>
{!! $errors->first('username', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label for="password">{{ trans('admin/users/table.password') }}</label> <label for="password">{{ trans('admin/users/table.password') }}</label>
<input class="form-control" placeholder="{{ trans('admin/users/table.password') }}" name="password" type="password" id="password" autocomplete="off"> <input class="form-control" placeholder="{{ trans('admin/users/table.password') }}" name="password" type="password" id="password" autocomplete="off">
{!! $errors->first('password', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>

2
resources/views/auth/passwords/email.blade.php
View file

@ -35,7 +35,7 @@
<div class="col-md-12"> <div class="col-md-12">
<input type="email" class="form-control" name="email" value="{{ old('email') }}" placeholder="{{ trans('admin/users/table.email') }}"> <input type="email" class="form-control" name="email" value="{{ old('email') }}" placeholder="{{ trans('admin/users/table.email') }}">
{!! $errors->first('email', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

6
resources/views/auth/passwords/reset.blade.php
View file

@ -36,7 +36,7 @@
<div class="col-md-6"> <div class="col-md-6">
<input type="email" class="form-control" name="email" maxlength="250" value="{{ $email or old('email') }}"> <input type="email" class="form-control" name="email" maxlength="250" value="{{ $email or old('email') }}">
{!! $errors->first('email', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -46,7 +46,7 @@
<div class="col-md-6"> <div class="col-md-6">
<input type="password" class="form-control" name="password"> <input type="password" class="form-control" name="password">
{!! $errors->first('password', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -54,7 +54,7 @@
<label class="col-md-4 control-label">{{ trans('admin/users/table.password_confirm') }}</label> <label class="col-md-4 control-label">{{ trans('admin/users/table.password_confirm') }}</label>
<div class="col-md-6"> <div class="col-md-6">
<input type="password" class="form-control" name="password_confirmation"> <input type="password" class="form-control" name="password_confirmation">
{!! $errors->first('password_confirmation', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/auth/two_factor.blade.php
View file

@ -31,7 +31,7 @@
<fieldset> <fieldset>
<div class="form-group{{ $errors->has('secret') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('secret') ? ' has-error' : '' }}">
<input class="form-control" placeholder="{{ trans('admin/settings/general.two_factor_secret') }}" name="two_factor_secret" type="text" autofocus> <input class="form-control" placeholder="{{ trans('admin/settings/general.two_factor_secret') }}" name="two_factor_secret" type="text" autofocus>
{!! $errors->first('two_factor_secret', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('two_factor_secret', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</fieldset> </fieldset>
</div> </div>

2
resources/views/auth/two_factor_enroll.blade.php
View file

@ -41,7 +41,7 @@
<fieldset> <fieldset>
<div class="form-group{{ $errors->has('secret') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('secret') ? ' has-error' : '' }}">
<input class="form-control" placeholder="{{ trans('admin/settings/general.two_factor_secret') }}" name="two_factor_secret" type="text" autofocus> <input class="form-control" placeholder="{{ trans('admin/settings/general.two_factor_secret') }}" name="two_factor_secret" type="text" autofocus>
{!! $errors->first('two_factor_secret', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('two_factor_secret', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</fieldset> </fieldset>
</div> </div>

6
resources/views/categories/edit.blade.php
View file

@ -15,7 +15,7 @@
<label for="category_type" class="col-md-3 control-label">{{ trans('general.type') }}</label> <label for="category_type" class="col-md-3 control-label">{{ trans('general.type') }}</label>
<div class="col-md-7 required"> <div class="col-md-7 required">
{{ Form::select('category_type', $category_types , Input::old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'category_type', $item->itemCount() > 0 ? 'disabled' : '')) }} {{ Form::select('category_type', $category_types , Input::old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'category_type', $item->itemCount() > 0 ? 'disabled' : '')) }}
{!! $errors->first('category_type', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('category_type', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -27,7 +27,7 @@
<p class="help-block">{!! trans('admin/categories/general.eula_text_help') !!} </p> <p class="help-block">{!! trans('admin/categories/general.eula_text_help') !!} </p>
<p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!} </p> <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!} </p>
{!! $errors->first('eula_text', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -87,7 +87,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/categories/{{ $item->image }}" /> <img src="{{ url('/') }}/uploads/categories/{{ $item->image }}" />
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

2
resources/views/companies/edit.blade.php
View file

@ -17,7 +17,7 @@
<div class="col-md-5"> <div class="col-md-5">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/companies/{{ $item->image }}" /> <img src="{{ url('/') }}/uploads/companies/{{ $item->image }}" />
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

4
resources/views/components/checkin.blade.php
View file

@ -43,7 +43,7 @@
</div> </div>
<div class="col-md-9 col-md-offset-2"> <div class="col-md-9 col-md-offset-2">
<p class="help-block">Must be {{ $component_assets->assigned_qty }} or less.</p> <p class="help-block">Must be {{ $component_assets->assigned_qty }} or less.</p>
{!! $errors->first('checkin_qty', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> {!! $errors->first('checkin_qty', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i>
:message</span>') !!} :message</span>') !!}
</div> </div>
</div> </div>
@ -53,7 +53,7 @@
<label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $component->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $component->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">

2
resources/views/components/checkout.blade.php
View file

@ -43,7 +43,7 @@
<i class='icon-asterisk'></i></label> <i class='icon-asterisk'></i></label>
<div class="col-md-9"> <div class="col-md-9">
<input class="form-control" type="text" name="assigned_qty" id="assigned_qty" style="width: 70px;" value="{{ Input::old('assigned_qty') }}" /> <input class="form-control" type="text" name="assigned_qty" id="assigned_qty" style="width: 70px;" value="{{ Input::old('assigned_qty') }}" />
{!! $errors->first('assigned_qty', '<br><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('assigned_qty', '<br><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/components/edit.blade.php
View file

@ -28,7 +28,7 @@
<div class="col-md-5"> <div class="col-md-5">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/components/{{ $item->image }}" /> <img src="{{ url('/') }}/uploads/components/{{ $item->image }}" />
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

2
resources/views/consumables/checkout.blade.php
View file

@ -71,7 +71,7 @@
<label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $consumable->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $consumable->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> <!-- .box-body --> </div> <!-- .box-body -->

2
resources/views/consumables/edit.blade.php
View file

@ -28,7 +28,7 @@
<div class="col-md-5"> <div class="col-md-5">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/consumables/{{ $item->image }}" /> <img src="{{ url('/') }}/uploads/consumables/{{ $item->image }}" />
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

12
resources/views/custom_fields/fields/edit.blade.php
View file

@ -35,7 +35,7 @@
</label> </label>
<div class="col-md-6 required"> <div class="col-md-6 required">
{{ Form::text('name', Input::old('name', $field->name), array('class' => 'form-control', 'aria-label'=>'name')) }} {{ Form::text('name', Input::old('name', $field->name), array('class' => 'form-control', 'aria-label'=>'name')) }}
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -47,7 +47,7 @@
<div class="col-md-6 required"> <div class="col-md-6 required">
{!! Form::customfield_elements('element', Input::old('element', $field->element), 'field_element select2 form-control') !!} {!! Form::customfield_elements('element', Input::old('element', $field->element), 'field_element select2 form-control') !!}
{!! $errors->first('element', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('element', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -59,7 +59,7 @@
</label> </label>
<div class="col-md-6 required"> <div class="col-md-6 required">
{!! Form::textarea('field_values', Input::old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control', 'aria-label'=>'field_values']) !!} {!! Form::textarea('field_values', Input::old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control', 'aria-label'=>'field_values']) !!}
{!! $errors->first('field_values', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('field_values', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
<p class="help-block">{{ trans('admin/custom_fields/general.field_values_help') }}</p> <p class="help-block">{{ trans('admin/custom_fields/general.field_values_help') }}</p>
</div> </div>
</div> </div>
@ -71,7 +71,7 @@
</label> </label>
<div class="col-md-6 required"> <div class="col-md-6 required">
{{ Form::select("format",\App\Helpers\Helper::predefined_formats(), $field->format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }} {{ Form::select("format",\App\Helpers\Helper::predefined_formats(), $field->format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }}
{!! $errors->first('format', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('format', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -85,7 +85,7 @@
{{ Form::text('custom_format', Input::old('custom_format', (($field->format!='') && (stripos($field->format,'regex')===0)) ? $field->format : ''), array('class' => 'form-control', 'id' => 'custom_format','aria-label'=>'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }} {{ Form::text('custom_format', Input::old('custom_format', (($field->format!='') && (stripos($field->format,'regex')===0)) ? $field->format : ''), array('class' => 'form-control', 'id' => 'custom_format','aria-label'=>'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }}
<p class="help-block">{!! trans('admin/custom_fields/general.field_custom_format_help') !!}</p> <p class="help-block">{!! trans('admin/custom_fields/general.field_custom_format_help') !!}</p>
{!! $errors->first('custom_format', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('custom_format', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -98,7 +98,7 @@
<div class="col-md-6"> <div class="col-md-6">
{{ Form::text('help_text', Input::old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }} {{ Form::text('help_text', Input::old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }}
<p class="help-block">This is optional text that will appear below the form elements while editing an asset to provide context on the field.</p> <p class="help-block">This is optional text that will appear below the form elements while editing an asset to provide context on the field.</p>
{!! $errors->first('help_text', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('help_text', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/custom_fields/fieldsets/edit.blade.php
View file

@ -30,7 +30,7 @@
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name') }}" /> <input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name') }}" />
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/departments/edit.blade.php
View file

@ -30,7 +30,7 @@
<div class="col-md-5"> <div class="col-md-5">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/departments/{{ $item->image }}" /> <img src="{{ url('/') }}/uploads/departments/{{ $item->image }}" />
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

2
resources/views/depreciations/edit.blade.php
View file

@ -20,7 +20,7 @@
<input class="form-control" type="text" name="months" id="months" value="{{ Input::old('months', $item->months) }}" style="width: 80px;" /> <input class="form-control" type="text" name="months" id="months" value="{{ Input::old('months', $item->months) }}" style="width: 80px;" />
</div> </div>
</div> </div>
{!! $errors->first('months', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('months', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
@stop @stop

26
resources/views/groups/edit.blade.php
View file

@ -2,7 +2,7 @@
'createText' => trans('admin/groups/titles.create') , 'createText' => trans('admin/groups/titles.create') ,
'updateText' => trans('admin/groups/titles.update'), 'updateText' => trans('admin/groups/titles.update'),
'item' => $group, 'item' => $group,
'formAction' => ($group !== null && $group->id !== null) ? route('groups.update', ['group' => $group->id]) : route('groups.store'), 'formAction' => ($group !== null && $group->id !== null) ? route('groups.index', ['group' => $group->id]) : route('groups.store'),
]) ])
@section('content') @section('content')
@ -61,7 +61,7 @@
<label for="name" class="col-md-3 control-label">{{ trans('admin/groups/titles.group_name') }}</label> <label for="name" class="col-md-3 control-label">{{ trans('admin/groups/titles.group_name') }}</label>
<div class="col-md-6 required"> <div class="col-md-6 required">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $group->name) }}" /> <input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $group->name) }}" />
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -85,13 +85,15 @@
data-toggle="tooltip" data-toggle="tooltip"
data-placement="right" data-placement="right"
title="{{ $localPermission['note'] }}"> title="{{ $localPermission['note'] }}">
<h4>{{ $area . ': ' . $localPermission['label'] }}</h4> <h2>{{ $area . ': ' . $localPermission['label'] }}</h2>
</td> </td>
<td class="col-md-1 permissions-item"> <td class="col-md-1 permissions-item">
{{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'class'=>'minimal']) }} <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">Allow {{ 'permission['.$localPermission['permission'].']' }}</span></label>
{{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
</td> </td>
<td class="col-md-1 permissions-item"> <td class="col-md-1 permissions-item">
{{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'class'=>'minimal']) }} <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">Deny {{ 'permission['.$localPermission['permission'].']' }}</span></label>
{{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
</td> </td>
</tr> </tr>
@ -102,15 +104,17 @@
data-toggle="tooltip" data-toggle="tooltip"
data-placement="right" data-placement="right"
title="{{ $localPermission['note'] }}"> title="{{ $localPermission['note'] }}">
<h4>{{ $area . ': ' . $localPermission['label'] }}</h4> <h2>{{ $area . ': ' . $localPermission['label'] }}</h2>
</td> </td>
<td class="col-md-1 permissions-item" style="vertical-align: bottom"> <td class="col-md-1 permissions-item" style="vertical-align: bottom">
{{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }} <label for="{{ $area }}"><span class="sr-only">Allow {{ $area }}</span></label>
{{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
</td> </td>
<td class="col-md-1 permissions-item"> <td class="col-md-1 permissions-item">
{{ Form::radio("$area", '0',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }} <label for="{{ $area }}"><span class="sr-only">Deny {{ $area }}</span></label>
{{ Form::radio("$area", '0',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
</td> </td>
</tr> </tr>
@ -125,10 +129,12 @@
{{ $this_permission['label'] }} {{ $this_permission['label'] }}
</td> </td>
<td class="col-md-1 permissions-item"> <td class="col-md-1 permissions-item">
{{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'minimal radiochecker-'.str_slug($area)]) }} <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">Allow {{ 'permission['.$this_permission['permission'].']' }}</span></label>
{{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
</td> </td>
<td class="col-md-1 permissions-item"> <td class="col-md-1 permissions-item">
{{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'minimal radiochecker-'.str_slug($area)]) }} <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">Deny {{ 'permission['.$this_permission['permission'].']' }}</span></label>
{{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
</td> </td>
</tr> </tr>

2
resources/views/groups/view.blade.php
View file

@ -52,7 +52,7 @@
@if (is_array($group->decodePermissions())) @if (is_array($group->decodePermissions()))
<ul class="list-unstyled"> <ul class="list-unstyled">
@foreach ($group->decodePermissions() as $permission_name => $permission) @foreach ($group->decodePermissions() as $permission_name => $permission)
<li>{!! ($permission == '1') ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i>' !!} {{ e(str_replace('.', ': ', ucwords($permission_name))) }} </li> <li>{!! ($permission == '1') ? '<i class="fa fa-check text-success" aria-hidden="true"></i><span class="sr-only">GRANTED: </span>' : '<i class="fa fa-times text-danger" aria-hidden="true"></i><span class="sr-only">DENIED: </span>' !!} {{ e(str_replace('.', ': ', ucwords($permission_name))) }} </li>
@endforeach @endforeach
</ul> </ul>

4
resources/views/hardware/audit.blade.php
View file

@ -62,7 +62,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ Input::old('next_audit_date', $next_audit_date) }}"> <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ Input::old('next_audit_date', $next_audit_date) }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('next_audit_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -72,7 +72,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8"> <div class="col-md-8">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $asset->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $asset->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

6
resources/views/hardware/bulk-checkout.blade.php
View file

@ -42,7 +42,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at') }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at') }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('checkout_at', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -54,7 +54,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('expected_checkin', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -64,7 +64,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8"> <div class="col-md-8">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note') }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note') }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

10
resources/views/hardware/bulk.blade.php
View file

@ -34,7 +34,7 @@
<div class="input-group col-md-3"> <div class="input-group col-md-3">
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date') }}"> <input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date') }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
{!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -45,7 +45,7 @@
</label> </label>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id'), array('class'=>'select2', 'style'=>'width:350px')) }} {{ Form::select('status_id', $statuslabel_list , Input::old('status_id'), array('class'=>'select2', 'style'=>'width:350px')) }}
{!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -80,7 +80,7 @@
<div class="input-group col-md-3"> <div class="input-group col-md-3">
<span class="input-group-addon">{{ $snipeSettings->default_currency }}</span> <span class="input-group-addon">{{ $snipeSettings->default_currency }}</span>
<input type="text" class="form-control" placeholder="{{ trans('admin/hardware/form.cost') }}" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost') }}"> <input type="text" class="form-control" placeholder="{{ trans('admin/hardware/form.cost') }}" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost') }}">
{!! $errors->first('purchase_cost', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('purchase_cost', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -96,7 +96,7 @@
</label> </label>
<div class="col-md-7"> <div class="col-md-7">
<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number') }}" /> <input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number') }}" />
{!! $errors->first('order_number', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('order_number', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -109,7 +109,7 @@
<div class="input-group"> <div class="input-group">
<input class="col-md-3 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months') }}" /> <input class="col-md-3 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months') }}" />
<span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span> <span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span>
{!! $errors->first('warranty_months', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('warranty_months', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>

8
resources/views/hardware/checkin.blade.php
View file

@ -60,7 +60,7 @@
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" type="text" name="name" aria-label="name" id="name" <input class="form-control" type="text" name="name" aria-label="name" id="name"
value="{{ Input::old('name', $asset->name) }}"/> value="{{ Input::old('name', $asset->name) }}"/>
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -69,7 +69,7 @@
{{ Form::label('status_id', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('status_id', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7 required"> <div class="col-md-7 required">
{{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types', 'aria-label'=>'status_id')) }} {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types', 'aria-label'=>'status_id')) }}
{!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -84,7 +84,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ Input::old('checkin_at', date('Y-m-d')) }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ Input::old('checkin_at', date('Y-m-d')) }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('checkin_at', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('checkin_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>
@ -98,7 +98,7 @@
<div class="col-md-8"> <div class="col-md-8">
<textarea class="col-md-6 form-control" id="note" <textarea class="col-md-6 form-control" id="note"
name="note">{{ Input::old('note', $asset->note) }}</textarea> name="note">{{ Input::old('note', $asset->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">

8
resources/views/hardware/checkout.blade.php
View file

@ -48,7 +48,7 @@
{{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" tabindex="1"> <input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" tabindex="1">
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true']) @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
@ -70,7 +70,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at') }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at') }}">
<span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span> <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
</div> </div>
{!! $errors->first('checkout_at', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -82,7 +82,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
<span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span> <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
</div> </div>
{!! $errors->first('expected_checkin', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -91,7 +91,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8"> <div class="col-md-8">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $asset->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $asset->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

4
resources/views/hardware/edit.blade.php
View file

@ -22,7 +22,7 @@
@else @else
<input class="form-control" type="text" name="asset_tag" aria-label="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', \App\Models\Asset::autoincrement_asset()) }}"> <input class="form-control" type="text" name="asset_tag" aria-label="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', \App\Models\Asset::autoincrement_asset()) }}">
@endif @endif
{!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('asset_tag', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -83,7 +83,7 @@
<div class="col-md-5"> <div class="col-md-5">
<label class="control-label" for="image_delete"> <label class="control-label" for="image_delete">
<input type="checkbox" value="1" name="image_delete" id="image_delete" class="minimal" {{ Input::old('image_delete') == '1' ? ' checked="checked"' : '' }}> <input type="checkbox" value="1" name="image_delete" id="image_delete" class="minimal" {{ Input::old('image_delete') == '1' ? ' checked="checked"' : '' }}>
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</label> </label>
<div style="margin-top: 0.5em"> <div style="margin-top: 0.5em">
<img src="{{ url('/') }}/uploads/assets/{{ $item->image }}" class="img-responsive" alt="Existing uploaded image thumbnail"> <img src="{{ url('/') }}/uploads/assets/{{ $item->image }}" class="img-responsive" alt="Existing uploaded image thumbnail">

6
resources/views/hardware/quickscan.blade.php
View file

@ -36,7 +36,7 @@
<input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag') }}"> <input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag') }}">
</div> </div>
{!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('asset_tag', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -54,7 +54,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ Input::old('next_audit_date', $next_audit_date) }}"> <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ Input::old('next_audit_date', $next_audit_date) }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('next_audit_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -64,7 +64,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8"> <div class="col-md-8">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note') }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note') }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/licenses/checkin.blade.php
View file

@ -53,7 +53,7 @@
<label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $licenseSeat->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $licenseSeat->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">

2
resources/views/licenses/checkout.blade.php
View file

@ -59,7 +59,7 @@
<label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note') }}</textarea> <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note') }}</textarea>
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>

14
resources/views/licenses/edit.blade.php
View file

@ -18,7 +18,7 @@
<label for="serial" class="col-md-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label> <label for="serial" class="col-md-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}"> <div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}">
<textarea class="form-control" type="text" name="serial" id="serial">{{ Input::old('serial', $item->serial) }}</textarea> <textarea class="form-control" type="text" name="serial" id="serial">{{ Input::old('serial', $item->serial) }}</textarea>
{!! $errors->first('serial', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('serial', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@endcan @endcan
@ -31,7 +31,7 @@
<input class="form-control" type="text" name="seats" id="seats" value="{{ Input::old('seats', $item->seats) }}" /> <input class="form-control" type="text" name="seats" id="seats" value="{{ Input::old('seats', $item->seats) }}" />
</div> </div>
</div> </div>
{!! $errors->first('seats', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first('seats', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>
@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id']) @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
@ -42,7 +42,7 @@
<label for="license_name" class="col-md-3 control-label">{{ trans('admin/licenses/form.to_name') }}</label> <label for="license_name" class="col-md-3 control-label">{{ trans('admin/licenses/form.to_name') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<input class="form-control" type="text" name="license_name" id="license_name" value="{{ Input::old('license_name', $item->license_name) }}" /> <input class="form-control" type="text" name="license_name" id="license_name" value="{{ Input::old('license_name', $item->license_name) }}" />
{!! $errors->first('license_name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('license_name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -51,7 +51,7 @@
<label for="license_email" class="col-md-3 control-label">{{ trans('admin/licenses/form.to_email') }}</label> <label for="license_email" class="col-md-3 control-label">{{ trans('admin/licenses/form.to_email') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<input class="form-control" type="text" name="license_email" id="license_email" value="{{ Input::old('license_email', $item->license_email) }}" /> <input class="form-control" type="text" name="license_email" id="license_email" value="{{ Input::old('license_email', $item->license_email) }}" />
{!! $errors->first('license_email', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('license_email', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -79,7 +79,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expiration_date" id="expiration_date" value="{{ Input::old('expiration_date', $item->expiration_date) }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expiration_date" id="expiration_date" value="{{ Input::old('expiration_date', $item->expiration_date) }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('expiration_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('expiration_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -93,7 +93,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="termination_date" id="termination_date" value="{{ Input::old('termination_date', $item->termination_date) }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="termination_date" id="termination_date" value="{{ Input::old('termination_date', $item->termination_date) }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('termination_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('termination_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -103,7 +103,7 @@
<label for="purchase_order" class="col-md-3 control-label">{{ trans('admin/licenses/form.purchase_order') }}</label> <label for="purchase_order" class="col-md-3 control-label">{{ trans('admin/licenses/form.purchase_order') }}</label>
<div class="col-md-3"> <div class="col-md-3">
<input class="form-control" type="text" name="purchase_order" id="purchase_order" value="{{ Input::old('purchase_order', $item->purchase_order) }}" /> <input class="form-control" type="text" name="purchase_order" id="purchase_order" value="{{ Input::old('purchase_order', $item->purchase_order) }}" />
{!! $errors->first('purchase_order', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('purchase_order', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

6
resources/views/locations/edit.blade.php
View file

@ -23,7 +23,7 @@
</label> </label>
<div class="col-md-9{{ (\App\Helpers\Helper::checkIfRequired($item, 'currency')) ? ' required' : '' }}"> <div class="col-md-9{{ (\App\Helpers\Helper::checkIfRequired($item, 'currency')) ? ' required' : '' }}">
{{ Form::text('currency', Input::old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;', 'aria-label'=>'currency')) }} {{ Form::text('currency', Input::old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;', 'aria-label'=>'currency')) }}
{!! $errors->first('currency', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('currency', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -37,7 +37,7 @@
</label> </label>
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'ldap_ou')) ? ' required' : '' }}"> <div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'ldap_ou')) ? ' required' : '' }}">
{{ Form::text('ldap_ou', Input::old('ldap_ou', $item->ldap_ou), array('class' => 'form-control')) }} {{ Form::text('ldap_ou', Input::old('ldap_ou', $item->ldap_ou), array('class' => 'form-control')) }}
{!! $errors->first('ldap_ou', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_ou', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif
@ -52,7 +52,7 @@
</label> </label>
<br> <br>
<img src="{{ url('/') }}/uploads/locations/{{ $item->image }}" alt="Image for {{ $item->name }}"> <img src="{{ url('/') }}/uploads/locations/{{ $item->image }}" alt="Image for {{ $item->name }}">
{!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

10
resources/views/manufacturers/edit.blade.php
View file

@ -16,7 +16,7 @@
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control" type="text" name="url" id="url" value="{{ Input::old('url', $item->url) }}" /> <input class="form-control" type="text" name="url" id="url" value="{{ Input::old('url', $item->url) }}" />
{!! $errors->first('url', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('url', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -26,7 +26,7 @@
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control" type="text" name="support_url" id="support_url" value="{{ Input::old('support_url', $item->support_url) }}" /> <input class="form-control" type="text" name="support_url" id="support_url" value="{{ Input::old('support_url', $item->support_url) }}" />
{!! $errors->first('support_url', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('support_url', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -36,7 +36,7 @@
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control" type="text" name="support_phone" id="support_phone" value="{{ Input::old('support_phone', $item->support_phone) }}" /> <input class="form-control" type="text" name="support_phone" id="support_phone" value="{{ Input::old('support_phone', $item->support_phone) }}" />
{!! $errors->first('support_phone', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('support_phone', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -46,7 +46,7 @@
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control" type="email" name="support_email" id="support_email" value="{{ Input::old('support_email', $item->support_email) }}" /> <input class="form-control" type="email" name="support_email" id="support_email" value="{{ Input::old('support_email', $item->support_email) }}" />
{!! $errors->first('support_email', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('support_email', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -60,7 +60,7 @@
</label> </label>
<br> <br>
<img src="{{ url('/') }}/uploads/manufacturers/{{ $item->image }}" alt="Image for {{ $item->name }}"> <img src="{{ url('/') }}/uploads/manufacturers/{{ $item->image }}" alt="Image for {{ $item->name }}">
{!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

4
resources/views/models/bulk-edit.blade.php
View file

@ -40,7 +40,7 @@
</label> </label>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::select('fieldset_id', $fieldset_list , Input::old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }} {{ Form::select('fieldset_id', $fieldset_list , Input::old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }}
{!! $errors->first('fieldset_id', '<span class="alert-msg"><br><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('fieldset_id', '<span class="alert-msg" aria-hidden="true"><br><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -52,7 +52,7 @@
</label> </label>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }} {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }}
{!! $errors->first('depreciation_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/models/custom_fields_form.blade.php
View file

@ -60,7 +60,7 @@
$errormessage=$errors->first($field->db_column_name()); $errormessage=$errors->first($field->db_column_name());
if ($errormessage) { if ($errormessage) {
$errormessage=preg_replace('/ snipeit /', '', $errormessage); $errormessage=preg_replace('/ snipeit /', '', $errormessage);
print('<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> '.$errormessage.'</span>'); print('<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
} }
?> ?>
</div> </div>

6
resources/views/models/edit.blade.php
View file

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('eol', '<span class="alert-msg"><br><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('eol', '<span class="alert-msg" aria-hidden="true"><br><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -38,7 +38,7 @@
<label for="custom_fieldset" class="col-md-3 control-label">{{ trans('admin/models/general.fieldset') }}</label> <label for="custom_fieldset" class="col-md-3 control-label">{{ trans('admin/models/general.fieldset') }}</label>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset', $item->fieldset_id), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px', 'aria-label'=>'custom_fieldset')) }} {{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset', $item->fieldset_id), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px', 'aria-label'=>'custom_fieldset')) }}
{!! $errors->first('custom_fieldset', '<span class="alert-msg"><br><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('custom_fieldset', '<span class="alert-msg" aria-hidden="true"><br><i class="fa fa-times"></i> :message</span>') !!}
<label class="m-l-xs"> <label class="m-l-xs">
{{ Form::checkbox('add_default_values', 1, Input::old('add_default_values'), ['class' => 'js-default-values-toggler']) }} {{ Form::checkbox('add_default_values', 1, Input::old('add_default_values'), ['class' => 'js-default-values-toggler']) }}
{{ trans('admin/models/general.add_default_values') }} {{ trans('admin/models/general.add_default_values') }}
@ -66,7 +66,7 @@
</label> </label>
<br> <br>
<img src="{{ url('/') }}/uploads/models/{{ $item->image }}" alt="Image for {{ $item->name }}"> <img src="{{ url('/') }}/uploads/models/{{ $item->image }}" alt="Image for {{ $item->name }}">
{!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/checkout-selector.blade.php
View file

@ -18,7 +18,7 @@
</label> </label>
@endif @endif
{!! $errors->first('checkout_to_type', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('checkout_to_type', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>

12
resources/views/partials/forms/edit/address.blade.php
View file

@ -2,7 +2,7 @@
{{ Form::label('address', trans('general.address'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('address', trans('general.address'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('address', Input::old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address')) }} {{Form::text('address', Input::old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address')) }}
{!! $errors->first('address', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -10,7 +10,7 @@
<label class="sr-only " for="address2">{{ trans('general.address') }}</label> <label class="sr-only " for="address2">{{ trans('general.address') }}</label>
<div class="col-md-7 col-md-offset-3"> <div class="col-md-7 col-md-offset-3">
{{Form::text('address2', Input::old('address2', $item->address2), array('class' => 'form-control', 'aria-label'=>'address2')) }} {{Form::text('address2', Input::old('address2', $item->address2), array('class' => 'form-control', 'aria-label'=>'address2')) }}
{!! $errors->first('address2', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('address2', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -18,7 +18,7 @@
{{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('city', Input::old('city', $item->city), array('class' => 'form-control', 'aria-label'=>'city')) }} {{Form::text('city', Input::old('city', $item->city), array('class' => 'form-control', 'aria-label'=>'city')) }}
{!! $errors->first('city', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -26,7 +26,7 @@
{{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('state', Input::old('state', $item->state), array('class' => 'form-control', 'aria-label'=>'state')) }} {{Form::text('state', Input::old('state', $item->state), array('class' => 'form-control', 'aria-label'=>'state')) }}
{!! $errors->first('state', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -34,7 +34,7 @@
{{ Form::label('country', trans('general.country'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('country', trans('general.country'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-5"> <div class="col-md-5">
{!! Form::countries('country', Input::old('country', $item->country), 'select2') !!} {!! Form::countries('country', Input::old('country', $item->country), 'select2') !!}
{!! $errors->first('country', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -42,6 +42,6 @@
{{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('zip', Input::old('zip', $item->zip), array('class' => 'form-control')) }} {{Form::text('zip', Input::old('zip', $item->zip), array('class' => 'form-control')) }}
{!! $errors->first('zip', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/asset-select.blade.php
View file

@ -15,6 +15,6 @@
@endif @endif
</select> </select>
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/category-select.blade.php
View file

@ -24,5 +24,5 @@
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/category.blade.php
View file

@ -3,6 +3,6 @@
<label for="category_id" class="col-md-3 control-label">{{ trans('general.category') }}</label> <label for="category_id" class="col-md-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'category_id')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'category_id')) ? ' required' : '' }}">
{{ Form::select('category_id', $category_list , Input::old('category_id', $item->category_id), array('class'=>'select2', 'style'=>'width:100%')) }} {{ Form::select('category_id', $category_list , Input::old('category_id', $item->category_id), array('class'=>'select2', 'style'=>'width:100%')) }}
{!! $errors->first('category_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('category_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/company-select.blade.php
View file

@ -14,6 +14,6 @@
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/company.blade.php
View file

@ -5,7 +5,7 @@
</div> </div>
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'company_id')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'company_id')) ? ' required' : '' }}">
{{ Form::select('company_id', $company_list , Input::old('company_id', $item->company_id), array('class'=>'select2', 'style'=>'width:100%')) }} {{ Form::select('company_id', $company_list , Input::old('company_id', $item->company_id), array('class'=>'select2', 'style'=>'width:100%')) }}
{!! $errors->first('company_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('company_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@endif @endif

2
resources/views/partials/forms/edit/department-select.blade.php
View file

@ -15,6 +15,6 @@
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/depreciation.blade.php
View file

@ -3,6 +3,6 @@
<label for="depreciation_id" class="col-md-3 control-label">{{ trans('general.depreciation') }}</label> <label for="depreciation_id" class="col-md-3 control-label">{{ trans('general.depreciation') }}</label>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $item->depreciation_id), array('class'=>'select2', 'style'=>'width:350px', 'aria-label'=>'depreciation_id')) }} {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $item->depreciation_id), array('class'=>'select2', 'style'=>'width:350px', 'aria-label'=>'depreciation_id')) }}
{!! $errors->first('depreciation_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/email.blade.php
View file

@ -2,6 +2,6 @@
{{ Form::label('email', trans('admin/suppliers/table.email'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('email', trans('admin/suppliers/table.email'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('email', Input::old('email', $item->email), array('class' => 'form-control')) }} {{Form::text('email', Input::old('email', $item->email), array('class' => 'form-control')) }}
{!! $errors->first('email', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/image-upload.blade.php
View file

@ -8,7 +8,7 @@
<span class='label label-default' id="upload-file-info"></span> <span class='label label-default' id="upload-file-info"></span>
<p class="help-block" id="upload-file-status">{{ trans('general.image_filetypes_help', ['size' => \App\Helpers\Helper::file_upload_max_size_readable()]) }}</p> <p class="help-block" id="upload-file-status">{{ trans('general.image_filetypes_help', ['size' => \App\Helpers\Helper::file_upload_max_size_readable()]) }}</p>
{!! $errors->first('image', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<div class="col-md-4 col-md-offset-3"> <div class="col-md-4 col-md-offset-3">
<img id="imagePreview" style="max-width: 200px; display: none;" alt="Uploaded image thumbnail"> <img id="imagePreview" style="max-width: 200px; display: none;" alt="Uploaded image thumbnail">

2
resources/views/partials/forms/edit/item_number.blade.php
View file

@ -3,6 +3,6 @@
<label for="item_no" class="col-md-3 control-label">{{ trans('admin/consumables/general.item_no') }}</label> <label for="item_no" class="col-md-3 control-label">{{ trans('admin/consumables/general.item_no') }}</label>
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'item_no')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'item_no')) ? ' required' : '' }}">
<input class="form-control" type="text" name="item_no" id="item_no" value="{{ Input::old('item_no', $item->item_no) }}" /> <input class="form-control" type="text" name="item_no" id="item_no" value="{{ Input::old('item_no', $item->item_no) }}" />
{!! $errors->first('item_no', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('item_no', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/location-profile-select.blade.php
View file

@ -14,7 +14,7 @@
</select> </select>
</div> </div>
{!! $errors->first('location_id', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first('location_id', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/location-select.blade.php
View file

@ -22,7 +22,7 @@
@endcan @endcan
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
@if (isset($help_text)) @if (isset($help_text))
<div class="col-md-7 col-sm-11 col-md-offset-3"> <div class="col-md-7 col-sm-11 col-md-offset-3">

2
resources/views/partials/forms/edit/location.blade.php
View file

@ -3,6 +3,6 @@
<label for="location_id" class="col-md-3 control-label">{{ trans('general.location') }}</label> <label for="location_id" class="col-md-3 control-label">{{ trans('general.location') }}</label>
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'location_id')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'location_id')) ? ' required' : '' }}">
{{ Form::select('location_id', $location_list , Input::old('location_id', $item->location_id), array('class'=>'select2', 'style'=>'width:350px')) }} {{ Form::select('location_id', $location_list , Input::old('location_id', $item->location_id), array('class'=>'select2', 'style'=>'width:350px')) }}
{!! $errors->first('location_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('location_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/maintenance_type.blade.php
View file

@ -4,6 +4,6 @@
</label> </label>
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_maintenance_type')) ? ' required' : '' }}"> <div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_maintenance_type')) ? ' required' : '' }}">
{{ Form::select('asset_maintenance_type', $assetMaintenanceType , Input::old('asset_maintenance_type', $item->asset_maintenance_type), ['class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'asset_maintenance_type']) }} {{ Form::select('asset_maintenance_type', $assetMaintenanceType , Input::old('asset_maintenance_type', $item->asset_maintenance_type), ['class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'asset_maintenance_type']) }}
{!! $errors->first('asset_maintenance_type', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('asset_maintenance_type', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/manufacturer-select.blade.php
View file

@ -25,5 +25,5 @@
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/manufacturer.blade.php
View file

@ -3,6 +3,6 @@
<label for="manufacturer_id" class="col-md-3 control-label">{{ trans('general.manufacturer') }}</label> <label for="manufacturer_id" class="col-md-3 control-label">{{ trans('general.manufacturer') }}</label>
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'manufacturer_id')) ? ' required' : '' }}"> <div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'manufacturer_id')) ? ' required' : '' }}">
{{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $item->manufacturer_id), array('class'=>'select2', 'style'=>'width:100%')) }} {{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $item->manufacturer_id), array('class'=>'select2', 'style'=>'width:100%')) }}
{!! $errors->first('manufacturer_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('manufacturer_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/minimum_quantity.blade.php
View file

@ -12,7 +12,7 @@
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
{!! $errors->first('min_amt', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('min_amt', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/model-select.blade.php
View file

@ -24,5 +24,5 @@
@endcan @endcan
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/model_number.blade.php
View file

@ -3,6 +3,6 @@
<label for="model_number" class="col-md-3 control-label">{{ trans('general.model_no') }}</label> <label for="model_number" class="col-md-3 control-label">{{ trans('general.model_no') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<input class="form-control" type="text" name="model_number" aria-label="model_number" id="model_number" value="{{ Input::old('model_number', $item->model_number) }}" /> <input class="form-control" type="text" name="model_number" aria-label="model_number" id="model_number" value="{{ Input::old('model_number', $item->model_number) }}" />
{!! $errors->first('model_number', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('model_number', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/name.blade.php
View file

@ -3,6 +3,6 @@
<label for="name" class="col-md-3 control-label">{{ $translated_name }}</label> <label for="name" class="col-md-3 control-label">{{ $translated_name }}</label>
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'name')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'name')) ? ' required' : '' }}">
<input class="form-control" type="text" name="name" aria-label="name" id="name" value="{{ Input::old('name', $item->name) }}" /> <input class="form-control" type="text" name="name" aria-label="name" id="name" value="{{ Input::old('name', $item->name) }}" />
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/notes.blade.php
View file

@ -3,6 +3,6 @@
<label for="notes" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="notes" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
<div class="col-md-7 col-sm-12"> <div class="col-md-7 col-sm-12">
<textarea class="col-md-6 form-control" id="notes" aria-label="notes" name="notes">{{ Input::old('notes', $item->notes) }}</textarea> <textarea class="col-md-6 form-control" id="notes" aria-label="notes" name="notes">{{ Input::old('notes', $item->notes) }}</textarea>
{!! $errors->first('notes', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/order_number.blade.php
View file

@ -3,6 +3,6 @@
<label for="order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label> <label for="order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label>
<div class="col-md-7 col-sm-12"> <div class="col-md-7 col-sm-12">
<input class="form-control" type="text" name="order_number" aria-label="order_number" id="order_number" value="{{ Input::old('order_number', $item->order_number) }}" /> <input class="form-control" type="text" name="order_number" aria-label="order_number" id="order_number" value="{{ Input::old('order_number', $item->order_number) }}" />
{!! $errors->first('order_number', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('order_number', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/phone.blade.php
View file

@ -2,6 +2,6 @@
{{ Form::label('phone', trans('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('phone', trans('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('phone', Input::old('phone', $item->phone), array('class' => 'form-control', 'aria-label'=>'phone')) }} {{Form::text('phone', Input::old('phone', $item->phone), array('class' => 'form-control', 'aria-label'=>'phone')) }}
{!! $errors->first('phone', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('phone', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/purchase_cost.blade.php
View file

@ -13,7 +13,7 @@
</span> </span>
</div> </div>
<div class="col-md-9" style="padding-left: 0px;"> <div class="col-md-9" style="padding-left: 0px;">
{!! $errors->first('purchase_cost', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('purchase_cost', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/purchase_date.blade.php
View file

@ -6,7 +6,7 @@
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
{!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/quantity.blade.php
View file

@ -6,6 +6,6 @@
<div class="col-md-2" style="padding-left:0px"> <div class="col-md-2" style="padding-left:0px">
<input class="form-control" type="text" name="qty" aria-label="qty" id="qty" value="{{ Input::old('qty', $item->qty) }}" /> <input class="form-control" type="text" name="qty" aria-label="qty" id="qty" value="{{ Input::old('qty', $item->qty) }}" />
</div> </div>
{!! $errors->first('qty', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('qty', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/serial.blade.php
View file

@ -3,6 +3,6 @@
<label for="serial" class="col-md-3 control-label">{{ trans('admin/hardware/form.serial') }} </label> <label for="serial" class="col-md-3 control-label">{{ trans('admin/hardware/form.serial') }} </label>
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}">
<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $item->serial) }}" /> <input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $item->serial) }}" />
{!! $errors->first('serial', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('serial', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/status.blade.php
View file

@ -3,7 +3,7 @@
<label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label> <label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
<div class="col-md-7 col-sm-11{{ (\App\Helpers\Helper::checkIfRequired($item, 'status_id')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-11{{ (\App\Helpers\Helper::checkIfRequired($item, 'status_id')) ? ' required' : '' }}">
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'aria-label'=>'status_id')) }} {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'aria-label'=>'status_id')) }}
{!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
<div class="col-md-2 col-sm-2 text-left"> <div class="col-md-2 col-sm-2 text-left">

2
resources/views/partials/forms/edit/supplier-select.blade.php
View file

@ -22,6 +22,6 @@
@endcan @endcan
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/supplier.blade.php
View file

@ -3,7 +3,7 @@
<label for="supplier_id" class="col-md-3 control-label">{{ trans('general.supplier') }}</label> <label for="supplier_id" class="col-md-3 control-label">{{ trans('general.supplier') }}</label>
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'supplier_id')) ? ' required' : '' }}"> <div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'supplier_id')) ? ' required' : '' }}">
{{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $item->supplier_id), ['class'=>'select2', 'style'=>'min-width:350px', 'id' => 'supplier_select_id']) }} {{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $item->supplier_id), ['class'=>'select2', 'style'=>'min-width:350px', 'id' => 'supplier_select_id']) }}
{!! $errors->first('supplier_id', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('supplier_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
<a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-default">New</a>

2
resources/views/partials/forms/edit/user-select.blade.php
View file

@ -22,6 +22,6 @@
@endcan @endcan
</div> </div>
{!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!} {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div> </div>

2
resources/views/partials/forms/edit/warranty.blade.php
View file

@ -7,7 +7,7 @@
<span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span> <span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span>
</div> </div>
<div class="col-md-9" style="padding-left: 0px;"> <div class="col-md-9" style="padding-left: 0px;">
{!! $errors->first('warranty_months', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('warranty_months', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
</div> </div>

26
resources/views/reports/custom.blade.php
View file

@ -270,48 +270,48 @@
<!-- Status --> <!-- Status -->
<div class="form-group"> <div class="form-group">
<label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label> <label for="by_status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
<div class="col-md-7 col-sm-11"> <div class="col-md-7 col-sm-11">
{{ Form::select('by_status_id', \App\Helpers\Helper::statusLabelList() , Input::old('by_status_id'), array('class'=>'select2', 'style'=>'width:100%')) }} {{ Form::select('by_status_id', \App\Helpers\Helper::statusLabelList() , Input::old('by_status_id'), array('class'=>'select2', 'style'=>'width:100%', 'aria-label'=>'by_status_id')) }}
</div> </div>
</div> </div>
<!-- Order Number --> <!-- Order Number -->
<div class="form-group"> <div class="form-group">
<label for="order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label> <label for="by_order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label>
<div class="col-md-5 col-sm-8"> <div class="col-md-5 col-sm-8">
<input class="form-control" type="text" name="by_order_number" value=""> <input class="form-control" type="text" name="by_order_number" value="" aria-label="by_order_number">
</div> </div>
</div> </div>
<!-- Purchase Date --> <!-- Purchase Date -->
<div class="form-group purchase-range"> <div class="form-group purchase-range">
<label for="purchase_date" class="col-md-3 control-label">{{ trans('general.purchase_date') }} Range</label> <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }} Range</label>
<div class="input-daterange input-group col-md-6" id="datepicker"> <div class="input-daterange input-group col-md-6" id="datepicker">
<input type="text" class="input-sm form-control" name="purchase_start" /> <input type="text" class="input-sm form-control" name="purchase_start" aria-label="purchase_start">
<span class="input-group-addon">to</span> <span class="input-group-addon">to</span>
<input type="text" class="input-sm form-control" name="purchase_end" /> <input type="text" class="input-sm form-control" name="purchase_end" aria-label="purchase_end">
</div> </div>
</div> </div>
<!-- Created Date --> <!-- Created Date -->
<div class="form-group purchase-range"> <div class="form-group purchase-range">
<label for="purchase_date" class="col-md-3 control-label">{{ trans('general.created_at') }} Range</label> <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} Range</label>
<div class="input-daterange input-group col-md-6" id="datepicker"> <div class="input-daterange input-group col-md-6" id="datepicker">
<input type="text" class="input-sm form-control" name="created_start" /> <input type="text" class="input-sm form-control" name="created_start" aria-label="created_start">
<span class="input-group-addon">to</span> <span class="input-group-addon">to</span>
<input type="text" class="input-sm form-control" name="created_end" /> <input type="text" class="input-sm form-control" name="created_end" aria-label="created_end">
</div> </div>
</div> </div>
<!-- Expected Checkin Date --> <!-- Expected Checkin Date -->
<div class="form-group expected_checkin-range"> <div class="form-group expected_checkin-range">
<label for="purchase_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label> <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
<div class="input-daterange input-group col-md-6" id="datepicker"> <div class="input-daterange input-group col-md-6" id="datepicker">
<input type="text" class="input-sm form-control" name="expected_checkin_start" /> <input type="text" class="input-sm form-control" name="expected_checkin_start" aria-label="expected_checkin_start">
<span class="input-group-addon">to</span> <span class="input-group-addon">to</span>
<input type="text" class="input-sm form-control" name="expected_checkin_end" /> <input type="text" class="input-sm form-control" name="expected_checkin_end" aria-label="expected_checkin_end">
</div> </div>
</div> </div>

20
resources/views/settings/alerts.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -31,9 +31,9 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h4 class="box-title"> <h2 class="box-title">
<i class="fa fa-bell"></i> Alerts <i class="fa fa-bell"></i> Alerts
</h4> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -71,7 +71,7 @@
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::text('alert_email', Input::old('alert_email', $setting->alert_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }} {{ Form::text('alert_email', Input::old('alert_email', $setting->alert_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }}
{!! $errors->first('alert_email', '<span class="alert-msg">:message</span><br>') !!} {!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
<p class="help-block">Email addresses or distribution lists you want alerts to be sent to, comma separated</p> <p class="help-block">Email addresses or distribution lists you want alerts to be sent to, comma separated</p>
@ -87,7 +87,7 @@
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::text('admin_cc_email', Input::old('admin_cc_email', $setting->admin_cc_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }} {{ Form::text('admin_cc_email', Input::old('admin_cc_email', $setting->admin_cc_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }}
{!! $errors->first('admin_cc_email', '<span class="alert-msg">:message</span><br>') !!} {!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
<p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p>
@ -102,7 +102,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('alert_interval', Input::old('alert_interval', $setting->alert_interval), array('class' => 'form-control','placeholder' => '30', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('alert_interval', Input::old('alert_interval', $setting->alert_interval), array('class' => 'form-control','placeholder' => '30', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
{!! $errors->first('alert_interval', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -113,7 +113,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('alert_threshold', Input::old('alert_threshold', $setting->alert_threshold), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('alert_threshold', Input::old('alert_threshold', $setting->alert_threshold), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
{!! $errors->first('alert_threshold', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -128,7 +128,7 @@
<span class="input-group-addon">{{ trans('general.months') }}</span> <span class="input-group-addon">{{ trans('general.months') }}</span>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('audit_interval', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p>
</div> </div>
</div> </div>
@ -147,7 +147,7 @@
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('audit_warning_days', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('audit_warning_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.audit_warning_days_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.audit_warning_days_help') }}</p>
</div> </div>
</div> </div>
@ -160,7 +160,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

22
resources/views/settings/asset_tags.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -46,7 +46,7 @@
{{ Form::label('auto_increment_assets', trans('admin/settings/general.asset_ids')) }} {{ Form::label('auto_increment_assets', trans('admin/settings/general.asset_ids')) }}
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::checkbox('auto_increment_assets', '1', Input::old('auto_increment_assets', $setting->auto_increment_assets),array('class' => 'minimal')) }} {{ Form::checkbox('auto_increment_assets', '1', Input::old('auto_increment_assets', $setting->auto_increment_assets),array('class' => 'minimal', 'aria-label'=>'auto_increment_assets')) }}
{{ trans('admin/settings/general.auto_increment_assets') }} {{ trans('admin/settings/general.auto_increment_assets') }}
</div> </div>
</div> </div>
@ -56,8 +56,8 @@
{{ Form::label('next_auto_tag_base', trans('admin/settings/general.next_auto_tag_base')) }} {{ Form::label('next_auto_tag_base', trans('admin/settings/general.next_auto_tag_base')) }}
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::text('next_auto_tag_base', Input::old('next_auto_tag_base', $setting->next_auto_tag_base), array('class' => 'form-control', 'style'=>'width: 150px;')) }} {{ Form::text('next_auto_tag_base', Input::old('next_auto_tag_base', $setting->next_auto_tag_base), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'next_auto_tag_base')) }}
{!! $errors->first('next_auto_tag_base', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('next_auto_tag_base', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -69,10 +69,10 @@
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
@if ($setting->auto_increment_assets == 1) @if ($setting->auto_increment_assets == 1)
{{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'style'=>'width: 150px;')) }} {{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'auto_increment_prefix')) }}
{!! $errors->first('auto_increment_prefix', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('auto_increment_prefix', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@else @else
{{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'disabled'=>'disabled', 'style'=>'width: 150px;')) }} {{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'disabled'=>'disabled', 'style'=>'width: 150px;', 'aria-label'=>'auto_increment_prefix')) }}
@endif @endif
</div> </div>
</div> </div>
@ -80,11 +80,11 @@
<!-- auto zerofill --> <!-- auto zerofill -->
<div class="form-group {{ $errors->has('zerofill_count') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('zerofill_count') ? 'error' : '' }}">
<div class="col-md-5"> <div class="col-md-5">
{{ Form::label('auto_increment_prefix', trans('admin/settings/general.zerofill_count')) }} {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }}
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::text('zerofill_count', Input::old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;')) }} {{ Form::text('zerofill_count', Input::old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'zerofill_count')) }}
{!! $errors->first('zerofill_count', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('zerofill_count', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -96,7 +96,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

18
resources/views/settings/barcodes.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -31,9 +31,9 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h4 class="box-title"> <h2 class="box-title">
<i class="fa fa-barcode"></i> Barcodes <i class="fa fa-barcode"></i> Barcodes
</h4> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -47,7 +47,7 @@
{{ Form::label('qr_code', trans('admin/settings/general.display_qr')) }} {{ Form::label('qr_code', trans('admin/settings/general.display_qr')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code),array('class' => 'minimal')) }} {{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code),array('class' => 'minimal', 'aria-label'=>'qr_code')) }}
{{ trans('general.yes') }} {{ trans('general.yes') }}
</div> </div>
</div> </div>
@ -59,17 +59,17 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::barcode_types('barcode_type', Input::old('barcode_type', $setting->barcode_type), 'select2') !!} {!! Form::barcode_types('barcode_type', Input::old('barcode_type', $setting->barcode_type), 'select2') !!}
{!! $errors->first('barcode_type', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('barcode_type', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
<!-- barcode --> <!-- barcode -->
<div class="form-group"> <div class="form-group">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('qr_code', trans('admin/settings/general.display_alt_barcode')) }} {{ Form::label('alt_barcode_enabled', trans('admin/settings/general.display_alt_barcode')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('alt_barcode_enabled', '1', Input::old('alt_barcode_enabled', $setting->alt_barcode_enabled),array('class' => 'minimal')) }} {{ Form::checkbox('alt_barcode_enabled', '1', Input::old('alt_barcode_enabled', $setting->alt_barcode_enabled),array('class' => 'minimal', 'aria-label'=>'alt_barcode_enabled')) }}
{{ trans('general.yes') }} {{ trans('general.yes') }}
</div> </div>
</div> </div>
@ -81,7 +81,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::alt_barcode_types('alt_barcode', Input::old('alt_barcode', $setting->alt_barcode), 'select2') !!} {!! Form::alt_barcode_types('alt_barcode', Input::old('alt_barcode', $setting->alt_barcode), 'select2') !!}
{!! $errors->first('barcode_type', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('barcode_type', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@else @else
@ -104,7 +104,7 @@
'title' =>'Extra text that you would like to display on your labels. ', 'title' =>'Extra text that you would like to display on your labels. ',
'data-toggle' =>'tooltip', 'data-toggle' =>'tooltip',
'data-placement'=>'top')) }} 'data-placement'=>'top')) }}
{!! $errors->first('qr_text', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('qr_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@else @else
{{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Property of Your Company')) }} {{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Property of Your Company')) }}
<p class="help-block">{{ trans('admin/settings/general.qr_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.qr_help') }}</p>

50
resources/views/settings/branding.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -33,9 +33,9 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h4 class="box-title"> <h2 class="box-title">
<i class="fa fa-copyright"></i> Branding <i class="fa fa-copyright"></i> Branding
</h4> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -55,7 +55,7 @@
{{ Form::text('site_name', {{ Form::text('site_name',
Input::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }} Input::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }}
@endif @endif
{!! $errors->first('site_name', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('site_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -76,8 +76,11 @@
<p class="help-block" id="upload-file-status">{{ trans('general.image_filetypes_help', ['size' => \App\Helpers\Helper::file_upload_max_size_readable()]) }}</p> <p class="help-block" id="upload-file-status">{{ trans('general.image_filetypes_help', ['size' => \App\Helpers\Helper::file_upload_max_size_readable()]) }}</p>
{!! $errors->first('image', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
{{ Form::checkbox('clear_logo', '1', Input::old('clear_logo'),array('class' => 'minimal')) }} Remove <label for="clear_logo">
{{ Form::checkbox('clear_logo', '1', Input::old('clear_logo'),array('class' => 'minimal', 'aria-label'=>'clear_logo')) }}
{{ trans('general.delete') }}
</label>
@endif @endif
</div> </div>
</div> </div>
@ -90,7 +93,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), Input::old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), Input::old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
{!! $errors->first('brand', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('brand', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -100,8 +103,9 @@
{{ Form::label('logo_print_assets', trans('admin/settings/general.logo_print_assets')) }} {{ Form::label('logo_print_assets', trans('admin/settings/general.logo_print_assets')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('logo_print_assets', '1', Input::old('logo_print_assets', $setting->logo_print_assets),array('class' => 'minimal')) }} {{ Form::checkbox('logo_print_assets', '1', Input::old('logo_print_assets', $setting->logo_print_assets),array('class' => 'minimal', 'aria-label'=>'logo_print_assets')) }}
{{ trans('admin/settings/general.logo_print_assets_help') }} {{ trans('admin/settings/general.logo_print_assets_help') }}
</div> </div>
</div> </div>
@ -112,8 +116,8 @@
{{ Form::label('show_url_in_emails', trans('admin/settings/general.show_url_in_emails')) }} {{ Form::label('show_url_in_emails', trans('admin/settings/general.show_url_in_emails')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('show_url_in_emails', '1', Input::old('show_url_in_emails', $setting->show_url_in_emails),array('class' => 'minimal')) }} {{ Form::checkbox('show_url_in_emails', '1', Input::old('show_url_in_emails', $setting->show_url_in_emails),array('class' => 'minimal', 'aria-label'=>'show_url_in_emails')) }}
{{ trans('general.yes') }} {{ trans('general.yes') }}
<p class="help-block">{{ trans('admin/settings/general.show_url_in_emails_help_text') }}</p> <p class="help-block">{{ trans('admin/settings/general.show_url_in_emails_help_text') }}</p>
</div> </div>
</div> </div>
@ -125,12 +129,12 @@
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<div class="input-group header-color"> <div class="input-group header-color">
{{ Form::text('header_color', Input::old('header_color', $setting->header_color), array('class' => 'form-control', 'style' => 'width: 100px;','placeholder' => '#FF0000')) }} {{ Form::text('header_color', Input::old('header_color', $setting->header_color), array('class' => 'form-control', 'style' => 'width: 100px;','placeholder' => '#FF0000', 'aria-label'=>'header_color')) }}
<div class="input-group-addon"> <div class="input-group-addon">
<i></i> <i></i>
</div> </div>
</div><!-- /.input group --> </div><!-- /.input group -->
{!! $errors->first('header_color', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('header_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -141,7 +145,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::skin('skin', Input::old('skin', $setting->skin), 'select2') !!} {!! Form::skin('skin', Input::old('skin', $setting->skin), 'select2') !!}
{!! $errors->first('skin', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('skin', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -153,12 +157,12 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
{{ Form::textarea('custom_css', Input::old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled')) }} {{ Form::textarea('custom_css', Input::old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }}
{!! $errors->first('custom_css', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('general.lock_passwords') }}</p> <p class="help-block">{{ trans('general.lock_passwords') }}</p>
@else @else
{{ Form::textarea('custom_css', Input::old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS')) }} {{ Form::textarea('custom_css', Input::old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }}
{!! $errors->first('custom_css', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.custom_css_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.custom_css_help') }}</p>
</div> </div>
@ -178,7 +182,7 @@
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.support_footer_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.support_footer_help') }}</p>
{!! $errors->first('support_footer', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('support_footer', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -196,14 +200,14 @@
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p>
{!! $errors->first('version_footer', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('version_footer', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<!-- Additional footer --> <!-- Additional footer -->
<div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('custom_css', trans('admin/settings/general.footer_text')) }} {{ Form::label('footer_text', trans('admin/settings/general.footer_text')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
@ -213,7 +217,7 @@
{{ Form::textarea('footer_text', Input::old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => 'Optional footer text')) }} {{ Form::textarea('footer_text', Input::old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => 'Optional footer text')) }}
@endif @endif
<p class="help-block">{!! trans('admin/settings/general.footer_text_help') !!}</p> <p class="help-block">{!! trans('admin/settings/general.footer_text_help') !!}</p>
{!! $errors->first('footer_text', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('footer_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -229,7 +233,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

58
resources/views/settings/general.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -32,10 +32,10 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h4 class="box-title"> <h2 class="box-title">
<i class="fa fa-wrench" aria-hidden="true"></i> <i class="fa fa-wrench" aria-hidden="true"></i>
{{ trans('admin/settings/general.general_settings') }} {{ trans('admin/settings/general.general_settings') }}
</h4> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -48,9 +48,9 @@
{{ Form::label('full_multiple_companies_support', trans('admin/settings/general.full_multiple_companies_support_text')) }} {{ Form::label('full_multiple_companies_support', trans('admin/settings/general.full_multiple_companies_support_text')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('full_multiple_companies_support', '1', Input::old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('class' => 'minimal')) }} {{ Form::checkbox('full_multiple_companies_support', '1', Input::old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('class' => 'minimal', 'aria-label'=>'full_multiple_companies_support')) }}
{{ trans('admin/settings/general.full_multiple_companies_support_text') }} {{ trans('admin/settings/general.full_multiple_companies_support_text') }}
{!! $errors->first('full_multiple_companies_support', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('full_multiple_companies_support', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.full_multiple_companies_support_help_text') }} {{ trans('admin/settings/general.full_multiple_companies_support_help_text') }}
</p> </p>
@ -68,7 +68,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('require_accept_signature', '1', Input::old('require_accept_signature', $setting->require_accept_signature),array('class' => 'minimal')) }} {{ Form::checkbox('require_accept_signature', '1', Input::old('require_accept_signature', $setting->require_accept_signature),array('class' => 'minimal')) }}
{{ trans('general.yes') }} {{ trans('general.yes') }}
{!! $errors->first('require_accept_signature', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('require_accept_signature', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.require_accept_signature_help_text') }}</p> <p class="help-block">{{ trans('admin/settings/general.require_accept_signature_help_text') }}</p>
</div> </div>
</div> </div>
@ -83,7 +83,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('email_domain', Input::old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }} {{ Form::text('email_domain', Input::old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
<span class="help-block">{{ trans('general.email_domain_help') }}</span> <span class="help-block">{{ trans('general.email_domain_help') }}</span>
{!! $errors->first('email_domain', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('email_domain', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -95,7 +95,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::username_format('email_format', Input::old('email_format', $setting->email_format), 'select2') !!} {!! Form::username_format('email_format', Input::old('email_format', $setting->email_format), 'select2') !!}
{!! $errors->first('email_format', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -106,7 +106,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::username_format('username_format', Input::old('username_format', $setting->username_format), 'select2') !!} {!! Form::username_format('username_format', Input::old('username_format', $setting->username_format), 'select2') !!}
{!! $errors->first('username_format', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('username_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -131,7 +131,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('show_images_in_email', '1', Input::old('show_images_in_email', $setting->show_images_in_email),array('class' => 'minimal')) }} {{ Form::checkbox('show_images_in_email', '1', Input::old('show_images_in_email', $setting->show_images_in_email),array('class' => 'minimal')) }}
{{ trans('general.yes') }} {{ trans('general.yes') }}
{!! $errors->first('show_images_in_email', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('show_images_in_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.show_images_in_email_help') }} {{ trans('admin/settings/general.show_images_in_email_help') }}
</p> </p>
@ -146,7 +146,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('unique_serial', '1', Input::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }} {{ Form::checkbox('unique_serial', '1', Input::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }}
{{ trans('general.yes') }} {{ trans('general.yes') }}
{!! $errors->first('unique_serial', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('unique_serial', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.unique_serial_help_text') }} {{ trans('admin/settings/general.unique_serial_help_text') }}
</p> </p>
@ -161,7 +161,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('per_page', Input::old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('per_page', Input::old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
{!! $errors->first('per_page', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('per_page', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -173,7 +173,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('thumbnail_max_h', Input::old('thumbnail_max_h', $setting->thumbnail_max_h), array('class' => 'form-control','placeholder' => '50', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('thumbnail_max_h', Input::old('thumbnail_max_h', $setting->thumbnail_max_h), array('class' => 'form-control','placeholder' => '50', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
<p class="help-block">{{ trans('admin/settings/general.thumbnail_max_h_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.thumbnail_max_h_help') }}</p>
{!! $errors->first('thumbnail_max_h', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('thumbnail_max_h', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -184,7 +184,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::textarea('default_eula_text', Input::old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }} {{ Form::textarea('default_eula_text', Input::old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }}
{!! $errors->first('default_eula_text', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('default_eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.default_eula_help_text') }}</p> <p class="help-block">{{ trans('admin/settings/general.default_eula_help_text') }}</p>
<p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!}</p> <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!}</p>
</div> </div>
@ -199,12 +199,12 @@
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
<textarea class="form-control disabled" name="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2" readonly>{{ Input::old('login_note', $setting->login_note) }}</textarea> <textarea class="form-control disabled" name="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2" aria-label="login_note" readonly>{{ Input::old('login_note', $setting->login_note) }}</textarea>
{!! $errors->first('login_note', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('login_note', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('general.lock_passwords') }}</p> <p class="help-block">{{ trans('general.lock_passwords') }}</p>
@else @else
<textarea class="form-control" name="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2">{{ Input::old('login_note', $setting->login_note) }}</textarea> <textarea class="form-control" name="login_note" aria-label="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2">{{ Input::old('login_note', $setting->login_note) }}</textarea>
{!! $errors->first('login_note', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('login_note', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@endif @endif
<p class="help-block">{!! trans('admin/settings/general.login_note_help') !!}</p> <p class="help-block">{!! trans('admin/settings/general.login_note_help') !!}</p>
</div> </div>
@ -239,12 +239,12 @@
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
<textarea class="form-control disabled" name="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2" readonly>{{ Input::old('dashboard_message', $setting->login_note) }}</textarea> <textarea class="form-control disabled" name="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2" aria-label="dashboard_message" readonly>{{ Input::old('dashboard_message', $setting->login_note) }}</textarea>
{!! $errors->first('dashboard_message', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('dashboard_message', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('general.lock_passwords') }}</p> <p class="help-block">{{ trans('general.lock_passwords') }}</p>
@else @else
<textarea class="form-control" name="dashboard_message" rows="2">{{ Input::old('login_note', $setting->dashboard_message) }}</textarea> <textarea class="form-control" aria-label="dashboard_message" name="dashboard_message" rows="2">{{ Input::old('login_note', $setting->dashboard_message) }}</textarea>
{!! $errors->first('dashboard_message', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('dashboard_message', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@endif @endif
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.dashboard_message_help') }} {{ trans('admin/settings/general.dashboard_message_help') }}
@ -264,7 +264,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('show_archived_in_list', '1', Input::old('show_archived_in_list', $setting->show_archived_in_list),array('class' => 'minimal')) }} {{ Form::checkbox('show_archived_in_list', '1', Input::old('show_archived_in_list', $setting->show_archived_in_list),array('class' => 'minimal')) }}
{{ trans('admin/settings/general.show_archived_in_list_text') }} {{ trans('admin/settings/general.show_archived_in_list_text') }}
{!! $errors->first('show_archived_in_list', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('show_archived_in_list', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -276,10 +276,10 @@
trans('admin/settings/general.show_in_model_list')) }} trans('admin/settings/general.show_in_model_list')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('show_in_model_list[]', 'image', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('image')),array('class' => 'minimal')) }} {{ trans('general.image') }} <br> {{ Form::checkbox('show_in_model_list[]', 'image', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('image')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.image') }} <br>
{{ Form::checkbox('show_in_model_list[]', 'category', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('category')),array('class' => 'minimal')) }} {{ trans('general.category') }} <br> {{ Form::checkbox('show_in_model_list[]', 'category', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('category')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.category') }} <br>
{{ Form::checkbox('show_in_model_list[]', 'manufacturer', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer')),array('class' => 'minimal')) }} {{ trans('general.manufacturer') }} <br> {{ Form::checkbox('show_in_model_list[]', 'manufacturer', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.manufacturer') }} <br>
{{ Form::checkbox('show_in_model_list[]', 'model_number', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number')),array('class' => 'minimal')) }} {{ trans('general.model_no') }}<br> {{ Form::checkbox('show_in_model_list[]', 'model_number', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.model_no') }}<br>
</div> </div>
</div> </div>
<!-- /.form-group --> <!-- /.form-group -->
@ -299,7 +299,7 @@
<span class="help-block">{{ trans('admin/settings/general.privacy_policy_link_help') }}</span> <span class="help-block">{{ trans('admin/settings/general.privacy_policy_link_help') }}</span>
{!! $errors->first('privacy_policy_link', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('privacy_policy_link', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
</div> </div>
@ -310,7 +310,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

86
resources/views/settings/labels.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -45,23 +45,23 @@
{{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page')) }} {{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('labels_per_page', Input::old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;']) }} {{ Form::text('labels_per_page', Input::old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;', 'aria-label'=>'labels_per_page']) }}
{!! $errors->first('labels_per_page', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_per_page', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('labels_fontsize') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('labels_width', trans('admin/settings/general.labels_fontsize')) }} {{ Form::label('labels_fontsize', trans('admin/settings/general.labels_fontsize')) }}
</div> </div>
<div class="col-md-2 form-group"> <div class="col-md-2 form-group">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_fontsize', Input::old('labels_fontsize', $setting->labels_fontsize), ['class' => 'form-control']) }} {{ Form::text('labels_fontsize', Input::old('labels_fontsize', $setting->labels_fontsize), ['class' => 'form-control', 'aria-label'=>'labels_fontsize']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.text_pt') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.text_pt') }}</div>
</div> </div>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('labels_fontsize', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_fontsize', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -71,120 +71,120 @@
</div> </div>
<div class="col-md-3 form-group"> <div class="col-md-3 form-group">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_width', Input::old('labels_width', $setting->labels_width), ['class' => 'form-control']) }} {{ Form::text('labels_width', Input::old('labels_width', $setting->labels_width), ['class' => 'form-control', 'aria-label'=>'labels_width']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
</div> </div>
</div> </div>
<div class="col-md-3 form-group" style="margin-left: 10px"> <div class="col-md-3 form-group" style="margin-left: 10px">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_height', Input::old('labels_height', $setting->labels_height), ['class' => 'form-control']) }} {{ Form::text('labels_height', Input::old('labels_height', $setting->labels_height), ['class' => 'form-control', 'aria-label'=>'labels_height']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
</div> </div>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('labels_width', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
{!! $errors->first('labels_height', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('labels_display_sgutter') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('labels_width', trans('admin/settings/general.label_gutters')) }} {{ Form::label('labels_display_sgutter', trans('admin/settings/general.label_gutters')) }}
</div> </div>
<div class="col-md-3 form-group"> <div class="col-md-3 form-group">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_display_sgutter', Input::old('labels_display_sgutter', $setting->labels_display_sgutter), ['class' => 'form-control']) }} {{ Form::text('labels_display_sgutter', Input::old('labels_display_sgutter', $setting->labels_display_sgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_sgutter']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
</div> </div>
</div> </div>
<div class="col-md-3 form-group" style="margin-left: 10px"> <div class="col-md-3 form-group" style="margin-left: 10px">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_display_bgutter', Input::old('labels_display_bgutter', $setting->labels_display_bgutter), ['class' => 'form-control']) }} {{ Form::text('labels_display_bgutter', Input::old('labels_display_bgutter', $setting->labels_display_bgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_bgutter']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
</div> </div>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('labels_display_sgutter', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_display_sgutter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
{!! $errors->first('labels_display_bgutter', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_display_bgutter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('labels_pmargin_top') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('labels_width', trans('admin/settings/general.page_padding')) }} {{ Form::label('labels_pmargin_top', trans('admin/settings/general.page_padding')) }}
</div> </div>
<div class="col-md-3 form-group"> <div class="col-md-3 form-group">
<div class="input-group" style="margin-bottom: 15px;"> <div class="input-group" style="margin-bottom: 15px;">
{{ Form::text('labels_pmargin_top', Input::old('labels_pmargin_top', $setting->labels_pmargin_top), ['class' => 'form-control']) }} {{ Form::text('labels_pmargin_top', Input::old('labels_pmargin_top', $setting->labels_pmargin_top), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_top']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div>
</div> </div>
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_pmargin_right', Input::old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control']) }} {{ Form::text('labels_pmargin_right', Input::old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_right']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.right') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.right') }}</div>
</div> </div>
</div> </div>
<div class="col-md-3 form-group" style="margin-left: 10px; "> <div class="col-md-3 form-group" style="margin-left: 10px; ">
<div class="input-group" style="margin-bottom: 15px;"> <div class="input-group" style="margin-bottom: 15px;">
{{ Form::text('labels_pmargin_bottom', Input::old('labels_pmargin_bottom', $setting->labels_pmargin_bottom), ['class' => 'form-control']) }} {{ Form::text('labels_pmargin_bottom', Input::old('labels_pmargin_bottom', $setting->labels_pmargin_bottom), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_bottom']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.bottom') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.bottom') }}</div>
</div> </div>
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_pmargin_left', Input::old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control']) }} {{ Form::text('labels_pmargin_left', Input::old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_left']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.left') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.left') }}</div>
</div> </div>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('labels_width', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
{!! $errors->first('labels_height', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<div class="form-group {{ $errors->has('labels_pageheight') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('labels_pageheight') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('labels_width', trans('admin/settings/general.page_dimensions')) }} {{ Form::label('labels_pagewidth', trans('admin/settings/general.page_dimensions')) }}
</div> </div>
<div class="col-md-3 form-group"> <div class="col-md-3 form-group">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_pagewidth', Input::old('labels_pagewidth', $setting->labels_pagewidth), ['class' => 'form-control']) }} {{ Form::text('labels_pagewidth', Input::old('labels_pagewidth', $setting->labels_pagewidth), ['class' => 'form-control', 'aria-label'=>'labels_pagewidth']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
</div> </div>
</div> </div>
<div class="col-md-3 form-group" style="margin-left: 10px"> <div class="col-md-3 form-group" style="margin-left: 10px">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_pageheight', Input::old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control']) }} {{ Form::text('labels_pageheight', Input::old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control', 'aria-label'=>'labels_pageheight']) }}
<div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
</div> </div>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('labels_pagewidth', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_pagewidth', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
{!! $errors->first('labels_pageheight', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_pageheight', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('labels_width', trans('admin/settings/general.label_fields')) }} {{ Form::label('labels_display', trans('admin/settings/general.label_fields')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="checkbox"> <div class="checkbox">
<label> <label for="labels_display_name">
{{ Form::checkbox('labels_display_name', '1', Input::old('labels_display_name', $setting->labels_display_name),['class' => 'minimal']) }} {{ Form::checkbox('labels_display_name', '1', Input::old('labels_display_name', $setting->labels_display_name),['class' => 'minimal', 'aria-label'=>'labels_display_name']) }}
{{ trans('admin/hardware/form.name') }} {{ trans('admin/hardware/form.name') }}
</label> </label>
<label> <label for="labels_display_serial">
{{ Form::checkbox('labels_display_serial', '1', Input::old('labels_display_serial', $setting->labels_display_serial),['class' => 'minimal']) }} {{ Form::checkbox('labels_display_serial', '1', Input::old('labels_display_serial', $setting->labels_display_serial),['class' => 'minimal', 'aria-label'=>'labels_display_serial']) }}
{{ trans('admin/hardware/form.serial') }} {{ trans('admin/hardware/form.serial') }}
</label> </label>
<label> <label for="labels_display_tag">
{{ Form::checkbox('labels_display_tag', '1', Input::old('labels_display_tag', $setting->labels_display_tag),['class' => 'minimal']) }} {{ Form::checkbox('labels_display_tag', '1', Input::old('labels_display_tag', $setting->labels_display_tag),['class' => 'minimal', 'aria-label'=>'labels_display_tag']) }}
{{ trans('admin/hardware/form.tag') }} {{ trans('admin/hardware/form.tag') }}
</label> </label>
<label> <label for="labels_display_model">
{{ Form::checkbox('labels_display_model', '1', Input::old('labels_display_model', $setting->labels_display_model),['class' => 'minimal']) }} {{ Form::checkbox('labels_display_model', '1', Input::old('labels_display_model', $setting->labels_display_model),['class' => 'minimal', 'aria-label'=>'labels_display_model']) }}
{{ trans('admin/hardware/form.model') }} {{ trans('admin/hardware/form.model') }}
</label> </label>
<label> <label for="labels_display_company_name">
{{ Form::checkbox('labels_display_company_name', '1', Input::old('labels_display_company_name', $setting->labels_display_company_name),['class' => 'minimal']) }} {{ Form::checkbox('labels_display_company_name', '1', Input::old('labels_display_company_name', $setting->labels_display_company_name),['class' => 'minimal', 'aria-label'=>'labels_display_company_name']) }}
{{ trans('admin/companies/table.name') }} {{ trans('admin/companies/table.name') }}
</label> </label>
@ -203,7 +203,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

40
resources/views/settings/ldap.blade.php
View file

@ -70,7 +70,7 @@
@endcan @endcan
{{ trans('admin/settings/general.ldap_enabled') }} {{ trans('admin/settings/general.ldap_enabled') }}
{!! $errors->first('ldap_enabled', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -87,7 +87,7 @@
@endif @endif
{{ trans('admin/settings/general.is_ad') }} {{ trans('admin/settings/general.is_ad') }}
{!! $errors->first('is_ad', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('is_ad', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -106,7 +106,7 @@
{{ trans('general.yes') }} {{ trans('general.yes') }}
<p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p>
{!! $errors->first('ldap_pw_sync', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_pw_sync', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -122,7 +122,7 @@
{{ Form::text('ad_domain', Input::old('ad_domain', $setting->ad_domain), array('class' => 'form-control','placeholder' => 'example.com')) }} {{ Form::text('ad_domain', Input::old('ad_domain', $setting->ad_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p>
{!! $errors->first('ad_domain', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ad_domain', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div><!-- AD Domain --> </div><!-- AD Domain -->
@ -138,7 +138,7 @@
{{ Form::text('ldap_server', Input::old('ldap_server', $setting->ldap_server), array('class' => 'form-control','placeholder' => 'ldap://ldap.example.com')) }} {{ Form::text('ldap_server', Input::old('ldap_server', $setting->ldap_server), array('class' => 'form-control','placeholder' => 'ldap://ldap.example.com')) }}
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.ldap_server_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.ldap_server_help') }}</p>
{!! $errors->first('ldap_server', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_server', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div><!-- LDAP Server --> </div><!-- LDAP Server -->
@ -156,7 +156,7 @@
{{ trans('admin/settings/general.ldap_tls_help') }} {{ trans('admin/settings/general.ldap_tls_help') }}
{!! $errors->first('ldap_tls', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_tls', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -174,7 +174,7 @@
{{ trans('admin/settings/general.ldap_server_cert_ignore') }} {{ trans('admin/settings/general.ldap_server_cert_ignore') }}
{!! $errors->first('ldap_server_cert_ignore', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_server_cert_ignore', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.ldap_server_cert_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.ldap_server_cert_help') }}</p>
</div> </div>
</div> </div>
@ -190,7 +190,7 @@
@else @else
{{ Form::text('ldap_uname', Input::old('ldap_uname', $setting->ldap_uname), array('class' => 'form-control','placeholder' => 'binduser@example.com')) }} {{ Form::text('ldap_uname', Input::old('ldap_uname', $setting->ldap_uname), array('class' => 'form-control','placeholder' => 'binduser@example.com')) }}
@endif @endif
{!! $errors->first('ldap_uname', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_uname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -205,7 +205,7 @@
@else @else
{{ Form::password('ldap_pword', array('class' => 'form-control','placeholder' => 'binduserpassword')) }} {{ Form::password('ldap_pword', array('class' => 'form-control','placeholder' => 'binduserpassword')) }}
@endif @endif
{!! $errors->first('ldap_pword', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_pword', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -220,7 +220,7 @@
@else @else
{{ Form::text('ldap_basedn', Input::old('ldap_basedn', $setting->ldap_basedn), array('class' => 'form-control','placeholder' => 'cn=users/authorized,dc=example,dc=com')) }} {{ Form::text('ldap_basedn', Input::old('ldap_basedn', $setting->ldap_basedn), array('class' => 'form-control','placeholder' => 'cn=users/authorized,dc=example,dc=com')) }}
@endif @endif
{!! $errors->first('ldap_basedn', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_basedn', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -235,7 +235,7 @@
@else @else
{{ Form::text('ldap_filter', Input::old('ldap_filter', $setting->ldap_filter), array('class' => 'form-control','placeholder' => '&(cn=*)')) }} {{ Form::text('ldap_filter', Input::old('ldap_filter', $setting->ldap_filter), array('class' => 'form-control','placeholder' => '&(cn=*)')) }}
@endif @endif
{!! $errors->first('ldap_filter', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_filter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -250,7 +250,7 @@
@else @else
{{ Form::text('ldap_username_field', Input::old('ldap_username_field', $setting->ldap_username_field), array('class' => 'form-control','placeholder' => 'samaccountname')) }} {{ Form::text('ldap_username_field', Input::old('ldap_username_field', $setting->ldap_username_field), array('class' => 'form-control','placeholder' => 'samaccountname')) }}
@endif @endif
{!! $errors->first('ldap_username_field', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_username_field', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -265,7 +265,7 @@
@else @else
{{ Form::text('ldap_lname_field', Input::old('ldap_lname_field', $setting->ldap_lname_field), array('class' => 'form-control','placeholder' => 'sn')) }} {{ Form::text('ldap_lname_field', Input::old('ldap_lname_field', $setting->ldap_lname_field), array('class' => 'form-control','placeholder' => 'sn')) }}
@endif @endif
{!! $errors->first('ldap_lname_field', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_lname_field', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -280,7 +280,7 @@
@else @else
{{ Form::text('ldap_fname_field', Input::old('ldap_fname_field', $setting->ldap_fname_field), array('class' => 'form-control','placeholder' => 'givenname')) }} {{ Form::text('ldap_fname_field', Input::old('ldap_fname_field', $setting->ldap_fname_field), array('class' => 'form-control','placeholder' => 'givenname')) }}
@endif @endif
{!! $errors->first('ldap_fname_field', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_fname_field', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -295,7 +295,7 @@
@else @else
{{ Form::text('ldap_auth_filter_query', Input::old('ldap_auth_filter_query', $setting->ldap_auth_filter_query), array('class' => 'form-control','placeholder' => '"uid="')) }} {{ Form::text('ldap_auth_filter_query', Input::old('ldap_auth_filter_query', $setting->ldap_auth_filter_query), array('class' => 'form-control','placeholder' => '"uid="')) }}
@endif @endif
{!! $errors->first('ldap_auth_filter_query', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_auth_filter_query', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -310,7 +310,7 @@
@else @else
{{ Form::text('ldap_version', Input::old('ldap_version', $setting->ldap_version), array('class' => 'form-control','placeholder' => '3')) }} {{ Form::text('ldap_version', Input::old('ldap_version', $setting->ldap_version), array('class' => 'form-control','placeholder' => '3')) }}
@endif @endif
{!! $errors->first('ldap_version', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_version', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -325,7 +325,7 @@
@else @else
{{ Form::text('ldap_active_flag', Input::old('ldap_active_flag', $setting->ldap_active_flag), array('class' => 'form-control','placeholder' => '')) }} {{ Form::text('ldap_active_flag', Input::old('ldap_active_flag', $setting->ldap_active_flag), array('class' => 'form-control','placeholder' => '')) }}
@endif @endif
{!! $errors->first('ldap_active_flag', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_active_flag', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -340,7 +340,7 @@
@else @else
{{ Form::text('ldap_emp_num', Input::old('ldap_emp_num', $setting->ldap_emp_num), array('class' => 'form-control','placeholder' => '')) }} {{ Form::text('ldap_emp_num', Input::old('ldap_emp_num', $setting->ldap_emp_num), array('class' => 'form-control','placeholder' => '')) }}
@endif @endif
{!! $errors->first('ldap_emp_num', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_emp_num', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -355,7 +355,7 @@
@else @else
{{ Form::text('ldap_email', Input::old('ldap_email', $setting->ldap_email), array('class' => 'form-control','placeholder' => '')) }} {{ Form::text('ldap_email', Input::old('ldap_email', $setting->ldap_email), array('class' => 'form-control','placeholder' => '')) }}
@endif @endif
{!! $errors->first('ldap_email', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -423,7 +423,7 @@
{{ Form::text('custom_forgot_pass_url', Input::old('custom_forgot_pass_url', $setting->custom_forgot_pass_url), array('class' => 'form-control','placeholder' => 'https://my.ldapserver-forgotpass.com')) }} {{ Form::text('custom_forgot_pass_url', Input::old('custom_forgot_pass_url', $setting->custom_forgot_pass_url), array('class' => 'form-control','placeholder' => 'https://my.ldapserver-forgotpass.com')) }}
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.custom_forgot_pass_url_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.custom_forgot_pass_url_help') }}</p>
{!! $errors->first('custom_forgot_pass_url', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('custom_forgot_pass_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div><!-- LDAP Server --> </div><!-- LDAP Server -->

14
resources/views/settings/localization.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -31,9 +31,9 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h4 class="box-title"> <h2 class="box-title">
<i class="fa fa-globe"></i> Localization <i class="fa fa-globe"></i> Localization
</h4> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -48,7 +48,7 @@
<div class="col-md-9"> <div class="col-md-9">
{!! Form::locales('locale', Input::old('locale', $setting->locale), 'select2') !!} {!! Form::locales('locale', Input::old('locale', $setting->locale), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -62,7 +62,7 @@
{!! Form::time_display_format('time_display_format', Input::old('time_display_format', $setting->time_display_format), 'select2') !!} {!! Form::time_display_format('time_display_format', Input::old('time_display_format', $setting->time_display_format), 'select2') !!}
{!! $errors->first('time_display_format', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('time_display_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -73,7 +73,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('default_currency', Input::old('default_currency', $setting->default_currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('default_currency', Input::old('default_currency', $setting->default_currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
{!! $errors->first('default_currency', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('default_currency', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -89,7 +89,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/purge-form.blade.php
View file

@ -34,7 +34,7 @@
@else @else
{{ Form::text('confirm_purge', Input::old('confirm_purge'), array('class' => 'form-control')) }} {{ Form::text('confirm_purge', Input::old('confirm_purge'), array('class' => 'form-control')) }}
@endif @endif
{!! $errors->first('ldap_version', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('ldap_version', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<div class="box-footer text-right"> <div class="box-footer text-right">

49
resources/views/settings/security.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -26,9 +26,9 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h4 class="box-title"> <h2 class="box-title">
<i class="fa fa-lock"></i> Security <i class="fa fa-lock" aria-hidden="true"></i> Security
</h4> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -50,7 +50,7 @@
<p class="help-block">{{ trans('general.feature_disabled') }}</p> <p class="help-block">{{ trans('general.feature_disabled') }}</p>
@endif @endif
{!! $errors->first('two_factor_enabled', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('two_factor_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -62,7 +62,7 @@
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('pwd_secure_min', Input::old('pwd_secure_min', $setting->pwd_secure_min), array('class' => 'form-control', 'style'=>'width: 50px;')) }} {{ Form::text('pwd_secure_min', Input::old('pwd_secure_min', $setting->pwd_secure_min), array('class' => 'form-control', 'style'=>'width: 50px;')) }}
{!! $errors->first('pwd_secure_min', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('pwd_secure_min', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.pwd_secure_min_help') }} {{ trans('admin/settings/general.pwd_secure_min_help') }}
</p> </p>
@ -75,14 +75,16 @@
<!-- Common Passwords --> <!-- Common Passwords -->
<div class="form-group {{ $errors->has('pwd_secure_uncommon') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('pwd_secure_uncommon') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('pwd_secure_text', {{ Form::label('pwd_secure_text_label',
trans('admin/settings/general.pwd_secure_uncommon')) }} trans('admin/settings/general.pwd_secure_uncommon')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox('pwd_secure_uncommon', '1', Input::old('pwd_secure_uncommon', $setting->pwd_secure_uncommon),array('class' => 'minimal')) }} <label for="pwd_secure_uncommon"><span class="sr-only">Prevent common insecure passwords</span>
{{ Form::label('pwd_secure_uncommon', trans('general.yes')) }} {{ Form::checkbox('pwd_secure_uncommon', '1', Input::old('pwd_secure_uncommon', $setting->pwd_secure_uncommon),array('class' => 'minimal', 'aria-label'=>'pwd_secure_uncommon')) }}
{!! $errors->first('pwd_secure_uncommon', '<span class="alert-msg">:message</span>') !!} {{ trans('general.yes') }}
</label>
{!! $errors->first('pwd_secure_uncommon', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.pwd_secure_uncommon_help') }} {{ trans('admin/settings/general.pwd_secure_uncommon_help') }}
</p> </p>
@ -97,16 +99,16 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal')) }} {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
Require at least one letter <br> Require at least one letter <br>
{{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal')) }} {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
Require at least one number<br> Require at least one number<br>
{{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal')) }} {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
Require at least one symbol<br> Require at least one symbol<br>
{{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal')) }} {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
Require at least one uppercase and one lowercase Require at least one uppercase and one lowercase
<p class="help-block"> <p class="help-block">
@ -119,7 +121,7 @@
<!-- Remote User Authentication --> <!-- Remote User Authentication -->
<div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('login_remote_user', trans('admin/settings/general.login_remote_user_text')) }} {{ Form::label('login_remote_user_label', trans('admin/settings/general.login_remote_user_text')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<!-- Enable Remote User Login --> <!-- Enable Remote User Login -->
@ -127,24 +129,27 @@
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
<p class="help-block">{{ trans('general.feature_disabled') }}</p> <p class="help-block">{{ trans('general.feature_disabled') }}</p>
@else @else
{{ Form::checkbox('login_remote_user_enabled', '1', Input::old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal')) }} {{ Form::checkbox('login_remote_user_enabled', '1', Input::old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal', 'aria-label'=>'login_remote_user')) }}
{{ Form::label('login_remote_user_enabled', trans('admin/settings/general.login_remote_user_enabled_text')) }} {{ Form::label('login_remote_user_enabled', trans('admin/settings/general.login_remote_user_enabled_text')) }}
{!! $errors->first('login_remote_user_enabled', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('login_remote_user_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.login_remote_user_enabled_help') }} {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
</p> </p>
<!-- Custom logout url to redirect to authentication provider --> <!-- Custom logout url to redirect to authentication provider -->
{{ Form::label('login_remote_user_custom_logout_url', trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }} {{ Form::label('login_remote_user_custom_logout_url', trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }}
{{ Form::text('login_remote_user_custom_logout_url', Input::old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control')) }} {{ Form::text('login_remote_user_custom_logout_url', Input::old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control', 'aria-label'=>'login_remote_user_custom_logout_url')) }}
{!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }} {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
</p> </p>
<!-- Disable other logins mechanism --> <!-- Disable other logins mechanism -->
{{ Form::checkbox('login_common_disabled', '1', Input::old('login_common_disabled', $setting->login_common_disabled),array('class' => 'minimal')) }} <label>
{{ Form::label('login_common_disabled', trans('admin/settings/general.login_common_disabled_text')) }}
{!! $errors->first('login_common_disabled', '<span class="alert-msg">:message</span>') !!} {{ Form::checkbox('login_common_disabled', '1', Input::old('login_common_disabled', $setting->login_common_disabled),array('class' => 'minimal', 'aria-label'=>'login_common_disabled')) }}
{{ trans('admin/settings/general.login_common_disabled_text') }}
</label>
{!! $errors->first('login_common_disabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.login_common_disabled_help') }} {{ trans('admin/settings/general.login_common_disabled_help') }}
</p> </p>

14
resources/views/settings/slack.blade.php
View file

@ -7,7 +7,7 @@
@stop @stop
@section('header_right') @section('header_right')
<a href="{{ route('settings.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a> <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop @stop
@ -31,9 +31,9 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h4 class="box-title"> <h2 class="box-title">
<i class="fa fa-slack"></i> Slack <i class="fa fa-slack"></i> Slack
</h4> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -61,7 +61,7 @@
@else @else
{{ Form::text('slack_endpoint', Input::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }} {{ Form::text('slack_endpoint', Input::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }}
@endif @endif
{!! $errors->first('slack_endpoint', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -76,7 +76,7 @@
@else @else
{{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','placeholder' => '#IT-Ops')) }} {{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','placeholder' => '#IT-Ops')) }}
@endif @endif
{!! $errors->first('slack_channel', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('slack_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -91,7 +91,7 @@
@else @else
{{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','placeholder' => 'Snipe-Bot')) }} {{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','placeholder' => 'Snipe-Bot')) }}
@endif @endif
{!! $errors->first('slack_botname', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('slack_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -121,7 +121,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

26
resources/views/setup/user.blade.php
View file

@ -22,7 +22,7 @@ Create a User ::
{{ Form::label('site_name', trans('general.site_name')) }} {{ Form::label('site_name', trans('general.site_name')) }}
{{ Form::text('site_name', Input::old('site_name'), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }} {{ Form::text('site_name', Input::old('site_name'), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }}
{!! $errors->first('site_name', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('site_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -33,7 +33,7 @@ Create a User ::
{{ Form::label('locale', trans('admin/settings/general.default_language')) }} {{ Form::label('locale', trans('admin/settings/general.default_language')) }}
{!! Form::locales('locale', Input::old('locale', "en"), 'select2') !!} {!! Form::locales('locale', Input::old('locale', "en"), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<!-- Currency --> <!-- Currency -->
@ -41,7 +41,7 @@ Create a User ::
{{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }} {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }}
{{ Form::text('default_currency', Input::old('default_currency'), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('default_currency', Input::old('default_currency'), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
{!! $errors->first('default_currency', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('default_currency', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -76,14 +76,14 @@ Create a User ::
{{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }} {{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }}
{{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix'), array('class' => 'form-control')) }} {{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix'), array('class' => 'form-control')) }}
{!! $errors->first('auto_increment_prefix', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('auto_increment_prefix', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'zerofill_count')) ? ' required' : '' }} {{ $errors->has('zerofill_count') ? 'error' : '' }}"> <div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'zerofill_count')) ? ' required' : '' }} {{ $errors->has('zerofill_count') ? 'error' : '' }}">
{{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }} {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }}
{{ Form::text('zerofill_count', Input::old('zerofill_count', 5), array('class' => 'form-control')) }} {{ Form::text('zerofill_count', Input::old('zerofill_count', 5), array('class' => 'form-control')) }}
{!! $errors->first('zerofill_count', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('zerofill_count', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -95,14 +95,14 @@ Create a User ::
{{ Form::text('email_domain', Input::old('email_domain'), array('class' => 'form-control','placeholder' => 'example.com')) }} {{ Form::text('email_domain', Input::old('email_domain'), array('class' => 'form-control','placeholder' => 'example.com')) }}
<span class="help-block">{{ trans('general.email_domain_help') }}</span> <span class="help-block">{{ trans('general.email_domain_help') }}</span>
{!! $errors->first('email_domain', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('email_domain', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<!-- email format --> <!-- email format -->
<div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'email_format')) ? ' required' : '' }} {{ $errors->has('email_format') ? 'error' : '' }}"> <div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'email_format')) ? ' required' : '' }} {{ $errors->has('email_format') ? 'error' : '' }}">
{{ Form::label('email_format', trans('general.email_format')) }} {{ Form::label('email_format', trans('general.email_format')) }}
{!! Form::username_format('email_format', Input::old('email_format', 'filastname'), 'select2') !!} {!! Form::username_format('email_format', Input::old('email_format', 'filastname'), 'select2') !!}
{!! $errors->first('email_format', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -112,14 +112,14 @@ Create a User ::
<div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'first_name')) ? ' required' : '' }} {{ $errors->has('first_name') ? 'error' : '' }}"> <div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'first_name')) ? ' required' : '' }} {{ $errors->has('first_name') ? 'error' : '' }}">
{{ Form::label('first_name', trans('general.first_name')) }} {{ Form::label('first_name', trans('general.first_name')) }}
{{ Form::text('first_name', Input::old('first_name'), array('class' => 'form-control','placeholder' => 'Jane')) }} {{ Form::text('first_name', Input::old('first_name'), array('class' => 'form-control','placeholder' => 'Jane')) }}
{!! $errors->first('first_name', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<!-- last name --> <!-- last name -->
<div class="form-group col-lg-6 required {{ $errors->has('last_name') ? 'error' : '' }}"> <div class="form-group col-lg-6 required {{ $errors->has('last_name') ? 'error' : '' }}">
{{ Form::label('last_name', trans('general.last_name')) }} {{ Form::label('last_name', trans('general.last_name')) }}
{{ Form::text('last_name', Input::old('last_name'), array('class' => 'form-control','placeholder' => 'Smith')) }} {{ Form::text('last_name', Input::old('last_name'), array('class' => 'form-control','placeholder' => 'Smith')) }}
{!! $errors->first('last_name', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -128,14 +128,14 @@ Create a User ::
<div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'email')) ? ' required' : '' }} {{ $errors->has('email') ? 'error' : '' }}"> <div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'email')) ? ' required' : '' }} {{ $errors->has('email') ? 'error' : '' }}">
{{ Form::label('email', trans('admin/users/table.email')) }} {{ Form::label('email', trans('admin/users/table.email')) }}
{{ Form::email('email', config('mail.from.address'), array('class' => 'form-control','placeholder' => 'you@example.com')) }} {{ Form::email('email', config('mail.from.address'), array('class' => 'form-control','placeholder' => 'you@example.com')) }}
{!! $errors->first('email', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<!-- username --> <!-- username -->
<div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'username')) ? ' required' : '' }} {{ $errors->has('username') ? 'error' : '' }}"> <div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'username')) ? ' required' : '' }} {{ $errors->has('username') ? 'error' : '' }}">
{{ Form::label('username', trans('admin/users/table.username')) }} {{ Form::label('username', trans('admin/users/table.username')) }}
{{ Form::text('username', Input::old('username'), array('class' => 'form-control','placeholder' => 'jsmith')) }} {{ Form::text('username', Input::old('username'), array('class' => 'form-control','placeholder' => 'jsmith')) }}
{!! $errors->first('username', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -144,14 +144,14 @@ Create a User ::
<div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password') ? 'error' : '' }}"> <div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password') ? 'error' : '' }}">
{{ Form::label('password', trans('admin/users/table.password')) }} {{ Form::label('password', trans('admin/users/table.password')) }}
{{ Form::password('password', array('class' => 'form-control')) }} {{ Form::password('password', array('class' => 'form-control')) }}
{!! $errors->first('password', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<!-- password confirm --> <!-- password confirm -->
<div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password_confirm') ? 'error' : '' }}"> <div class="form-group col-lg-6{{ (\App\Helpers\Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password_confirm') ? 'error' : '' }}">
{{ Form::label('password_confirmation', trans('admin/users/table.password_confirm')) }} {{ Form::label('password_confirmation', trans('admin/users/table.password_confirm')) }}
{{ Form::password('password_confirmation', array('class' => 'form-control')) }} {{ Form::password('password_confirmation', array('class' => 'form-control')) }}
{!! $errors->first('password_confirmation', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>

4
resources/views/statuslabels/edit.blade.php
View file

@ -27,7 +27,7 @@
<label for="statuslabel_types" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.status_type') }} </label> <label for="statuslabel_types" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.status_type') }} </label>
<div class="col-md-7 required"> <div class="col-md-7 required">
{{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px', 'aria-label'=>'statuslabel_types')) }} {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px', 'aria-label'=>'statuslabel_types')) }}
{!! $errors->first('statuslabel_types', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('statuslabel_types', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -39,7 +39,7 @@
{{ Form::text('color', Input::old('color', $item->color), array('class' => 'form-control', 'style' => 'width: 100px;', 'maxlength'=>'10')) }} {{ Form::text('color', Input::old('color', $item->color), array('class' => 'form-control', 'style' => 'width: 100px;', 'maxlength'=>'10')) }}
<div class="input-group-addon"><i></i></div> <div class="input-group-addon"><i></i></div>
</div><!-- /.input group --> </div><!-- /.input group -->
{!! $errors->first('header_color', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('header_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>

10
resources/views/suppliers/edit.blade.php
View file

@ -17,7 +17,7 @@
{{ Form::label('contact', trans('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('contact', trans('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('contact', Input::old('contact', $item->contact), array('class' => 'form-control')) }} {{Form::text('contact', Input::old('contact', $item->contact), array('class' => 'form-control')) }}
{!! $errors->first('contact', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('contact', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -27,7 +27,7 @@
{{ Form::label('fax', trans('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('fax', trans('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('fax', Input::old('fax', $item->fax), array('class' => 'form-control')) }} {{Form::text('fax', Input::old('fax', $item->fax), array('class' => 'form-control')) }}
{!! $errors->first('fax', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('fax', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -37,7 +37,7 @@
{{ Form::label('url', trans('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('url', trans('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7"> <div class="col-md-7">
{{Form::text('url', Input::old('url', $item->url), array('class' => 'form-control')) }} {{Form::text('url', Input::old('url', $item->url), array('class' => 'form-control')) }}
{!! $errors->first('url', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('url', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -51,7 +51,7 @@
<div class="col-md-5"> <div class="col-md-5">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/suppliers/{{ $item->image }}" /> <img src="{{ url('/') }}/uploads/suppliers/{{ $item->image }}" />
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif
@ -64,7 +64,7 @@
<input type="file" name="image" accept="image/gif,image/jpeg,image/png,image/svg" hidden> <input type="file" name="image" accept="image/gif,image/jpeg,image/png,image/svg" hidden>
</label> </label>
<p class="help-block">Accepted filetypes are jpg, png, gif and svg</p> <p class="help-block">Accepted filetypes are jpg, png, gif and svg</p>
{!! $errors->first('image', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/users/bulk-edit.blade.php
View file

@ -51,7 +51,7 @@
<label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label> <label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label>
<div class="col-md-8"> <div class="col-md-8">
{!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>

36
resources/views/users/edit.blade.php
View file

@ -89,7 +89,7 @@
<label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label> <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
<div class="col-md-8 {{ (\App\Helpers\Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}"> <div class="col-md-8 {{ (\App\Helpers\Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
<input class="form-control" type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" /> <input class="form-control" type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" />
{!! $errors->first('first_name', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -98,7 +98,7 @@
<label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label> <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
<div class="col-md-8{{ (\App\Helpers\Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}"> <div class="col-md-8{{ (\App\Helpers\Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
<input class="form-control" type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" /> <input class="form-control" type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" />
{!! $errors->first('last_name', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -127,7 +127,7 @@
@endif @endif
{!! $errors->first('username', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -152,7 +152,7 @@
(Managed via LDAP) (Managed via LDAP)
@endif @endif
<span id="generated-password"></span> <span id="generated-password"></span>
{!! $errors->first('password', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
@if ($user->ldap_import!='1') @if ($user->ldap_import!='1')
@ -183,7 +183,7 @@
@if (config('app.lock_passwords') && ($user->id)) @if (config('app.lock_passwords') && ($user->id))
<p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p> <p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p>
@endif @endif
{!! $errors->first('password_confirmation', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@endif @endif
@ -205,7 +205,7 @@
@if (config('app.lock_passwords') && ($user->id)) @if (config('app.lock_passwords') && ($user->id))
<p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p> <p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p>
@endif @endif
{!! $errors->first('email', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -219,7 +219,7 @@
<label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label> <label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label>
<div class="col-md-8"> <div class="col-md-8">
{!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -235,7 +235,7 @@
id="employee_num" id="employee_num"
value="{{ Input::old('employee_num', $user->employee_num) }}" value="{{ Input::old('employee_num', $user->employee_num) }}"
/> />
{!! $errors->first('employee_num', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('employee_num', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -251,7 +251,7 @@
id="jobtitle" id="jobtitle"
value="{{ Input::old('jobtitle', $user->jobtitle) }}" value="{{ Input::old('jobtitle', $user->jobtitle) }}"
/> />
{!! $errors->first('jobtitle', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('jobtitle', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -271,7 +271,7 @@
<label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label> <label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control" type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" /> <input class="form-control" type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" />
{!! $errors->first('phone', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('phone', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -280,7 +280,7 @@
<label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label> <label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label>
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" type="text" name="website" id="website" value="{{ Input::old('website', $user->website) }}" /> <input class="form-control" type="text" name="website" id="website" value="{{ Input::old('website', $user->website) }}" />
{!! $errors->first('website', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('website', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -289,7 +289,7 @@
<label class="col-md-3 control-label" for="address">{{ trans('general.address') }}</label> <label class="col-md-3 control-label" for="address">{{ trans('general.address') }}</label>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control" type="text" name="address" id="address" value="{{ Input::old('address', $user->address) }}" /> <input class="form-control" type="text" name="address" id="address" value="{{ Input::old('address', $user->address) }}" />
{!! $errors->first('address', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -298,7 +298,7 @@
<label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label> <label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control" type="text" name="city" id="city" aria-label="city" value="{{ Input::old('city', $user->city) }}" /> <input class="form-control" type="text" name="city" id="city" aria-label="city" value="{{ Input::old('city', $user->city) }}" />
{!! $errors->first('city', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -307,7 +307,7 @@
<label class="col-md-3 control-label" for="state">{{ trans('general.state') }}</label> <label class="col-md-3 control-label" for="state">{{ trans('general.state') }}</label>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control" type="text" name="state" id="state" value="{{ Input::old('state', $user->state) }}" maxlength="3" /> <input class="form-control" type="text" name="state" id="state" value="{{ Input::old('state', $user->state) }}" maxlength="3" />
{!! $errors->first('state', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -316,7 +316,7 @@
<label class="col-md-3 control-label" for="country">{{ trans('general.country') }}</label> <label class="col-md-3 control-label" for="country">{{ trans('general.country') }}</label>
<div class="col-md-4"> <div class="col-md-4">
{!! Form::countries('country', Input::old('country', $user->country), 'select2') !!} {!! Form::countries('country', Input::old('country', $user->country), 'select2') !!}
{!! $errors->first('country', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -325,7 +325,7 @@
<label class="col-md-3 control-label" for="zip">{{ trans('general.zip') }}</label> <label class="col-md-3 control-label" for="zip">{{ trans('general.zip') }}</label>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control" type="text" name="zip" id="zip" value="{{ Input::old('zip', $user->zip) }}" maxlength="10" /> <input class="form-control" type="text" name="zip" id="zip" value="{{ Input::old('zip', $user->zip) }}" maxlength="10" />
{!! $errors->first('zip', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -363,7 +363,7 @@
</div> </div>
@endif @endif
{!! $errors->first('activated', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('activated', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -413,7 +413,7 @@
<label for="notes" class="col-md-3 control-label">{{ trans('admin/users/table.notes') }}</label> <label for="notes" class="col-md-3 control-label">{{ trans('admin/users/table.notes') }}</label>
<div class="col-md-8"> <div class="col-md-8">
<textarea class="form-control" id="notes" name="notes">{{ Input::old('notes', $user->notes) }}</textarea> <textarea class="form-control" id="notes" name="notes">{{ Input::old('notes', $user->notes) }}</textarea>
{!! $errors->first('notes', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>

2
resources/views/users/ldap.blade.php
View file

@ -73,7 +73,7 @@ LDAP User Sync
@if ($entry['status']=='success') @if ($entry['status']=='success')
<i class="fa fa-check"></i> {!! $entry['note'] !!} <i class="fa fa-check"></i> {!! $entry['note'] !!}
@else @else
<span class="alert-msg">{!! $entry['note'] !!}</span> <span class="alert-msg" aria-hidden="true">{!! $entry['note'] !!}</span>
@endif @endif
</td> </td>