DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
This commit is contained in:
Brady Wetherington 2021-04-14 09:58:21 -07:00
parent 6b86e2a58f 9cf5fbd675
commit bf344fd707
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/dist/signature-pad.min.css vendored
View file

Binary file not shown.

2
public/mix-manifest.json
View file

@ -31,7 +31,7 @@
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=9fa87f2673f15e56aed6", "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=9fa87f2673f15e56aed6",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=d729a1e2e97f290cc4e2", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
"/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b", "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=a17945119a381c758e1f", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=a17945119a381c758e1f",
"/js/dist/all.js": "/js/dist/all.js?id=2763646e2d6ff462dbde" "/js/dist/all.js": "/js/dist/all.js?id=2763646e2d6ff462dbde"

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

@ -63,7 +63,7 @@
<div class="form-group {{ $errors->has('skin') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
<label for="website" class="col-md-3 control-label">{{ Form::label('skin', trans('general.skin')) }}</label> <label for="website" class="col-md-3 control-label">{{ Form::label('skin', trans('general.skin')) }}</label>
<div class="col-md-8"> <div class="col-md-8">
{!! Form::user_skin('skin', Input::old('skin', $user->skin), 'select2') !!} {!! Form::user_skin('skin', old('skin', $user->skin), 'select2') !!}
{!! $errors->first('skin', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('skin', '<span class="alert-msg">:message</span>') !!}
</div> </div>
</div> </div>

4
resources/views/layouts/default.blade.php
View file

@ -30,8 +30,8 @@
{{-- stylesheets --}} {{-- stylesheets --}}
<link rel="stylesheet" href="{{ mix('css/dist/all.css') }}"> <link rel="stylesheet" href="{{ mix('css/dist/all.css') }}">
@if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '') @if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '')
<link rel="stylesheet" href="{{ mix('css/skins/skin-'.Auth::user()->present()->skin.'.min.css') }}"> <link rel="stylesheet" href="{{ mix('css/dist/skins/skin-'.Auth::user()->present()->skin.'.min.css') }}">
@elseif (($snipeSettings) && ($snipeSettings->skin!='')) @else
<link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}"> <link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}">
@endif @endif
{{-- page level css --}} {{-- page level css --}}

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

@ -106,7 +106,7 @@
<div class="form-group {{ $errors->has('username') ? 'has-error' : '' }}"> <div class="form-group {{ $errors->has('username') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="username">{{ trans('admin/users/table.username') }}</label> <label class="col-md-3 control-label" for="username">{{ trans('admin/users/table.username') }}</label>
<div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'username')) ? ' required' : '' }}"> <div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'username')) ? ' required' : '' }}">
@if ($user->ldap_import!='1') @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone'))
<input <input
class="form-control" class="form-control"
type="text" type="text"
@ -137,7 +137,7 @@
{{ trans('admin/users/table.password') }} {{ trans('admin/users/table.password') }}
</label> </label>
<div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'password')) ? ' required' : '' }}"> <div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'password')) ? ' required' : '' }}">
@if ($user->ldap_import!='1') @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone') )
<input <input
type="password" type="password"
name="password" name="password"
@ -161,7 +161,7 @@
</div> </div>
</div> </div>
@if ($user->ldap_import!='1') @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone'))
<!-- Password Confirm --> <!-- Password Confirm -->
<div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}"> <div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="password_confirmation"> <label class="col-md-3 control-label" for="password_confirmation">