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

Reworked the layout of the confirm merge form a little

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-03-17 16:42:41 -07:00
parent fb54a21e12
commit 820ae09a6f
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
resources/views/users/confirm-merge.blade.php
View file

@ -7,19 +7,25 @@
{{-- Page content --}} {{-- Page content --}}
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-md-10 col-md-offset-1"> <div class="col-md-10 col-md-offset-1">
<div class="box box-default"> <div class="box box-default">
<form class="form-horizontal" role="form" method="post" action="{{ route('users.merge.save') }}"> <form class="form-horizontal" role="form" method="post" action="{{ route('users.merge.save') }}">
<div class="box-body"> <div class="box-body">
<div class="col-md-12">
<p style="padding:10px">
{{ trans('general.merge_information', array('count' => count($users))) }}
</p>
</div>
<!-- CSRF Token --> <!-- CSRF Token -->
{{csrf_field()}} {{csrf_field()}}
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="callout callout-danger"> <div class="callout callout-danger">
<i class="fas fa-exclamation-triangle"></i> <i class="fas fa-exclamation-triangle"></i>
{{ trans('general.warning_merge_information', array('count' => count($users))) }} {{ trans('general.warning_merge_information') }}
</div> </div>
</div> </div>
</div> </div>
@ -39,7 +45,6 @@
<table class="display table table-hover"> <table class="display table table-hover">
<thead> <thead>
<tr> <tr>
<th></th>
<th class="col-md-3">{{ trans('general.name') }}</th> <th class="col-md-3">{{ trans('general.name') }}</th>
<th class="col-md-3">{{ trans('general.email') }}</th> <th class="col-md-3">{{ trans('general.email') }}</th>
<th class="col-md-3">{{ trans('general.username') }}</th> <th class="col-md-3">{{ trans('general.username') }}</th>
@ -66,14 +71,8 @@
@foreach ($users as $user) @foreach ($users as $user)
<tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}> <tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
<td> <td>
<input type="radio" name="merge_into_id" value="{{ $user->id }}" class="minimal" checked="checked"> <input type="radio" name="merge_into_id" id="{{ $user->id }}" value="{{ $user->id }}" class="minimal">
</td> <label for="{{ $user->id }}"> {{ $user->present()->fullName() }}</label>
<td>
<span {!! (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') !!}>
{{ $user->present()->fullName() }}
</span>
{{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }}
</td> </td>
<td> <td>
{{ $user->email }} {{ $user->email }}
@ -112,7 +111,7 @@
</div> <!--/box-body--> </div> <!--/box-body-->
<div class="box-footer text-right"> <div class="box-footer text-right">
<a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }}><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button> <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }} disabled="disabled"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
@foreach ($users as $user) @foreach ($users as $user)
@ -128,4 +127,17 @@
@section('moar_scripts') @section('moar_scripts')
@if (!(config('app.lock_passwords')))
<script>
$('button[type="submit"]').prop("disabled", true);
$('input').on('ifChecked', function(event) {
$(' button[type="submit"]').prop("disabled", false);
});
</script>
@endif
@stop @stop