mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-09 23:24:06 -08:00
Added asterisk help text
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
3ac0702094
commit
305dc049a4
|
@ -561,5 +561,6 @@ return [
|
||||||
'remaining_var' => ':count Remaining',
|
'remaining_var' => ':count Remaining',
|
||||||
'label' => 'Label',
|
'label' => 'Label',
|
||||||
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
|
'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
|
||||||
|
'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
|
@ -35,6 +35,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-7">
|
<div class="col-md-7">
|
||||||
{!! Form::countries('country', old('country', $item->country), 'select2') !!}
|
{!! Form::countries('country', old('country', $item->country), 'select2') !!}
|
||||||
|
<p class="help-block">{{ trans('general.countries_manually_entered_help') }}</p>
|
||||||
{!! $errors->first('country', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
{!! $errors->first('country', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -451,6 +451,8 @@
|
||||||
<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-6">
|
<div class="col-md-6">
|
||||||
{!! Form::countries('country', old('country', $user->country), 'col-md-12 select2') !!}
|
{!! Form::countries('country', old('country', $user->country), 'col-md-12 select2') !!}
|
||||||
|
|
||||||
|
<p class="help-block">{{ trans('general.countries_manually_entered_help') }}</p>
|
||||||
{!! $errors->first('country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
{!! $errors->first('country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -197,7 +197,9 @@
|
||||||
{{ trans('admin/users/general.print_assigned') }}
|
{{ trans('admin/users/general.print_assigned') }}
|
||||||
</a>
|
</a>
|
||||||
@else
|
@else
|
||||||
<button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">{{ trans('admin/users/general.print_assigned') }}</button>
|
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">
|
||||||
|
<x-icon type="print" />
|
||||||
|
{{ trans('admin/users/general.print_assigned') }}</button>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@endcan
|
@endcan
|
||||||
|
|
Loading…
Reference in a new issue