Moved a few of the user edit fields to make more sense (optional stuff further down)
This commit is contained in:
snipe
parent
644084658a
commit
10cadecd14
1 changed files with 61 additions and 57 deletions
|
|
@ -188,7 +188,46 @@
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<!-- Email -->
|
<!-- Activation Status -->
|
||||||
|
<div class="form-group {{ $errors->has('activated') ? 'has-error' : '' }}">
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="col-md-3 control-label">
|
||||||
|
{{ Form::label('activated', trans('general.login_enabled')) }}
|
||||||
|
</div>
|
||||||
|
<div class="col-md-9">
|
||||||
|
@if (config('app.lock_passwords'))
|
||||||
|
<div class="icheckbox disabled" style="padding-left: 10px;">
|
||||||
|
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled" aria-label="activated">
|
||||||
|
<!-- this is necessary because the field is disabled and will reset -->
|
||||||
|
<input type="hidden" name="activated" value="{{ $user->activated }}">
|
||||||
|
{{ trans('admin/users/general.activated_help_text') }}
|
||||||
|
<p class="help-block">{{ trans('general.feature_disabled') }}</p>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
@elseif ($user->id === Auth::user()->id)
|
||||||
|
<div class="icheckbox disabled" style="padding-left: 10px;">
|
||||||
|
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
|
||||||
|
<!-- this is necessary because the field is disabled and will reset -->
|
||||||
|
<input type="hidden" name="activated" value="1" aria-label="activated">
|
||||||
|
{{ trans('admin/users/general.activated_help_text') }}
|
||||||
|
<p class="help-block">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
<div style="padding-left: 10px;">
|
||||||
|
<input type="checkbox" value="1" id="activated" name="activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
|
||||||
|
{{ trans('admin/users/general.activated_help_text') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
{!! $errors->first('activated', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Email -->
|
||||||
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
|
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
|
||||||
<label class="col-md-3 control-label" for="email">{{ trans('admin/users/table.email') }} </label>
|
<label class="col-md-3 control-label" for="email">{{ trans('admin/users/table.email') }} </label>
|
||||||
<div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'email')) ? ' required' : '' }}">
|
<div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'email')) ? ' required' : '' }}">
|
||||||
|
|
@ -209,6 +248,27 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Email user -->
|
||||||
|
@if (!$user->id)
|
||||||
|
<div class="form-group" id="email_user_row">
|
||||||
|
<div class="col-sm-3">
|
||||||
|
</div>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<div class="icheckbox disabled" id="email_user_div">
|
||||||
|
{{ Form::checkbox('email_user', '1', Request::old('email_user'),['class' => 'minimal', 'disabled'=>true, 'id' => 'email_user_checkbox']) }}
|
||||||
|
Email this user their credentials?
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<p class="help-block">
|
||||||
|
{{ trans('admin/users/general.send_email_help') }}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div> <!--/form-group-->
|
||||||
|
@endif
|
||||||
|
|
||||||
<!-- Company -->
|
<!-- Company -->
|
||||||
@if (\App\Models\Company::canManageUsersCompanies())
|
@if (\App\Models\Company::canManageUsersCompanies())
|
||||||
@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.select_company'), 'fieldname' => 'company_id'])
|
@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.select_company'), 'fieldname' => 'company_id'])
|
||||||
|
|
@ -347,63 +407,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Activation Status -->
|
|
||||||
<div class="form-group {{ $errors->has('activated') ? 'has-error' : '' }}">
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<div class="col-md-3 control-label">
|
|
||||||
{{ Form::label('activated', trans('admin/users/table.activated')) }}
|
|
||||||
</div>
|
|
||||||
<div class="col-md-9">
|
|
||||||
@if (config('app.lock_passwords'))
|
|
||||||
<div class="icheckbox disabled" style="padding-left: 10px;">
|
|
||||||
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled" aria-label="activated">
|
|
||||||
<!-- this is necessary because the field is disabled and will reset -->
|
|
||||||
<input type="hidden" name="activated" value="{{ $user->activated }}">
|
|
||||||
{{ trans('admin/users/general.activated_help_text') }}
|
|
||||||
<p class="help-block">{{ trans('general.feature_disabled') }}</p>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
@elseif ($user->id === Auth::user()->id)
|
|
||||||
<div class="icheckbox disabled" style="padding-left: 10px;">
|
|
||||||
<input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
|
|
||||||
<!-- this is necessary because the field is disabled and will reset -->
|
|
||||||
<input type="hidden" name="activated" value="1" aria-label="activated">
|
|
||||||
{{ trans('admin/users/general.activated_help_text') }}
|
|
||||||
<p class="help-block">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
|
|
||||||
</div>
|
|
||||||
@else
|
|
||||||
<div style="padding-left: 10px;">
|
|
||||||
<input type="checkbox" value="1" id="activated" name="activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
|
|
||||||
{{ trans('admin/users/general.activated_help_text') }}
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
{!! $errors->first('activated', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Email user -->
|
|
||||||
@if (!$user->id)
|
|
||||||
<div class="form-group" id="email_user_row">
|
|
||||||
<div class="col-sm-3">
|
|
||||||
</div>
|
|
||||||
<div class="col-md-9">
|
|
||||||
<div class="icheckbox disabled" id="email_user_div">
|
|
||||||
{{ Form::checkbox('email_user', '1', Request::old('email_user'),['class' => 'minimal', 'disabled'=>true, 'id' => 'email_user_checkbox']) }}
|
|
||||||
Email this user their credentials?
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<p class="help-block">
|
|
||||||
{{ trans('admin/users/general.send_email_help') }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div> <!--/form-group-->
|
|
||||||
@endif
|
|
||||||
|
|
||||||
@if ($snipeSettings->two_factor_enabled!='')
|
@if ($snipeSettings->two_factor_enabled!='')
|
||||||
@if ($snipeSettings->two_factor_enabled=='1')
|
@if ($snipeSettings->two_factor_enabled=='1')
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue