mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-09 23:24:06 -08:00
And still more
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
parent
a77dcad336
commit
ae2f9571b4
|
|
@ -43,7 +43,7 @@ class IconHelper
|
|||
return 'fa-regular fa-envelope';
|
||||
case 'phone':
|
||||
return 'fa-solid fa-phone';
|
||||
case 'long-arrow':
|
||||
case 'long-arrow-right':
|
||||
return 'fas fa-long-arrow-alt-right';
|
||||
case 'download':
|
||||
return 'fas fa-download';
|
||||
|
|
@ -80,7 +80,9 @@ class IconHelper
|
|||
case 'heart':
|
||||
return 'fas fa-heart';
|
||||
case 'circle':
|
||||
return 'far fa-circle';
|
||||
return 'fa-regular fa-circle';
|
||||
case 'circle-solid':
|
||||
return 'fa-solid fa-circle';
|
||||
case 'due':
|
||||
return 'fas fa-history';
|
||||
case 'import':
|
||||
|
|
@ -135,6 +137,10 @@ class IconHelper
|
|||
return 'fas fa-lock';
|
||||
case 'unlocked':
|
||||
return 'fas fa-lock';
|
||||
case 'locations':
|
||||
return 'fas fa-map-marker-alt';
|
||||
case 'superadmin':
|
||||
return 'fas fa-crown';
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<div style="padding-top: 200px">
|
||||
<img src="{{ config('app.url') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left">
|
||||
<div class="error-content">
|
||||
<h2><i class="fas fa-exclamation-triangle text-yellow"></i> 403 Forbidden.</h2>
|
||||
<h2><x-icon type="warning" class="text-yellow" /> 403 Forbidden.</h2>
|
||||
<p>
|
||||
{!! trans('general.sad_panda', ['link' => config('app.url')]) !!}
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<div class="box-header with-border">
|
||||
<h1 class="box-title">
|
||||
<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>
|
||||
<x-icon type="warning" class="text-orange" />
|
||||
{{ trans('general.maintenance_mode_title') }}
|
||||
</h1>
|
||||
</div><!-- /.box-header -->
|
||||
|
|
|
|||
|
|
@ -255,17 +255,15 @@
|
|||
$("#assigned_user").show();
|
||||
|
||||
$("#selected_status_status").removeClass('text-danger');
|
||||
$("#selected_status_status").removeClass('text-warning');
|
||||
$("#selected_status_status").addClass('text-success');
|
||||
$("#selected_status_status").html('<i class="fas fa-check"></i> {{ trans('admin/hardware/form.asset_deployable')}}');
|
||||
$("#selected_status_status").html('<x-icon type="checkmark" /> {{ trans('admin/hardware/form.asset_deployable')}}');
|
||||
|
||||
|
||||
} else {
|
||||
$("#assignto_selector").hide();
|
||||
$("#selected_status_status").removeClass('text-danger');
|
||||
$("#selected_status_status").removeClass('text-success');
|
||||
$("#selected_status_status").addClass('text-warning');
|
||||
$("#selected_status_status").html('<i class="fas fa-exclamation-triangle"></i> {{ trans('admin/hardware/form.asset_not_deployable')}} ');
|
||||
$("#selected_status_status").addClass('text-danger');
|
||||
$("#selected_status_status").html('<x-icon type="warning" /> {{ trans('admin/hardware/form.asset_not_deployable')}} ');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -324,7 +322,7 @@
|
|||
box_html += '<input type="text" class="form-control" name="asset_tags[' + x + ']" value="{{ (($snipeSettings->auto_increment_prefix!='') && ($snipeSettings->auto_increment_assets=='1')) ? $snipeSettings->auto_increment_prefix : '' }}'+ auto_tag +'" required>';
|
||||
box_html += '</div>';
|
||||
box_html += '<div class="col-md-2 col-sm-12">';
|
||||
box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><i class="fas fa-minus"></i></a>';
|
||||
box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><x-icon type="minus" /></a>';
|
||||
box_html += '</div>';
|
||||
box_html += '</div>';
|
||||
box_html += '</div>';
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@
|
|||
@if ($asset->deleted_at!='')
|
||||
<div class="col-md-12">
|
||||
<div class="callout callout-warning">
|
||||
<i class="icon fas fa-exclamation-triangle"></i>
|
||||
<x-icon type="warning" />
|
||||
{{ trans('admin/users/message.user_deleted_warning') }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -177,13 +177,23 @@
|
|||
</div>
|
||||
|
||||
|
||||
@if ($asset->deleted_at=='')
|
||||
@can('update', $asset)
|
||||
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
|
||||
<a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
|
||||
<x-icon type="edit" />
|
||||
{{ trans('admin/hardware/general.edit') }}
|
||||
</a>
|
||||
</div>
|
||||
@endcan
|
||||
|
||||
|
||||
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
|
||||
@if (($asset->assigned_to != '') && ($asset->deleted_at==''))
|
||||
@can('checkin', \App\Models\Asset::class)
|
||||
<div class="col-md-12 hidden-print">
|
||||
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
|
||||
<span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
|
||||
<a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-primary bg-purple btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
|
||||
<a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-primary bg-purple btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
|
||||
<x-icon type="checkin" />
|
||||
{{ trans('admin/hardware/general.checkin') }}
|
||||
</a>
|
||||
|
|
@ -194,7 +204,7 @@
|
|||
@can('checkout', Asset::class)
|
||||
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
|
||||
<span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
|
||||
<a href="{{ route('hardware.checkout.create', $asset->id) }}" class="btn bg-maroon btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
|
||||
<a href="{{ route('hardware.checkout.create', $asset->id) }}" class="btn btn-sm bg-maroon btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
|
||||
<x-icon type="checkout" />
|
||||
{{ trans('admin/hardware/general.checkout') }}
|
||||
</a>
|
||||
|
|
@ -204,20 +214,12 @@
|
|||
@endif
|
||||
@endif
|
||||
|
||||
@if ($asset->deleted_at=='')
|
||||
@can('update', $asset)
|
||||
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
|
||||
<a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-warning btn-social btn-block hidden-print">
|
||||
<x-icon type="edit" />
|
||||
{{ trans('admin/hardware/general.edit') }}
|
||||
</a>
|
||||
</div>
|
||||
@endcan
|
||||
|
||||
|
||||
@can('audit', \App\Models\Asset::class)
|
||||
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
|
||||
<span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
|
||||
<a href="{{ route('asset.audit.create', $asset->id) }}" class="btn btn-primary btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
|
||||
<a href="{{ route('asset.audit.create', $asset->id) }}" class="btn btn-sm btn-primary btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
|
||||
<x-icon type="audit" />
|
||||
{{ trans('general.audit') }}
|
||||
</a>
|
||||
|
|
@ -228,7 +230,7 @@
|
|||
|
||||
@can('create', $asset)
|
||||
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
|
||||
<a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-info btn-block btn-social hidden-print">
|
||||
<a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-sm btn-info btn-block btn-social hidden-print">
|
||||
<x-icon type="clone" />
|
||||
{{ trans('admin/hardware/general.clone') }}
|
||||
</a>
|
||||
|
|
@ -238,7 +240,7 @@
|
|||
@can('delete', $asset)
|
||||
<div class="col-md-12 hidden-print" style="padding-top: 30px; padding-bottom: 30px;">
|
||||
@if ($asset->deleted_at=='')
|
||||
<button class="btn btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">
|
||||
<button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">
|
||||
|
||||
<x-icon type="delete" />
|
||||
{{ trans('general.delete') }}
|
||||
|
|
@ -247,7 +249,10 @@
|
|||
@else
|
||||
<form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
|
||||
@csrf
|
||||
<button class="btn btn-sm btn-warning btn-block">{{ trans('general.restore') }}</button>
|
||||
<button class="btn btn-sm btn-block btn-warning btn-social delete-asset">
|
||||
<x-icon type="restore" />
|
||||
{{ trans('general.restore') }}
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
|
|
@ -286,7 +291,9 @@
|
|||
@endif
|
||||
|
||||
@if (isset($asset->location))
|
||||
<li><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ $asset->location->name }}</li>
|
||||
<li>
|
||||
<x-icon type="locations" />
|
||||
{{ $asset->location->name }}</li>
|
||||
<li>{{ $asset->location->address }}
|
||||
@if ($asset->location->address2!='')
|
||||
{{ $asset->location->address2 }}
|
||||
|
|
@ -301,7 +308,8 @@
|
|||
</li>
|
||||
@endif
|
||||
<li>
|
||||
<i class="fas fa-calendar hidden-print"></i> {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
|
||||
<x-icon type="calendar" />
|
||||
{{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
|
||||
</li>
|
||||
@if (isset($asset->expected_checkin))
|
||||
<li>
|
||||
|
|
@ -368,20 +376,22 @@
|
|||
</div>
|
||||
<div class="col-md-9">
|
||||
@if (($asset->assignedTo) && ($asset->deleted_at==''))
|
||||
<i class="fas fa-circle text-blue"></i>
|
||||
<x-icon type="circle-solid" class="text-blue" />
|
||||
{{ $asset->assetstatus->name }}
|
||||
<label class="label label-default">{{ trans('general.deployed') }}</label>
|
||||
<label class="label label-default">
|
||||
{{ trans('general.deployed') }}
|
||||
</label>
|
||||
|
||||
<i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i>
|
||||
<x-icon type="long-arrow-right" class="text-orange" />
|
||||
{!! $asset->assignedTo->present()->glyph() !!}
|
||||
{!! $asset->assignedTo->present()->nameUrl() !!}
|
||||
@else
|
||||
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
|
||||
<i class="fas fa-circle text-green"></i>
|
||||
<x-icon type="circle-solid" class="text-green" />
|
||||
@elseif (($asset->assetstatus) && ($asset->assetstatus->pending=='1'))
|
||||
<i class="fas fa-circle text-orange"></i>
|
||||
<x-icon type="circle-solid" class="text-orange" />
|
||||
@else
|
||||
<i class="fas fa-times text-red"></i>
|
||||
<x-icon type="x" class="text-red" />
|
||||
@endif
|
||||
<a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">
|
||||
{{ $asset->assetstatus->name }}</a>
|
||||
|
|
@ -1063,7 +1073,9 @@
|
|||
'id' => 'bulkForm']) }}
|
||||
<input type="hidden" name="bulk_actions" value="labels" />
|
||||
<input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
|
||||
<button class="btn btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}><i class="fas fa-barcode" aria-hidden="true"></i> {{ trans_choice('button.generate_labels', 1) }}</button>
|
||||
<button class="btn btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}>
|
||||
<x-icon type="assets" />
|
||||
{{ trans_choice('button.generate_labels', 1) }}</button>
|
||||
|
||||
{{ Form::close() }}
|
||||
|
||||
|
|
@ -1115,7 +1127,7 @@
|
|||
@else
|
||||
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
<x-icon type="info-circle" />
|
||||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -1170,7 +1182,7 @@
|
|||
</table>
|
||||
@else
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
<x-icon type="info-circle" />
|
||||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -1234,7 +1246,7 @@
|
|||
@else
|
||||
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
<x-icon type="info-circle" />
|
||||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -1394,7 +1406,7 @@
|
|||
<td>
|
||||
@if (($file->filename) && (Storage::exists('private_uploads/assets/'.$file->filename)))
|
||||
<a href="{{ route('show/assetfile', [$asset->id, $file->id, 'download'=>'true']) }}" class="btn btn-sm btn-default">
|
||||
<i class="fas fa-download" aria-hidden="true"></i>
|
||||
<x-icon type="download" />
|
||||
</a>
|
||||
|
||||
<a href="{{ route('show/assetfile', [$asset->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank">
|
||||
|
|
@ -1409,7 +1421,9 @@
|
|||
</td>
|
||||
<td>
|
||||
@can('update', \App\Models\Asset::class)
|
||||
<a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fas fa-trash icon-white" aria-hidden="true"></i></a>
|
||||
<a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}">
|
||||
<x-icon type="delete" />
|
||||
</a>
|
||||
@endcan
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -1420,7 +1434,7 @@
|
|||
@else
|
||||
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
<x-icon type="info-circle" />
|
||||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -1496,7 +1510,7 @@
|
|||
<td>
|
||||
@if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))
|
||||
<a href="{{ route('show/modelfile', [$asset->model->id, $file->id]) }}" class="btn btn-sm btn-default">
|
||||
<i class="fas fa-download" aria-hidden="true"></i>
|
||||
<x-icon type="download" />
|
||||
</a>
|
||||
|
||||
<a href="{{ route('show/modelfile', [$asset->model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank">
|
||||
|
|
@ -1512,7 +1526,9 @@
|
|||
</td>
|
||||
<td>
|
||||
@can('update', \App\Models\AssetModel::class)
|
||||
<a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/modelfile', [$asset->model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fas fa-trash icon-white" aria-hidden="true"></i></a>
|
||||
<a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/modelfile', [$asset->model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}">
|
||||
<x-icon type="delete" /></i>
|
||||
</a>
|
||||
@endcan
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -1523,7 +1539,7 @@
|
|||
@else
|
||||
|
||||
<div class="alert alert-info alert-block">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
<x-icon type="info-circle" />
|
||||
{{ trans('general.no_results') }}
|
||||
</div>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -556,7 +556,7 @@
|
|||
} else if (row.custom_fields[field_column_plain].field_format=='BOOLEAN') {
|
||||
return (row.custom_fields[field_column_plain].value == 1) ? "<span class='fas fa-check-circle' style='color:green'>" : "<span class='fas fa-times-circle' style='color:red' />";
|
||||
} else if (row.custom_fields[field_column_plain].field_format=='EMAIL') {
|
||||
return '<a href="mailto:' + row.custom_fields[field_column_plain].value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><i class="fa-regular fa-envelope" aria-hidden="true"></i> ' + row.custom_fields[field_column_plain].value + '</a>';
|
||||
return '<a href="mailto:' + row.custom_fields[field_column_plain].value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><x-icon type="email" /> ' + row.custom_fields[field_column_plain].value + '</a>';
|
||||
}
|
||||
}
|
||||
return row.custom_fields[field_column_plain].value;
|
||||
|
|
@ -612,7 +612,7 @@
|
|||
|
||||
extra_pretty_index = prettyLog(pretty_index);
|
||||
|
||||
result += extra_pretty_index + ': <del>' + value[index].old + '</del> <x-icon type="long-arrow" /> ' + value[index].new + '<br>'
|
||||
result += extra_pretty_index + ': <del>' + value[index].old + '</del> <x-icon type="long-arrow-right" /> ' + value[index].new + '<br>'
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
@ -664,7 +664,7 @@
|
|||
function assetTagLinkFormatter(value, row) {
|
||||
if ((row.asset) && (row.asset.id)) {
|
||||
if (row.asset.deleted_at!='') {
|
||||
return '<span style="white-space: nowrap;"><i class="fas fa-times text-danger"></i><span class="sr-only">{{ trans('admin/hardware/general.deleted') }}</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.asset_tag + '</a></del></span>';
|
||||
return '<span style="white-space: nowrap;"><x-icon type="x" class="text-danger" /><span class="sr-only">{{ trans('admin/hardware/general.deleted') }}</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.asset_tag + '</a></del></span>';
|
||||
}
|
||||
return '<a href="{{ config('app.url') }}/hardware/' + row.asset.id + '">' + row.asset.asset_tag + '</a>';
|
||||
}
|
||||
|
|
@ -689,7 +689,7 @@
|
|||
|
||||
if ((row.asset) && (row.asset.serial)) {
|
||||
if (row.asset.deleted_at!='') {
|
||||
return '<span style="white-space: nowrap;"><i class="fas fa-times text-danger"></i><span class="sr-only">deleted</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.serial + '</a></del></span>';
|
||||
return '<span style="white-space: nowrap;"><x-icon type="x" class="text-danger" /><span class="sr-only">deleted</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.serial + '</a></del></span>';
|
||||
}
|
||||
return '<a href="{{ config('app.url') }}/hardware/' + row.asset.id + '">' + row.asset.serial + '</a>';
|
||||
}
|
||||
|
|
@ -698,9 +698,9 @@
|
|||
|
||||
function trueFalseFormatter(value) {
|
||||
if ((value) && ((value == 'true') || (value == '1'))) {
|
||||
return '<i class="fas fa-check text-success"></i><span class="sr-only">{{ trans('general.true') }}</span>';
|
||||
return '<x-icon type="checkmark" class="text-success" /><span class="sr-only">{{ trans('general.true') }}</span>';
|
||||
} else {
|
||||
return '<i class="fas fa-times text-danger"></i><span class="sr-only">{{ trans('general.false') }}</span>';
|
||||
return '<x-icon type="x" class="text-danger" /><span class="sr-only">{{ trans('general.false') }}</span>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -787,7 +787,7 @@
|
|||
}
|
||||
function downloadFormatter(value) {
|
||||
if (value) {
|
||||
return '<a href="' + value + '" target="_blank"><i class="fas fa-download"></i></a>';
|
||||
return '<a href="' + value + '" target="_blank"><x-icon type="download" /></a>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -795,7 +795,7 @@
|
|||
if ((value) && (value.url) && (value.inlineable)) {
|
||||
return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>';
|
||||
} else if ((value) && (value.url)) {
|
||||
return '<a href="' + value.url + '" class="btn btn-default"><i class="fas fa-download"></i></a>';
|
||||
return '<a href="' + value.url + '" class="btn btn-default"><x-icon type="download" /></a>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<li class="active">
|
||||
<a href="#details" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fas fa-info-circle fa-2x"></i>
|
||||
<x-icon type="info-circle" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
|
||||
</a>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<li>
|
||||
<a href="#asset" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
|
||||
<x-icon type="assets" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
|
||||
{!! ($user->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
<li>
|
||||
<a href="#licenses" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="far fa-save fa-2x"></i>
|
||||
<x-icon type="licenses" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
|
||||
{!! ($user->licenses->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->licenses->count()).'</badge>' : '' !!}
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
<li>
|
||||
<a href="#consumables" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fas fa-tint fa-2x"></i>
|
||||
<x-icon type="consumables" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}
|
||||
{!! ($user->consumables->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->consumables->count()).'</badge>' : '' !!}
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
<li>
|
||||
<a href="#files" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="far fa-file fa-2x"></i>
|
||||
<x-icon type="files" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
|
||||
{!! ($user->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->uploads->count()).'</badge>' : '' !!}
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
<li>
|
||||
<a href="#history" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fas fa-history fa-2x"></i>
|
||||
<x-icon type="history" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
|
||||
</a>
|
||||
|
|
@ -93,7 +93,8 @@
|
|||
<li>
|
||||
<a href="#managed-locations" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fas fa-map-marker-alt fa-2x"></i></span>
|
||||
<x-icon type="locations" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('admin/users/table.managed_locations') }}
|
||||
{!! ($user->managedLocations->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->managedLocations->count()).'</badge>' : '' !!}
|
||||
</a>
|
||||
|
|
@ -103,8 +104,9 @@
|
|||
@if ($user->managesUsers->count() >= 0 )
|
||||
<li>
|
||||
<a href="#managed-users" data-toggle="tab">
|
||||
<span class="hidden-lg hidden-md">
|
||||
<i class="fa-solid fa-users fa-2x"></i></span>
|
||||
<span class="hidden-lg hidden-md">
|
||||
<x-icon type="users" class="fa-2x" />
|
||||
</span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('admin/users/table.managed_users') }}
|
||||
{!! ($user->managesUsers->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->managesUsers->count()).'</badge>' : '' !!}
|
||||
</a>
|
||||
|
|
@ -115,8 +117,8 @@
|
|||
@can('update', $user)
|
||||
<li class="dropdown pull-right">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<span class="hidden-xs"><i class="fas fa-cog" aria-hidden="true"></i></span>
|
||||
<span class="hidden-lg hidden-md hidden-xl"><i class="fas fa-cog fa-2x" aria-hidden="true"></i></span>
|
||||
<span class="hidden-xs"><x-icon type="cog" /></span>
|
||||
<span class="hidden-lg hidden-md hidden-xl"><x-icon type="cog" class="fa-2x" /></span>
|
||||
|
||||
<span class="hidden-xs hidden-sm">
|
||||
{{ trans('button.actions') }}
|
||||
|
|
@ -137,7 +139,7 @@
|
|||
<li class="pull-right">
|
||||
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
|
||||
<span class="hidden-xs"><x-icon type="paperclip" /></span>
|
||||
<span class="hidden-lg hidden-md hidden-xl"><i class="fas fa-paperclip fa-2x" aria-hidden="true"></i></span>
|
||||
<span class="hidden-lg hidden-md hidden-xl"><x-icon type="paperclip" class="fa-2x" /></span>
|
||||
<span class="hidden-xs hidden-sm">{{ trans('button.upload') }}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -152,7 +154,7 @@
|
|||
@if ($user->deleted_at!='')
|
||||
<div class="col-md-12">
|
||||
<div class="callout callout-warning">
|
||||
<i class="icon fas fa-exclamation-triangle"></i>
|
||||
<x-icon type="warning" />
|
||||
{{ trans('admin/users/message.user_deleted_warning') }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -309,9 +311,13 @@
|
|||
<div class="col-md-9">
|
||||
|
||||
@if ($user->isSuperUser())
|
||||
<label class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><i class="fas fa-crown" title="{{ trans('general.superuser') }}"></i></label>
|
||||
<label class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}">
|
||||
<x-icon type="superadmin" title="{{ trans('general.superuser') }}" />
|
||||
</label>
|
||||
@elseif ($user->hasAccess('admin'))
|
||||
<label class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><i class="fas fa-crown" title="{{ trans('general.admin') }}"></i></label>
|
||||
<label class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}">
|
||||
<x-icon type="superadmin" title="{{ trans('general.admin') }}" />
|
||||
</label>
|
||||
@endif
|
||||
{{ $user->username }}
|
||||
|
||||
|
|
@ -447,7 +453,9 @@
|
|||
{{ trans('admin/users/table.email') }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
<a href="mailto:{{ $user->email }}" data-tooltip="true" title="{{ trans('general.send_email') }}"><i class="fa-regular fa-envelope" aria-hidden="true"></i> {{ $user->email }}</a>
|
||||
<a href="mailto:{{ $user->email }}" data-tooltip="true" title="{{ trans('general.send_email') }}">
|
||||
<x-icon type="email" />
|
||||
{{ $user->email }}</a>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -471,7 +479,9 @@
|
|||
{{ trans('admin/users/table.phone') }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
<a href="tel:{{ $user->phone }}" data-tooltip="true" title="{{ trans('general.call') }}"><i class="fa-solid fa-phone" aria-hidden="true"></i> {{ $user->phone }}</a>
|
||||
<a href="tel:{{ $user->phone }}" data-tooltip="true" title="{{ trans('general.call') }}">
|
||||
<x-icon type="phone" />
|
||||
{{ $user->phone }}</a>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -542,7 +552,13 @@
|
|||
{{ trans('admin/users/general.vip_label') }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! ($user->vip=='1') ? '<i class="fas fa-check fa-fw fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
|
||||
@if ($user->vip=='1')
|
||||
<x-icon type="checkmark" class="fa-fw text-success" />
|
||||
{{ trans('general.yes') }}
|
||||
@else
|
||||
<x-icon type="x" class="fa-fw text-danger" />
|
||||
{{ trans('general.no') }}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -552,7 +568,13 @@
|
|||
{{ trans('admin/users/general.remote') }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! ($user->remote=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
|
||||
@if ($user->remote == '1')
|
||||
<x-icon type="checkmark" class="fa-fw text-success" />
|
||||
{{ trans('general.yes') }}
|
||||
@else
|
||||
<x-icon type="x" class="fa-fw text-danger" />
|
||||
{{ trans('general.no') }}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -562,7 +584,13 @@
|
|||
{{ trans('general.login_enabled') }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! ($user->activated=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
|
||||
@if ($user->activated == '1')
|
||||
<x-icon type="checkmark" class="fa-fw text-success" />
|
||||
{{ trans('general.yes') }}
|
||||
@else
|
||||
<x-icon type="x" class="fa-fw text-danger" />
|
||||
{{ trans('general.no') }}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -572,7 +600,13 @@
|
|||
{{ trans('general.autoassign_licenses') }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! ($user->autoassign_licenses=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
|
||||
@if ($user->autoassign_licenses == '1')
|
||||
<x-icon type="checkmark" class="fa-fw text-success" />
|
||||
{{ trans('general.yes') }}
|
||||
@else
|
||||
<x-icon type="x" class="fa-fw text-danger" />
|
||||
{{ trans('general.no') }}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -583,7 +617,13 @@
|
|||
LDAP
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
{!! ($user->ldap_import=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
|
||||
@if ($user->ldap_import == '1')
|
||||
<x-icon type="checkmark" class="fa-fw text-success" />
|
||||
{{ trans('general.yes') }}
|
||||
@else
|
||||
<x-icon type="x" class="fa-fw text-danger" />
|
||||
{{ trans('general.no') }}
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -596,8 +636,13 @@
|
|||
{{ trans('admin/users/general.two_factor_active') }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
|
||||
{!! ($user->two_factor_active()) ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
|
||||
@if ($user->$user->two_factor_active()) == '1')
|
||||
<x-icon type="checkmark" class="fa-fw text-success" />
|
||||
{{ trans('general.yes') }}
|
||||
@else
|
||||
<x-icon type="x" class="fa-fw text-danger" />
|
||||
{{ trans('general.no') }}
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -608,7 +653,13 @@
|
|||
{{ trans('admin/users/general.two_factor_enrolled') }}
|
||||
</div>
|
||||
<div class="col-md-9" id="two_factor_reset_toggle">
|
||||
{!! ($user->two_factor_active_and_enrolled()) ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no') !!}
|
||||
@if ($user->$user->two_factor_active_and_enrolled()) == '1')
|
||||
<x-icon type="checkmark" class="fa-fw text-success" />
|
||||
{{ trans('general.yes') }}
|
||||
@else
|
||||
<x-icon type="x" class="fa-fw text-danger" />
|
||||
{{ trans('general.no') }}
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -632,7 +683,9 @@
|
|||
<span id="two_factor_resetstatus">
|
||||
</span>
|
||||
<br>
|
||||
<p class="help-block" style="line-height: 1.6;">{{ trans('admin/settings/general.two_factor_reset_help') }}</p>
|
||||
<p class="help-block" style="line-height: 1.6;">
|
||||
{{ trans('admin/settings/general.two_factor_reset_help') }}
|
||||
</p>
|
||||
|
||||
|
||||
</div>
|
||||
|
|
@ -663,7 +716,7 @@
|
|||
{{Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost)}}
|
||||
|
||||
<a id="optional_info" class="text-primary">
|
||||
<i class="fa fa-caret-right fa-2x" id="optional_info_icon"></i>
|
||||
<x-icon type="caret-right" class="fa-2x" id="optional_info_icon" /></i>
|
||||
<strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
|
||||
</a>
|
||||
</div>
|
||||
|
|
@ -932,7 +985,7 @@
|
|||
{{ trans('general.preview_not_available') }}
|
||||
@endif
|
||||
@else
|
||||
<i class="fa fa-times text-danger" aria-hidden="true"></i>
|
||||
<x-icon type="x" class="text-danger" />
|
||||
{{ trans('general.file_not_found') }}
|
||||
@endif
|
||||
</td>
|
||||
|
|
@ -952,7 +1005,7 @@
|
|||
@if ($file->filename)
|
||||
@if (Storage::exists('private_uploads/users/'.$file->filename))
|
||||
<a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-sm btn-default">
|
||||
<i class="fas fa-download" aria-hidden="true"></i>
|
||||
<x-icon type="download" />
|
||||
<span class="sr-only">{{ trans('general.download') }}</span>
|
||||
</a>
|
||||
|
||||
|
|
@ -965,14 +1018,13 @@
|
|||
<td>{{ $file->created_at }}</td>
|
||||
|
||||
<td>
|
||||
<a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?">
|
||||
<i class="fa fa-trash icon-white" aria-hidden="true"></i>
|
||||
<a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="{{ trans('general.delete') }} {{ $file->filename }}?">
|
||||
<x-icon type="deletet" class="fa-2x" />
|
||||
<span class="sr-only">{{ trans('general.delete') }}</span>
|
||||
</a>
|
||||
</td>
|
||||
|
||||
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
|
|
@ -1117,7 +1169,7 @@ $(function () {
|
|||
$("#two_factor_resetrow").removeClass('success');
|
||||
$("#two_factor_resetrow").removeClass('danger');
|
||||
$("#two_factor_resetstatus").html('');
|
||||
$("#two_factor_reseticon").html('<i class="fas fa-spinner spin"></i>');
|
||||
$("#two_factor_reseticon").html('<x-icon type="spinner" />');
|
||||
$.ajax({
|
||||
url: '{{ route('api.users.two_factor_reset', ['id'=> $user->id]) }}',
|
||||
type: 'POST',
|
||||
|
|
@ -1129,15 +1181,15 @@ $(function () {
|
|||
dataType: 'json',
|
||||
|
||||
success: function (data) {
|
||||
$("#two_factor_reset_toggle").html('').html('<span class="text-danger"><i class="fas fa-times" aria-hidden="true"></i> {{ trans('general.no') }}</span>');
|
||||
$("#two_factor_reset_toggle").html('').html('<span class="text-danger"><x-icon type="x" /> {{ trans('general.no') }}</span>');
|
||||
$("#two_factor_reseticon").html('');
|
||||
$("#two_factor_resetstatus").html('<span class="text-success"><i class="fas fa-check"></i> ' + data.message + '</span>');
|
||||
$("#two_factor_resetstatus").html('<span class="text-success"><x-icon type="checkmark" class="fa-2x" /> ' + data.message + '</span>');
|
||||
|
||||
},
|
||||
|
||||
error: function (data) {
|
||||
$("#two_factor_reseticon").html('');
|
||||
$("#two_factor_reseticon").html('<i class="fas fa-exclamation-triangle text-danger"></i>');
|
||||
$("#two_factor_reseticon").html('<x-icon type="warning" class="text-danger" />');
|
||||
$('#two_factor_resetstatus').text(data.message);
|
||||
}
|
||||
|
||||
|
|
@ -1179,13 +1231,13 @@ $(function () {
|
|||
var errorMessage = data.jqXHR.responseJSON.messages["file.0"];
|
||||
$('#progress-bar-text').html(errorMessage[0]);
|
||||
$('.progress-bar').removeClass('progress-bar-warning').addClass('progress-bar-danger').css('width','100%');
|
||||
$('.progress-checkmark').fadeIn('fast').html('<i class="fas fa-times fa-3x icon-white" style="color: #d9534f"></i>');
|
||||
$('.progress-checkmark').fadeIn('fast').html('<x-icon type="xt" class="fa-3x text-danger" />');
|
||||
} else {
|
||||
$('.progress-bar').removeClass('progress-bar-warning').addClass('progress-bar-success').css('width','100%');
|
||||
$('.progress-checkmark').fadeIn('fast');
|
||||
$('#progress-container').delay(950).css('visibility', 'visible');
|
||||
$('.progress-bar-text').html('Finished!');
|
||||
$('.progress-checkmark').fadeIn('fast').html('<i class="fas fa-check fa-3x icon-white" style="color: green"></i>');
|
||||
$('.progress-checkmark').fadeIn('fast').html('<x-icon type="checkmark" class="fa-3x text-success" />');
|
||||
$.each(data.result, function (index, file) {
|
||||
$('<tr><td>' + file.note + '</td><<td>' + file.filename + '</td></tr>').prependTo("#files-table > tbody");
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue