mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-23 01:07:42 -07:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
30 lines
1.3 KiB
PHP
30 lines
1.3 KiB
PHP
<div class="form-group {{ $errors->has($logoVariable) ? 'has-error' : '' }}">
|
|
<label class="col-md-3" for="{{ $logoVariable }}">
|
|
{{ Form::label($logoVariable, $logoLabel) }}</label>
|
|
|
|
<div class="col-md-9">
|
|
<label class="btn btn-default">
|
|
{{ trans('button.select_file') }}
|
|
<input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}"
|
|
data-maxsize="{{ $maxSize ?? \App\Helpers\Helper::file_upload_max_size() }}"
|
|
accept="{{ $allowedTypes ?? 'image/gif,image/jpeg,image/png,image/svg'}}" style="display:none; max-width: 90%">
|
|
</label>
|
|
<span class='label label-default' id="{{ $logoId }}-info"></span>
|
|
|
|
<p class="help-block" id="{{ $logoId }}-status">
|
|
{{ $helpBlock }}
|
|
</p>
|
|
{!! $errors->first($logoVariable, '<span class="alert-msg">:message</span>') !!}
|
|
|
|
</div>
|
|
<div class="col-md-9 col-md-offset-3">
|
|
<img id="{{ $logoId }}-imagePreview" style="max-width: 500px; max-height: 50px">
|
|
</div>
|
|
|
|
@if ($setting->$logoVariable!='')
|
|
<div class="col-md-9 col-md-offset-3">
|
|
{{ Form::checkbox($logoClearVariable, '1', Request::old($logoClearVariable),array('class' => 'minimal')) }} Remove current image
|
|
</div>
|
|
@endif
|
|
</div>
|