lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Removed help text for email images (since we embed them by default now)

Browse source 
Added help text for username format
This commit is contained in:
snipe 2019-04-02 18:22:31 -07:00
parent fe553aec02
commit ded1a59914
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/admin/settings/general.php
View file

@ -191,4 +191,5 @@ return array(
'unique_serial' => 'Unique serial numbers', 'unique_serial' => 'Unique serial numbers',
'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials', 'unique_serial_help_text' => 'Checking this box will enforce a uniqueness constraint on asset serials',
'zerofill_count' => 'Length of asset tags, including zerofill', 'zerofill_count' => 'Length of asset tags, including zerofill',
'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
); );

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

@ -106,6 +106,10 @@
<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">:message</span>') !!}
<p class="help-block">
{{ trans('admin/settings/general.username_format_help') }}
</p>
</div> </div>
</div> </div>
@ -118,9 +122,7 @@
{{ 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">:message</span>') !!}
<p class="help-block">
{{ trans('admin/settings/general.show_images_in_email_help') }}
</p>
</div> </div>
</div> </div>