DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Updated icons

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-08-18 17:26:44 +01:00
parent 901f4df7ee
commit bffba02511
41 changed files with 202 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/Helpers/IconHelper.php
View file

@ -34,7 +34,7 @@ class IconHelper
case 'user': case 'user':
return 'fa-solid fa-user'; return 'fa-solid fa-user';
case 'users': case 'users':
return 'fas fa-users fa-fw'; return 'fas fa-users';
case 'restore': case 'restore':
return 'fa-solid fa-trash-arrow-up'; return 'fa-solid fa-trash-arrow-up';
case 'external-link': case 'external-link':
@ -50,39 +50,39 @@ class IconHelper
case 'checkmark': case 'checkmark':
return 'fas fa-check icon-white'; return 'fas fa-check icon-white';
case 'x': case 'x':
return 'fas fa-times fa-fw'; return 'fas fa-times';
case 'logout': case 'logout':
return 'fa fa-sign-out fa-fw'; return 'fa fa-sign-out';
case 'admin-settings': case 'admin-settings':
return 'fa fa-cogs fa-fw'; return 'fa fa-cogs';
case 'settings': case 'settings':
return 'fa fa-sign-out fa-fw'; return 'fa fa-sign-out';
case 'angle-left': case 'angle-left':
return 'fa fa-angle-left'; return 'fa fa-angle-left';
case 'warning': case 'warning':
return 'fas fa-exclamation-triangle'; return 'fas fa-exclamation-triangle';
case 'kits': case 'kits':
return 'fa fa-object-group fa-fw'; return 'fa fa-object-group';
case 'assets': case 'assets':
return 'fas fa-barcode fa-fw'; return 'fas fa-barcode';
case 'accessories': case 'accessories':
return 'far fa-keyboard fa-fw'; return 'far fa-keyboard';
case 'components': case 'components':
return 'far fa-hdd fa-fw'; return 'far fa-hdd';
case 'consumables': case 'consumables':
return 'fas fa-tint fa-fw'; return 'fas fa-tint';
case 'licenses': case 'licenses':
return 'far fa-save fa-fw'; return 'far fa-save';
case 'requestable': case 'requestable':
return 'fa fa-laptop fa-fw'; return 'fa fa-laptop';
case 'reports': case 'reports':
return 'fas fa-chart-bar fa-fw'; return 'fas fa-chart-bar';
case 'heart': case 'heart':
return 'fas fa-heart'; return 'fas fa-heart';
case 'circle': case 'circle':
return 'far fa-circle'; return 'far fa-circle';
case 'due': case 'due':
return 'fas fa-history fa-fw'; return 'fas fa-history';
case 'import': case 'import':
return 'fas fa-cloud-upload-alt fa-fw'; return 'fas fa-cloud-upload-alt fa-fw';
case 'search': case 'search':
@ -90,19 +90,23 @@ class IconHelper
case 'alerts': case 'alerts':
return 'far fa-flag'; return 'far fa-flag';
case 'password': case 'password':
return 'fa-solid fa-asterisk fa-fw'; return 'fa fa-key';
case 'api-key': case 'api-key':
return 'fa-solid fa-user-secret fa-fw'; return 'fa-solid fa-user-secret';
case 'nav-toggle': case 'nav-toggle':
return 'fas fa-bars'; return 'fas fa-bars';
case 'dashboard': case 'dashboard':
return 'fas fa-tachometer-alt fa-fw'; return 'fas fa-tachometer-alt';
case 'info-circle': case 'info-circle':
return 'fas fa-info-circle'; return 'fas fa-info-circle';
case 'carat-right': case 'carat-right':
return 'fa fa-caret-right'; return 'fa fa-caret-right';
case 'carat-up': case 'carat-up':
return 'fa fa-caret-up'; return 'fa fa-caret-up';
case 'arrow-circle-right':
return 'fa fa-arrow-circle-right';
case 'minus':
return 'fas fa-minus';
} }
} }
} }

2
resources/views/account/change-password.blade.php
View file

@ -59,7 +59,7 @@
</div> <!-- .box-body --> </div> <!-- .box-body -->
<div class="box-footer text-right"> <div class="box-footer text-right">
<a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> <!-- .box-default --> </div> <!-- .box-default -->

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

@ -174,7 +174,7 @@
</div> <!-- .box-body --> </div> <!-- .box-body -->
<div class="text-right box-footer"> <div class="text-right box-footer">
<a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> <!-- .box-default --> </div> <!-- .box-default -->
{{ Form::close() }} {{ Form::close() }}

2
resources/views/asset_maintenances/edit.blade.php
View file

@ -123,7 +123,7 @@
</div> <!-- .box-body --> </div> <!-- .box-body -->
<div class="box-footer text-right"> <div class="box-footer text-right">
<button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-success"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> <!-- .box-default --> </div> <!-- .box-default -->
</form> </form>

4
resources/views/auth/login.blade.php
View file

@ -58,7 +58,7 @@
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<label for="username"> <label for="username">
<i class="fas fa-user" aria-hidden="true"></i> <x-icon type="user" />
{{ trans('admin/users/table.username') }} {{ trans('admin/users/table.username') }}
</label> </label>
<input class="form-control" placeholder="{{ trans('admin/users/table.username') }}" name="username" type="text" id="username" autocomplete="{{ (config('auth.login_autocomplete') === true) ? 'on' : 'off' }}" autofocus> <input class="form-control" placeholder="{{ trans('admin/users/table.username') }}" name="username" type="text" id="username" autocomplete="{{ (config('auth.login_autocomplete') === true) ? 'on' : 'off' }}" autofocus>
@ -66,7 +66,7 @@
</div> </div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label for="password"> <label for="password">
<i class="fa fa-key" aria-hidden="true"></i> <x-icon type="password" />
{{ trans('admin/users/table.password') }} {{ trans('admin/users/table.password') }}
</label> </label>
<input class="form-control" placeholder="{{ trans('admin/users/table.password') }}" name="password" type="password" id="password" autocomplete="{{ (config('auth.login_autocomplete') === true) ? 'on' : 'off' }}"> <input class="form-control" placeholder="{{ trans('admin/users/table.password') }}" name="password" type="password" id="password" autocomplete="{{ (config('auth.login_autocomplete') === true) ? 'on' : 'off' }}">

8
resources/views/auth/passwords/email.blade.php
View file

@ -37,7 +37,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="alert alert-info"> <div class="alert alert-info">
<i class="fas fa-info-circle" aria-hidden="true"></i> <x-icon type="info-circle" />
{!! trans('auth/general.username_help_top') !!} {!! trans('auth/general.username_help_top') !!}
</div> </div>
</div> </div>
@ -55,7 +55,7 @@
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<div class="col-md-12"> <div class="col-md-12">
<label for="username"><i class="fas fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username') }} </label> <label for="username"><x-icon type="user" /> {{ trans('admin/users/table.username') }} </label>
<input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="{{ trans('admin/users/table.username') }}" aria-label="username"> <input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="{{ trans('admin/users/table.username') }}" aria-label="username">
{!! $errors->first('username', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!} {!! $errors->first('username', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
</div> </div>
@ -67,13 +67,13 @@
<br> <br>
<!-- show help text toggle --> <!-- show help text toggle -->
<a href="#" id="show"> <a href="#" id="show">
<i class="fa fa-caret-right"></i> <x-icon type="caret-right" />
{{ trans('general.show_help') }} {{ trans('general.show_help') }}
</a> </a>
<!-- hide help text toggle --> <!-- hide help text toggle -->
<a href="#" id="hide" style="display:none"> <a href="#" id="hide" style="display:none">
<i class="fa fa-caret-up"></i> <x-icon type="caret-up" />
{{ trans('general.hide_help') }} {{ trans('general.hide_help') }}
</a> </a>

3
resources/views/blade/icon.blade.php
View file

@ -1,5 +1,4 @@
@props([ @props([
'type' => '', 'type' => '',
]) ])
<i class="{{ Icon::icon($type) }} {{ $attributes->get('class') }}" <i class="{{ Icon::icon($type) }} {{ $attributes->get('class') }}"{{ isset($style) ? $attributes->merge(['style' => $style]) : '' }} aria-hidden="true"></i>
aria-hidden="true" {{ isset($style) ? 'style="'.$attributes->get('style').'"' : '' }}></i>

2
resources/views/blade/redirect_submit_options.blade.php
View file

@ -27,7 +27,7 @@
@endif @endif
<button type="submit" class="btn btn-primary pull-right{{ ($disabled_select ? ' disabled' : '') }}" style="margin-left:5px; border-radius: 3px;"{!! ($disabled_select ? ' data-tooltip="true" title="'.trans('admin/hardware/general.edit').'" disabled' : '') !!}> <button type="submit" class="btn btn-primary pull-right{{ ($disabled_select ? ' disabled' : '') }}" style="margin-left:5px; border-radius: 3px;"{!! ($disabled_select ? ' data-tooltip="true" title="'.trans('admin/hardware/general.edit').'" disabled' : '') !!}>
<i class="fas fa-check icon-white" aria-hidden="true"></i> <x-icon type="checkmark" />
{{ $button_label }} {{ $button_label }}
</button> </button>

27
resources/views/components/view.blade.php
View file

@ -203,15 +203,15 @@
</td> </td>
<td> <td>
@if ($file->filename) @if ($file->filename)
<a href="{{ route('show.componentfile', [$component->id, $file->id]) }}" class="btn btn-sm btn-default"> <nobr><a href="{{ route('show.componentfile', [$component->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> <span class="sr-only">{{ trans('general.download') }}</span>
</a> </a>
<a href="{{ route('show.componentfile', [$component->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank"> <a href="{{ route('show.componentfile', [$component->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
<i class="fa fa-external-link" aria-hidden="true"></i> <x-icon type="external-link" />
</a> </a>
</nobr>
@endif @endif
</td> </td>
<td>{{ $file->created_at }}</td> <td>{{ $file->created_at }}</td>
@ -284,7 +284,26 @@
</div> </div>
@endif @endif
@can('checkout', Component::class)
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
<a href="{{ route('components.checkout.show', $component->id) }}" class="btn bg-maroon btn-social btn-block hidden-print">
<x-icon type="checkout" />
{{ trans('admin/components/general.checkout') }}
</a>
</div> </div>
@can('update', $component)
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
<a href="{{ route('components.edit', $component->id) }}" class="btn btn-warning btn-social btn-block hidden-print">
<x-icon type="edit" />
{{ trans('admin/components/general.edit') }}
</a>
</div>
@endcan
@endcan
</div>
</div> <!-- .row--> </div> <!-- .row-->
@can('components.files', Component::class) @can('components.files', Component::class)

72
resources/views/dashboard.blade.php
View file

@ -37,10 +37,12 @@
<p>{{ strtolower(trans('general.assets')) }}</p> <p>{{ strtolower(trans('general.assets')) }}</p>
</div> </div>
<div class="icon" aria-hidden="true"> <div class="icon" aria-hidden="true">
<i class="fas fa-barcode" aria-hidden="true"></i> <x-icon type="assets" />
</div> </div>
@can('index', \App\Models\Asset::class) @can('index', \App\Models\Asset::class)
<a href="{{ route('hardware.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a> <a href="{{ route('hardware.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan @endcan
</div> </div>
</a> </a>
@ -55,10 +57,12 @@
<p>{{ strtolower(trans('general.licenses')) }}</p> <p>{{ strtolower(trans('general.licenses')) }}</p>
</div> </div>
<div class="icon" aria-hidden="true"> <div class="icon" aria-hidden="true">
<i class="far fa-save"></i> <x-icon type="licenses" />
</div> </div>
@can('view', \App\Models\License::class) @can('view', \App\Models\License::class)
<a href="{{ route('licenses.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a> <a href="{{ route('licenses.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan @endcan
</div> </div>
</a> </a>
@ -74,10 +78,12 @@
<p>{{ strtolower(trans('general.accessories')) }}</p> <p>{{ strtolower(trans('general.accessories')) }}</p>
</div> </div>
<div class="icon" aria-hidden="true"> <div class="icon" aria-hidden="true">
<i class="far fa-keyboard"></i> <x-icon type="accessories" />
</div> </div>
@can('index', \App\Models\Accessory::class) @can('index', \App\Models\Accessory::class)
<a href="{{ route('accessories.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a> <a href="{{ route('accessories.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan @endcan
</div> </div>
</a> </a>
@ -93,10 +99,12 @@
<p>{{ strtolower(trans('general.consumables')) }}</p> <p>{{ strtolower(trans('general.consumables')) }}</p>
</div> </div>
<div class="icon" aria-hidden="true"> <div class="icon" aria-hidden="true">
<i class="fas fa-tint"></i> <x-icon type="consumables" />
</div> </div>
@can('index', \App\Models\Consumable::class) @can('index', \App\Models\Consumable::class)
<a href="{{ route('consumables.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a> <a href="{{ route('consumables.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan @endcan
</div> </div>
</div><!-- ./col --> </div><!-- ./col -->
@ -110,10 +118,12 @@
<p>{{ strtolower(trans('general.components')) }}</p> <p>{{ strtolower(trans('general.components')) }}</p>
</div> </div>
<div class="icon" aria-hidden="true"> <div class="icon" aria-hidden="true">
<i class="far fa-hdd"></i> <x-icon type="components" />
</div> </div>
@can('view', \App\Models\License::class) @can('view', \App\Models\License::class)
<a href="{{ route('components.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a> <a href="{{ route('components.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan @endcan
</div> </div>
</a> </a>
@ -128,10 +138,12 @@
<p>{{ strtolower(trans('general.people')) }}</p> <p>{{ strtolower(trans('general.people')) }}</p>
</div> </div>
<div class="icon" aria-hidden="true"> <div class="icon" aria-hidden="true">
<i class="fas fa-users"></i> <x-icon type="users" />
</div> </div>
@can('view', \App\Models\License::class) @can('view', \App\Models\License::class)
<a href="{{ route('users.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a> <a href="{{ route('users.index') }}" class="small-box-footer">{{ trans('general.view_all') }}
<x-icon type="arrow-circle-right" />
</a>
@endcan @endcan
</div> </div>
</a> </a>
@ -201,7 +213,7 @@
<h2 class="box-title">{{ trans('general.recent_activity') }}</h2> <h2 class="box-title">{{ trans('general.recent_activity') }}</h2>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true"> <button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
<i class="fas fa-minus" aria-hidden="true"></i> <x-icon type="minus" />
<span class="sr-only">{{ trans('general.collapse') }}</span> <span class="sr-only">{{ trans('general.collapse') }}</span>
</button> </button>
</div> </div>
@ -253,7 +265,7 @@
</h2> </h2>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true"> <button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
<i class="fas fa-minus" aria-hidden="true"></i> <x-icon type="minus" />
<span class="sr-only">{{ trans('general.collapse') }}</span> <span class="sr-only">{{ trans('general.collapse') }}</span>
</button> </button>
</div> </div>
@ -282,7 +294,7 @@
<h2 class="box-title">{{ trans('general.companies') }}</h2> <h2 class="box-title">{{ trans('general.companies') }}</h2>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"> <button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fas fa-minus" aria-hidden="true"></i> <x-icon type="minus" />
<span class="sr-only">{{ trans('general.collapse') }}</span> <span class="sr-only">{{ trans('general.collapse') }}</span>
</button> </button>
</div> </div>
@ -307,27 +319,27 @@
<tr> <tr>
<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="companiesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th> <th class="col-sm-3" data-visible="true" data-field="name" data-formatter="companiesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
<th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
<i class="fas fa-users" aria-hidden="true"></i> <x-icon type="users" />
<span class="sr-only">{{ trans('general.people') }}</span> <span class="sr-only">{{ trans('general.people') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
<i class="fas fa-barcode" aria-hidden="true"></i> <x-icon type="assets" />
<span class="sr-only">{{ trans('general.asset_count') }}</span> <span class="sr-only">{{ trans('general.asset_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
<i class="far fa-keyboard" aria-hidden="true"></i> <x-icon type="accessories" />
<span class="sr-only">{{ trans('general.accessories_count') }}</span> <span class="sr-only">{{ trans('general.accessories_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
<i class="fas fa-tint" aria-hidden="true"></i> <x-icon type="consumables" />
<span class="sr-only">{{ trans('general.consumables_count') }}</span> <span class="sr-only">{{ trans('general.consumables_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
<i class="far fa-hdd" aria-hidden="true"></i> <x-icon type="components" />
<span class="sr-only">{{ trans('general.components_count') }}</span> <span class="sr-only">{{ trans('general.components_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
<i class="far fa-save" aria-hidden="true"></i> <x-icon type="licenses" />
<span class="sr-only">{{ trans('general.licenses_count') }}</span> <span class="sr-only">{{ trans('general.licenses_count') }}</span>
</th> </th>
</tr> </tr>
@ -350,7 +362,7 @@
<h2 class="box-title">{{ trans('general.locations') }}</h2> <h2 class="box-title">{{ trans('general.locations') }}</h2>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"> <button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fas fa-minus" aria-hidden="true"></i> <x-icon type="minus" />
<span class="sr-only">{{ trans('general.collapse') }}</span> <span class="sr-only">{{ trans('general.collapse') }}</span>
</button> </button>
</div> </div>
@ -376,7 +388,7 @@
<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th> <th class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
<th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
<i class="fas fa-barcode" aria-hidden="true"></i> <x-icon type="assets" />
<span class="sr-only">{{ trans('general.asset_count') }}</span> <span class="sr-only">{{ trans('general.asset_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
@ -384,7 +396,7 @@
{{ trans('general.assigned') }} {{ trans('general.assigned') }}
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
<i class="fas fa-users" aria-hidden="true"></i> <x-icon type="users" />
<span class="sr-only">{{ trans('general.people') }}</span> <span class="sr-only">{{ trans('general.people') }}</span>
</th> </th>
@ -413,7 +425,7 @@
<h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.categories') }}</h2> <h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.categories') }}</h2>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"> <button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fas fa-minus" aria-hidden="true"></i> <x-icon type="minus" />
<span class="sr-only">{{ trans('general.collapse') }}</span> <span class="sr-only">{{ trans('general.collapse') }}</span>
</button> </button>
</div> </div>
@ -441,23 +453,23 @@
{{ trans('general.type') }} {{ trans('general.type') }}
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
<i class="fas fa-barcode" aria-hidden="true"></i> <x-icon type="assets" />
<span class="sr-only">{{ trans('general.asset_count') }}</span> <span class="sr-only">{{ trans('general.asset_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
<i class="far fa-keyboard" aria-hidden="true"></i> <x-icon type="licenses" />
<span class="sr-only">{{ trans('general.accessories_count') }}</span> <span class="sr-only">{{ trans('general.accessories_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
<i class="fas fa-tint" aria-hidden="true"></i> <x-icon type="consumables" />
<span class="sr-only">{{ trans('general.consumables_count') }}</span> <span class="sr-only">{{ trans('general.consumables_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
<i class="far fa-hdd" aria-hidden="true"></i> <x-icon type="components" />
<span class="sr-only">{{ trans('general.components_count') }}</span> <span class="sr-only">{{ trans('general.components_count') }}</span>
</th> </th>
<th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true"> <th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
<i class="far fa-save" aria-hidden="true"></i> <x-icon type="licenses" />
<span class="sr-only">{{ trans('general.licenses_count') }}</span> <span class="sr-only">{{ trans('general.licenses_count') }}</span>
</th> </th>
</tr> </tr>

2
resources/views/hardware/audit.blade.php
View file

@ -136,7 +136,7 @@
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success pull-right{{ (!$asset->model ? ' disabled' : '') }}"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'" disabled' : '') !!}> <button type="submit" class="btn btn-success pull-right{{ (!$asset->model ? ' disabled' : '') }}"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'" disabled' : '') !!}>
<i class="fas fa-check icon-white" aria-hidden="true"></i> <x-icon type="checkmark" />
{{ trans('general.audit') }} {{ trans('general.audit') }}
</button> </button>
</div> </div>

2
resources/views/hardware/bulk-checkout.blade.php
View file

@ -86,7 +86,7 @@
</div> <!--./box-body--> </div> <!--./box-body-->
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button> <button type="submit" class="btn btn-primary pull-right"><x-icon type="checkmark" /> {{ trans('general.checkout') }}</button>
</div> </div>
</div> </div>
</form> </form>

2
resources/views/hardware/bulk-delete.blade.php
View file

@ -59,7 +59,7 @@
<div class="box-footer text-right"> <div class="box-footer text-right">
<a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.delete') }}</button> <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('button.delete') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</div><!-- /.box --> </div><!-- /.box -->
</form> </form>

2
resources/views/hardware/bulk-restore.blade.php
View file

@ -53,7 +53,7 @@
<div class="box-footer text-right"> <div class="box-footer text-right">
<a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.restore') }}</button> <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('button.restore') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</div><!-- /.box --> </div><!-- /.box -->
</form> </form>

2
resources/views/hardware/bulk.blade.php
View file

@ -226,7 +226,7 @@
</div> <!--/.box-body--> </div> <!--/.box-body-->
<div class="text-right box-footer"> <div class="text-right box-footer">
<button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-success"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> <!--/.box.box-default--> </div> <!--/.box.box-default-->
</form> </form>

2
resources/views/hardware/quickscan-checkin.blade.php
View file

@ -69,7 +69,7 @@
</div> <!--/.box-body--> </div> <!--/.box-body-->
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a>
<button type="submit" id="checkin_button" class="btn btn-success pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkin') }}</button> <button type="submit" id="checkin_button" class="btn btn-success pull-right"><x-icon type="checkmark" /> {{ trans('general.checkin') }}</button>
</div> </div>

2
resources/views/hardware/quickscan.blade.php
View file

@ -88,7 +88,7 @@
</div> <!--/.box-body--> </div> <!--/.box-body-->
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a>
<button type="submit" id="audit_button" class="btn btn-success pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.audit') }}</button> <button type="submit" id="audit_button" class="btn btn-success pull-right"><x-icon type="checkmark" /> {{ trans('general.audit') }}</button>
</div> </div>

2
resources/views/kits/checkout.blade.php
View file

@ -68,7 +68,7 @@
</div> <!--./box-body--> </div> <!--./box-body-->
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-link" href="{{ route('kits.index') }}"> {{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ route('kits.index') }}"> {{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success pull-right"><i class="fas fa-check icon-white"></i> {{ trans('general.checkout') }}</button> <button type="submit" class="btn btn-success pull-right"><x-icon type="checkmark" /> {{ trans('general.checkout') }}</button>
</div> </div>
</div> </div>
</form> </form>

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

@ -145,7 +145,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('index', \App\Models\Asset::class) @can('index', \App\Models\Asset::class)
<li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!}> <li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
<a href="{{ url('hardware') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=1" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.assets') }}"> <a href="{{ url('hardware') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=1" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.assets') }}">
<i class="fas fa-barcode fa-fw"></i> <x-icon type="assets" />
<span class="sr-only">{{ trans('general.assets') }}</span> <span class="sr-only">{{ trans('general.assets') }}</span>
</a> </a>
</li> </li>
@ -153,7 +153,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('view', \App\Models\License::class) @can('view', \App\Models\License::class)
<li aria-hidden="true"{!! (Request::is('licenses*') ? ' class="active"' : '') !!}> <li aria-hidden="true"{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
<a href="{{ route('licenses.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=2" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.licenses') }}"> <a href="{{ route('licenses.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=2" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.licenses') }}">
<i class="far fa-save fa-fw"></i> <x-icon type="licenses" />
<span class="sr-only">{{ trans('general.licenses') }}</span> <span class="sr-only">{{ trans('general.licenses') }}</span>
</a> </a>
</li> </li>
@ -161,7 +161,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('index', \App\Models\Accessory::class) @can('index', \App\Models\Accessory::class)
<li aria-hidden="true"{!! (Request::is('accessories*') ? ' class="active"' : '') !!}> <li aria-hidden="true"{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
<a href="{{ route('accessories.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=3" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.accessories') }}"> <a href="{{ route('accessories.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=3" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.accessories') }}">
<i class="far fa-keyboard fa-fw"></i> <x-icon type="accessories" />
<span class="sr-only">{{ trans('general.accessories') }}</span> <span class="sr-only">{{ trans('general.accessories') }}</span>
</a> </a>
</li> </li>
@ -169,7 +169,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('index', \App\Models\Consumable::class) @can('index', \App\Models\Consumable::class)
<li aria-hidden="true"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}> <li aria-hidden="true"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
<a href="{{ url('consumables') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=4" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.consumables') }}"> <a href="{{ url('consumables') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=4" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.consumables') }}">
<i class="fas fa-tint fa-fw"></i> <x-icon type="consumables" />
<span class="sr-only">{{ trans('general.consumables') }}</span> <span class="sr-only">{{ trans('general.consumables') }}</span>
</a> </a>
</li> </li>
@ -177,7 +177,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('view', \App\Models\Component::class) @can('view', \App\Models\Component::class)
<li aria-hidden="true"{!! (Request::is('components*') ? ' class="active"' : '') !!}> <li aria-hidden="true"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
<a href="{{ route('components.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=5" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.components') }}"> <a href="{{ route('components.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=5" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.components') }}">
<i class="far fa-hdd fa-fw"></i> <x-icon type="components" />
<span class="sr-only">{{ trans('general.components') }}</span> <span class="sr-only">{{ trans('general.components') }}</span>
</a> </a>
</li> </li>
@ -197,7 +197,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
</div> </div>
<div class="col-xs-1"> <div class="col-xs-1">
<button type="submit" class="btn btn-primary pull-right"> <button type="submit" class="btn btn-primary pull-right">
<i class="fas fa-search" aria-hidden="true"></i> <x-icon type="search" />
<span class="sr-only">{{ trans('general.search') }}</span> <span class="sr-only">{{ trans('general.search') }}</span>
</button> </button>
</div> </div>
@ -216,7 +216,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('create', \App\Models\Asset::class) @can('create', \App\Models\Asset::class)
<li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}> <li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
<a href="{{ route('hardware.create') }}" tabindex="-1"> <a href="{{ route('hardware.create') }}" tabindex="-1">
<i class="fas fa-barcode fa-fw" aria-hidden="true"></i> <x-icon type="assets" />
{{ trans('general.asset') }} {{ trans('general.asset') }}
</a> </a>
</li> </li>
@ -224,7 +224,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('create', \App\Models\License::class) @can('create', \App\Models\License::class)
<li {!! (Request::is('licenses/create') ? 'class="active"' : '') !!}> <li {!! (Request::is('licenses/create') ? 'class="active"' : '') !!}>
<a href="{{ route('licenses.create') }}" tabindex="-1"> <a href="{{ route('licenses.create') }}" tabindex="-1">
<i class="far fa-save fa-fw" aria-hidden="true"></i> <x-icon type="licenses" />
{{ trans('general.license') }} {{ trans('general.license') }}
</a> </a>
</li> </li>
@ -232,7 +232,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('create', \App\Models\Accessory::class) @can('create', \App\Models\Accessory::class)
<li {!! (Request::is('accessories/create') ? 'class="active"' : '') !!}> <li {!! (Request::is('accessories/create') ? 'class="active"' : '') !!}>
<a href="{{ route('accessories.create') }}" tabindex="-1"> <a href="{{ route('accessories.create') }}" tabindex="-1">
<i class="far fa-keyboard fa-fw" aria-hidden="true"></i> <x-icon type="accessories" />
{{ trans('general.accessory') }} {{ trans('general.accessory') }}
</a> </a>
</li> </li>
@ -240,7 +240,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('create', \App\Models\Consumable::class) @can('create', \App\Models\Consumable::class)
<li {!! (Request::is('consunmables/create') ? 'class="active"' : '') !!}> <li {!! (Request::is('consunmables/create') ? 'class="active"' : '') !!}>
<a href="{{ route('consumables.create') }}" tabindex="-1"> <a href="{{ route('consumables.create') }}" tabindex="-1">
<i class="fas fa-tint fa-fw" aria-hidden="true"></i> <x-icon type="consumables" />
{{ trans('general.consumable') }} {{ trans('general.consumable') }}
</a> </a>
</li> </li>
@ -248,7 +248,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('create', \App\Models\Component::class) @can('create', \App\Models\Component::class)
<li {!! (Request::is('components/create') ? 'class="active"' : '') !!}> <li {!! (Request::is('components/create') ? 'class="active"' : '') !!}>
<a href="{{ route('components.create') }}" tabindex="-1"> <a href="{{ route('components.create') }}" tabindex="-1">
<i class="far fa-hdd fa-fw" aria-hidden="true"></i> <x-icon type="components" />
{{ trans('general.component') }} {{ trans('general.component') }}
</a> </a>
</li> </li>
@ -256,7 +256,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('create', \App\Models\User::class) @can('create', \App\Models\User::class)
<li {!! (Request::is('users/create') ? 'class="active"' : '') !!}> <li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
<a href="{{ route('users.create') }}" tabindex="-1"> <a href="{{ route('users.create') }}" tabindex="-1">
<i class="fas fa-user fa-fw" aria-hidden="true"></i> <x-icon type="users" />
{{ trans('general.user') }} {{ trans('general.user') }}
</a> </a>
</li> </li>
@ -272,7 +272,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
<li class="dropdown tasks-menu"> <li class="dropdown tasks-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="far fa-flag" aria-hidden="true"></i> <x-icon type="alerts" />
<span class="sr-only">{{ trans('general.alerts') }}</span> <span class="sr-only">{{ trans('general.alerts') }}</span>
@if (count($alert_items)) @if (count($alert_items))
<span class="label label-danger">{{ count($alert_items) }}</span> <span class="label label-danger">{{ count($alert_items) }}</span>
@ -326,31 +326,33 @@ dir="{{ Helper::determineLanguageDirection() }}">
<img src="{{ Auth::user()->present()->gravatar() }}" class="user-image" <img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
alt=""> alt="">
@else @else
<i class="fas fa-user" aria-hidden="true"></i> <x-icon type="user" />
@endif @endif
<span class="hidden-xs">{{ Auth::user()->getFullNameAttribute() }} <strong <span class="hidden-xs">
class="caret"></strong></span> {{ Auth::user()->getFullNameAttribute() }}
<strong class="caret"></strong>
</span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<!-- User image --> <!-- User image -->
<li {!! (Request::is('account/profile') ? ' class="active"' : '') !!}> <li {!! (Request::is('account/profile') ? ' class="active"' : '') !!}>
<a href="{{ route('view-assets') }}"> <a href="{{ route('view-assets') }}">
<i class="fas fa-check fa-fw" aria-hidden="true"></i> <x-icon type="checkmark" class="fa-fw" />
{{ trans('general.viewassets') }} {{ trans('general.viewassets') }}
</a></li> </a></li>
@can('viewRequestable', \App\Models\Asset::class) @can('viewRequestable', \App\Models\Asset::class)
<li {!! (Request::is('account/requested') ? ' class="active"' : '') !!}> <li {!! (Request::is('account/requested') ? ' class="active"' : '') !!}>
<a href="{{ route('account.requested') }}"> <a href="{{ route('account.requested') }}">
<i class="fas fa-check fa-disk fa-fw" aria-hidden="true"></i> <x-icon type="checkmark" class="fa-fw" />
{{ trans('general.requested_assets_menu') }} {{ trans('general.requested_assets_menu') }}
</a></li> </a></li>
@endcan @endcan
<li {!! (Request::is('account/accept') ? ' class="active"' : '') !!}> <li {!! (Request::is('account/accept') ? ' class="active"' : '') !!}>
<a href="{{ route('account.accept') }}"> <a href="{{ route('account.accept') }}">
<i class="fas fa-check fa-disk fa-fw"></i> <x-icon type="checkmark" class="fa-fw" />
{{ trans('general.accept_assets_menu') }} {{ trans('general.accept_assets_menu') }}
</a></li> </a></li>
@ -358,7 +360,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('self.profile') @can('self.profile')
<li> <li>
<a href="{{ route('profile') }}"> <a href="{{ route('profile') }}">
<i class="fas fa-user fa-fw" aria-hidden="true"></i> <x-icon type="user" class="fa-fw" />
{{ trans('general.editprofile') }} {{ trans('general.editprofile') }}
</a> </a>
</li> </li>
@ -366,7 +368,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
<li> <li>
<a href="{{ route('account.password.index') }}"> <a href="{{ route('account.password.index') }}">
<i class="fa-solid fa-asterisk fa-fw" aria-hidden="true"></i> <x-icon type="password" class="fa-fw" />
{{ trans('general.changepassword') }} {{ trans('general.changepassword') }}
</a> </a>
</li> </li>
@ -375,8 +377,8 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('self.api') @can('self.api')
<li> <li>
<a href="{{ route('user.api') }}"> <a href="{{ route('user.api') }}">
<i class="fa-solid fa-user-secret fa-fw" <x-icon type="api-key" class="fa-fw" />
aria-hidden="true"></i></i> {{ trans('general.manage_api_keys') }} {{ trans('general.manage_api_keys') }}
</a> </a>
</li> </li>
@endcan @endcan
@ -385,7 +387,8 @@ dir="{{ Helper::determineLanguageDirection() }}">
<a href="{{ route('logout.get') }}" <a href="{{ route('logout.get') }}"
onclick="event.preventDefault(); document.getElementById('logout-form').submit();"> onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
<i class="fa fa-sign-out fa-fw"></i> {{ trans('general.logout') }} <x-icon type="logout" class="fa-fw" />
{{ trans('general.logout') }}
</a> </a>
<form id="logout-form" action="{{ route('logout.post') }}" method="POST" <form id="logout-form" action="{{ route('logout.post') }}" method="POST"
@ -402,7 +405,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('superadmin') @can('superadmin')
<li> <li>
<a href="{{ route('settings.index') }}"> <a href="{{ route('settings.index') }}">
<i class="fa fa-cogs fa-fw" aria-hidden="true"></i> <x-icon type="admin-settings" />
<span class="sr-only">{{ trans('general.admin') }}</span> <span class="sr-only">{{ trans('general.admin') }}</span>
</a> </a>
</li> </li>
@ -413,7 +416,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
<a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="push-menu" <a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="push-menu"
role="button"> role="button">
<span class="sr-only">{{ trans('general.toggle_navigation') }}</span> <span class="sr-only">{{ trans('general.toggle_navigation') }}</span>
<i class="fas fa-bars"></i> <x-icon type="nav-toggle" />
</a> </a>
<!-- Sidebar toggle button--> <!-- Sidebar toggle button-->
</header> </header>
@ -427,21 +430,22 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('admin') @can('admin')
<li {!! (\Request::route()->getName()=='home' ? ' class="active"' : '') !!} class="firstnav"> <li {!! (\Request::route()->getName()=='home' ? ' class="active"' : '') !!} class="firstnav">
<a href="{{ route('home') }}"> <a href="{{ route('home') }}">
<i class="fas fa-tachometer-alt fa-fw" aria-hidden="true"></i> <x-icon type="dashboard" class="fa-fw" />
<span>{{ trans('general.dashboard') }}</span> <span>{{ trans('general.dashboard') }}</span>
</a> </a>
</li> </li>
@endcan @endcan
@can('index', \App\Models\Asset::class) @can('index', \App\Models\Asset::class)
<li class="treeview{{ ((Request::is('statuslabels/*') || Request::is('hardware*')) ? ' active' : '') }}"> <li class="treeview{{ ((Request::is('statuslabels/*') || Request::is('hardware*')) ? ' active' : '') }}">
<a href="#"><i class="fas fa-barcode fa-fw" aria-hidden="true"></i> <a href="#">
<x-icon type="assets" class="fa-fw" />
<span>{{ trans('general.assets') }}</span> <span>{{ trans('general.assets') }}</span>
<i class="fa fa-angle-left pull-right"></i> <x-icon type="angle-left" class="pull-right"/>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li> <li>
<a href="{{ url('hardware') }}"> <a href="{{ url('hardware') }}">
<i class="far fa-circle text-grey fa-fw" aria-hidden="true"></i> <x-icon type="circle" class="text-grey fa-fw"/>
{{ trans('general.list_all') }} {{ trans('general.list_all') }}
<span class="badge"> <span class="badge">
{{ (isset($total_assets)) ? $total_assets : '' }} {{ (isset($total_assets)) ? $total_assets : '' }}
@ -464,49 +468,48 @@ dir="{{ Helper::determineLanguageDirection() }}">
<li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}> <li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
<a href="{{ url('hardware?status=Deployed') }}"> <a href="{{ url('hardware?status=Deployed') }}">
<i class="far fa-circle text-blue fa-fw"></i> <x-icon type="circle" class="text-blue fa-fw" />
{{ trans('general.deployed') }} {{ trans('general.deployed') }}
<span class="badge">{{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }}</span> <span class="badge">{{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }}</span>
</a> </a>
</li> </li>
<li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}> <li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
<a href="{{ url('hardware?status=RTD') }}"> <a href="{{ url('hardware?status=RTD') }}">
<i class="far fa-circle text-green fa-fw"></i> <x-icon type="circle" class="text-green fa-fw" />
{{ trans('general.ready_to_deploy') }} {{ trans('general.ready_to_deploy') }}
<span class="badge">{{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }}</span> <span class="badge">{{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }}</span>
</a> </a>
</li> </li>
<li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}">
href="{{ url('hardware?status=Pending') }}"><i <x-icon type="circle" class="text-orange fa-fw" />
class="far fa-circle text-orange fa-fw"></i>
{{ trans('general.pending') }} {{ trans('general.pending') }}
<span class="badge">{{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }}</span> <span class="badge">{{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }}</span>
</a> </a>
</li> </li>
<li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a
href="{{ url('hardware?status=Undeployable') }}"><i href="{{ url('hardware?status=Undeployable') }}">
class="fas fa-times text-red fa-fw"></i> <x-icon type="x" class="text-red fa-fw" />
{{ trans('general.undeployable') }} {{ trans('general.undeployable') }}
<span class="badge">{{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }}</span> <span class="badge">{{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }}</span>
</a> </a>
</li> </li>
<li{!! (Request::query('status') == 'byod' ? ' class="active"' : '') !!}><a <li{!! (Request::query('status') == 'byod' ? ' class="active"' : '') !!}><a
href="{{ url('hardware?status=byod') }}"><i href="{{ url('hardware?status=byod') }}">
class="fas fa-times text-red fa-fw"></i> <x-icon type="x" class="text-red fa-fw" />
{{ trans('general.byod') }} {{ trans('general.byod') }}
<span class="badge">{{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }}</span> <span class="badge">{{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }}</span>
</a> </a>
</li> </li>
<li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a
href="{{ url('hardware?status=Archived') }}"><i href="{{ url('hardware?status=Archived') }}">
class="fas fa-times text-red fa-fw"></i> <x-icon type="x" class="text-red fa-fw" />
{{ trans('admin/hardware/general.archived') }} {{ trans('admin/hardware/general.archived') }}
<span class="badge">{{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }}</span> <span class="badge">{{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }}</span>
</a> </a>
</li> </li>
<li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a
href="{{ url('hardware?status=Requestable') }}"><i href="{{ url('hardware?status=Requestable') }}">
class="fas fa-check text-blue fa-fw"></i> <x-icon type="checkmark" class="text-blue fa-fw" />
{{ trans('admin/hardware/general.requestable') }} {{ trans('admin/hardware/general.requestable') }}
</a> </a>
</li> </li>
@ -514,7 +517,8 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('audit', \App\Models\Asset::class) @can('audit', \App\Models\Asset::class)
<li{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}> <li{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
<a href="{{ route('assets.audit.due') }}"> <a href="{{ route('assets.audit.due') }}">
<i class="fas fa-history text-yellow fa-fw"></i> {{ trans('general.audit_due') }} <x-icon type="due" class="text-yellow fa-fw"/>
{{ trans('general.audit_due') }}
<span class="badge">{{ (isset($total_due_and_overdue_for_audit)) ? $total_due_and_overdue_for_audit : '' }}</span> <span class="badge">{{ (isset($total_due_and_overdue_for_audit)) ? $total_due_and_overdue_for_audit : '' }}</span>
</a> </a>
</li> </li>
@ -523,7 +527,8 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('checkin', \App\Models\Asset::class) @can('checkin', \App\Models\Asset::class)
<li{!! (Request::is('hardware/checkins/due') ? ' class="active"' : '') !!}> <li{!! (Request::is('hardware/checkins/due') ? ' class="active"' : '') !!}>
<a href="{{ route('assets.checkins.due') }}"> <a href="{{ route('assets.checkins.due') }}">
<i class="fas fa-history text-yellow fa-fw"></i> {{ trans('general.checkin_due') }} <x-icon type="due" class="text-orange fa-fw"/>
{{ trans('general.checkin_due') }}
<span class="badge">{{ (isset($total_due_and_overdue_for_checkin)) ? $total_due_and_overdue_for_checkin : '' }}</span> <span class="badge">{{ (isset($total_due_and_overdue_for_checkin)) ? $total_due_and_overdue_for_checkin : '' }}</span>
</a> </a>
</li> </li>
@ -582,7 +587,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('view', \App\Models\License::class) @can('view', \App\Models\License::class)
<li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}> <li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
<a href="{{ route('licenses.index') }}"> <a href="{{ route('licenses.index') }}">
<i class="far fa-save fa-fw"></i> <x-icon type="licenses" />
<span>{{ trans('general.licenses') }}</span> <span>{{ trans('general.licenses') }}</span>
</a> </a>
</li> </li>
@ -590,7 +595,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('index', \App\Models\Accessory::class) @can('index', \App\Models\Accessory::class)
<li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}> <li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
<a href="{{ route('accessories.index') }}"> <a href="{{ route('accessories.index') }}">
<i class="far fa-keyboard fa-fw"></i> <x-icon type="accessories" class="fa-fw" />
<span>{{ trans('general.accessories') }}</span> <span>{{ trans('general.accessories') }}</span>
</a> </a>
</li> </li>
@ -598,7 +603,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('view', \App\Models\Consumable::class) @can('view', \App\Models\Consumable::class)
<li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}> <li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
<a href="{{ url('consumables') }}"> <a href="{{ url('consumables') }}">
<i class="fas fa-tint fa-fw"></i> <x-icon type="consumables" class="fa-fw" />
<span>{{ trans('general.consumables') }}</span> <span>{{ trans('general.consumables') }}</span>
</a> </a>
</li> </li>
@ -606,7 +611,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('view', \App\Models\Component::class) @can('view', \App\Models\Component::class)
<li{!! (Request::is('components*') ? ' class="active"' : '') !!}> <li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
<a href="{{ route('components.index') }}"> <a href="{{ route('components.index') }}">
<i class="far fa-hdd fa-fw"></i> <x-icon type="components" class="fa-fw" />
<span>{{ trans('general.components') }}</span> <span>{{ trans('general.components') }}</span>
</a> </a>
</li> </li>
@ -614,7 +619,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('view', \App\Models\PredefinedKit::class) @can('view', \App\Models\PredefinedKit::class)
<li{!! (Request::is('kits') ? ' class="active"' : '') !!}> <li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
<a href="{{ route('kits.index') }}"> <a href="{{ route('kits.index') }}">
<i class="fa fa-object-group fa-fw"></i> <x-icon type="kits" />
<span>{{ trans('general.kits') }}</span> <span>{{ trans('general.kits') }}</span>
</a> </a>
</li> </li>
@ -623,7 +628,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('view', \App\Models\User::class) @can('view', \App\Models\User::class)
<li{!! (Request::is('users*') ? ' class="active"' : '') !!}> <li{!! (Request::is('users*') ? ' class="active"' : '') !!}>
<a href="{{ route('users.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=6" : ''}}> <a href="{{ route('users.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=6" : ''}}>
<i class="fas fa-users fa-fw"></i> <x-icon type="users" />
<span>{{ trans('general.people') }}</span> <span>{{ trans('general.people') }}</span>
</a> </a>
</li> </li>
@ -631,7 +636,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('import') @can('import')
<li{!! (Request::is('import/*') ? ' class="active"' : '') !!}> <li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
<a href="{{ route('imports.index') }}"> <a href="{{ route('imports.index') }}">
<i class="fas fa-cloud-upload-alt fa-fw" aria-hidden="true"></i> <x-icon type="import" />
<span>{{ trans('general.import') }}</span> <span>{{ trans('general.import') }}</span>
</a> </a>
</li> </li>
@ -640,9 +645,9 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('backend.interact') @can('backend.interact')
<li class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}"> <li class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}">
<a href="#" id="settings"> <a href="#" id="settings">
<i class="fas fa-cog" aria-hidden="true"></i> <x-icon type="settings" />
<span>{{ trans('general.settings') }}</span> <span>{{ trans('general.settings') }}</span>
<i class="fa fa-angle-left pull-right"></i> <x-icon type="angle-left" class="pull-right"/>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
@ -732,9 +737,9 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('reports.view') @can('reports.view')
<li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}"> <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
<a href="#" class="dropdown-toggle"> <a href="#" class="dropdown-toggle">
<i class="fas fa-chart-bar fa-fw"></i> <x-icon type="reports" />
<span>{{ trans('general.reports') }}</span> <span>{{ trans('general.reports') }}</span>
<i class="fa fa-angle-left pull-right"></i> <x-icon type="angle-left" class="pull-right"/>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
@ -784,7 +789,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('viewRequestable', \App\Models\Asset::class) @can('viewRequestable', \App\Models\Asset::class)
<li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}> <li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>
<a href="{{ route('requestable-assets') }}"> <a href="{{ route('requestable-assets') }}">
<i class="fa fa-laptop fa-fw"></i> <x-icon type="requestable" />
<span>{{ trans('general.requestable_items') }}</span> <span>{{ trans('general.requestable_items') }}</span>
</a> </a>
</li> </li>
@ -805,7 +810,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
<div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;"> <div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">
<div class="col-md-12" <div class="col-md-12"
style="margin-bottom: 0px; background-color: #b50408 ; color: white; padding: 10px 20px 10px 30px; font-size: 16px;"> style="margin-bottom: 0px; background-color: #b50408 ; color: white; padding: 10px 20px 10px 30px; font-size: 16px;">
<i class="fas fa-exclamation-triangle fa-3x pull-left"></i> <x-icon type="warning" class="fa-3x pull-left"/>
<strong>{{ strtoupper(trans('general.debug_warning')) }}:</strong> <strong>{{ strtoupper(trans('general.debug_warning')) }}:</strong>
{!! trans('general.debug_warning_text') !!} {!! trans('general.debug_warning_text') !!}
</div> </div>
@ -859,9 +864,8 @@ dir="{{ Helper::determineLanguageDirection() }}">
<div class="1hidden-xs pull-left"> <div class="1hidden-xs pull-left">
<div class="pull-left" > <div class="pull-left" >
<a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software, <a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software, made with <x-icon type="heart" style="color: #a94442; font-size: 10px" />
made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span <span class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
</div> </div>
<div class="pull-right"> <div class="pull-right">
@if ($snipeSettings->version_footer!='off') @if ($snipeSettings->version_footer!='off')

2
resources/views/layouts/edit-form.blade.php
View file

@ -46,7 +46,7 @@
@if (isset($topSubmit) && ($topSubmit=='true')) @if (isset($topSubmit) && ($topSubmit=='true'))
<div class="col-md-3 text-right" style="padding-right: 10px;"> <div class="col-md-3 text-right" style="padding-right: 10px;">
<button type="submit" class="btn btn-primary pull-right"> <button type="submit" class="btn btn-primary pull-right">
<i class="fas fa-check icon-white" aria-hidden="true"></i> <x-icon type="checkmark" />
{{ trans('general.save') }} {{ trans('general.save') }}
</button> </button>
</div> </div>

2
resources/views/livewire/slack-settings-form.blade.php
View file

@ -153,7 +153,7 @@
<button type="submit" {{$isDisabled}} class="btn btn-primary"{{ Helper::isDemoMode() ? ' disabled' : ''}}> <button type="submit" {{$isDisabled}} class="btn btn-primary"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
<i class="fas fa-check icon-white" aria-hidden="true"></i> {{ $save_button }}</button> <x-icon type="checkmark" /> {{ $save_button }}</button>
</div> <!-- /.col-md-12 --> </div> <!-- /.col-md-12 -->
</div><!--box-footer--> </div><!--box-footer-->

2
resources/views/locations/bulk-delete.blade.php
View file

@ -51,7 +51,7 @@
<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" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.delete') }}</button> <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.delete') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</div><!-- /.box --> </div><!-- /.box -->
</form> </form>

2
resources/views/models/bulk-delete.blade.php
View file

@ -55,7 +55,7 @@
<div class="box-footer text-right"> <div class="box-footer text-right">
<a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a> <a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.delete') }}</button> <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.delete') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</div><!-- /.box --> </div><!-- /.box -->
</form> </form>

2
resources/views/models/bulk-edit.blade.php
View file

@ -108,7 +108,7 @@
<div class="box-footer text-right"> <div class="box-footer text-right">
<a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a> <a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.update') }}</button> <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.update') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</div> <!--/.box.box-default--> </div> <!--/.box.box-default-->
</form> </form>

20
resources/views/partials/bootstrap-table.blade.php
View file

@ -299,14 +299,14 @@
} }
if ((row.available_actions) && (row.available_actions.clone === true)) { if ((row.available_actions) && (row.available_actions.clone === true)) {
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="actions btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;'; actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="actions btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><x-icon type="clone" /><span class="sr-only">{{ trans('general.clone_item') }}</span></a>&nbsp;';
} }
if ((row.available_actions) && (row.available_actions.update === true)) { if ((row.available_actions) && (row.available_actions.update === true)) {
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="actions btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.update') }}"><i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;'; actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="actions btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.update') }}"><x-icon type="edit" /><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
} else { } else {
if ((row.available_actions) && (row.available_actions.update != true)) { if ((row.available_actions) && (row.available_actions.update != true)) {
actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_edited') }}"><a class="btn btn-warning btn-sm disabled" onClick="return false;"><i class="fas fa-pencil-alt"></i></a></span>&nbsp;'; actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_edited') }}"><a class="btn btn-warning btn-sm disabled" onClick="return false;"><x-icon type="edit" /></a></span>&nbsp;';
} }
} }
@ -323,11 +323,11 @@
+ ' data-toggle="modal" ' + ' data-toggle="modal" '
+ ' data-content="{{ trans('general.sure_to_delete') }} ' + name_for_box + '?" ' + ' data-content="{{ trans('general.sure_to_delete') }} ' + name_for_box + '?" '
+ ' data-title="{{ trans('general.delete') }}" onClick="return false;">' + ' data-title="{{ trans('general.delete') }}" onClick="return false;">'
+ '<i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">{{ trans('general.delete') }}</span></a>&nbsp;'; + '<x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>&nbsp;';
} else { } else {
// Do not show the delete button on things that are already deleted // Do not show the delete button on things that are already deleted
if ((row.available_actions) && (row.available_actions.restore != true)) { if ((row.available_actions) && (row.available_actions.restore != true)) {
actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><i class="fas fa-trash"></i></a></span>&nbsp;'; actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><x-icon type="delete" /><span class="sr-only">{{ trans('general.cannot_be_deleted') }}</span></a></span>&nbsp;';
} }
} }
@ -336,7 +336,7 @@
if ((row.available_actions) && (row.available_actions.restore === true)) { if ((row.available_actions) && (row.available_actions.restore === true)) {
actions += '<form style="display: inline;" method="POST" action="{{ config('app.url') }}/' + dest + '/' + row.id + '/restore"> '; actions += '<form style="display: inline;" method="POST" action="{{ config('app.url') }}/' + dest + '/' + row.id + '/restore"> ';
actions += '@csrf'; actions += '@csrf';
actions += '<button class="btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.restore') }}"><i class="fas fa-retweet"></i></button>&nbsp;'; actions += '<button class="btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.restore') }}"><x-icon type="restore" /><span class="sr-only">{{ trans('general.restore') }}</span></button>&nbsp;';
} }
actions +='</nobr>'; actions +='</nobr>';
@ -576,7 +576,7 @@
if (value) { if (value) {
if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) { if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) {
return '<nobr><a href="' + value + '" target="_blank" title="{{ trans('general.external_link_tooltip') }} ' + value + '" data-tooltip="true"><i class="fa fa-external-link"></i> ' + value + '</a></nobr>'; return '<nobr><a href="' + value + '" target="_blank" title="{{ trans('general.external_link_tooltip') }} ' + value + '" data-tooltip="true"><x-icon type="external-link" /> ' + value + '</a></nobr>';
} }
return value; return value;
} }
@ -612,7 +612,7 @@
extra_pretty_index = prettyLog(pretty_index); extra_pretty_index = prettyLog(pretty_index);
result += extra_pretty_index + ': <del>' + value[index].old + '</del> <i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i> ' + value[index].new + '<br>' result += extra_pretty_index + ': <del>' + value[index].old + '</del> <x-icon type="long-arrow" /> ' + value[index].new + '<br>'
} }
return result; return result;
@ -643,7 +643,7 @@
// Create a linked phone number in the table list // Create a linked phone number in the table list
function phoneFormatter(value) { function phoneFormatter(value) {
if (value) { if (value) {
return '<span style="white-space: nowrap;"><a href="tel:' + value + '" data-tooltip="true" title="{{ trans('general.call') }}"><i class="fa-solid fa-phone" aria-hidden="true"></i> ' + value + '</a></span>'; return '<span style="white-space: nowrap;"><a href="tel:' + value + '" data-tooltip="true" title="{{ trans('general.call') }}"><x-icon type="phone" /> ' + value + '</a></span>';
} }
} }
@ -718,7 +718,7 @@
function emailFormatter(value) { function emailFormatter(value) {
if (value) { if (value) {
return '<a href="mailto:' + value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><i class="fa-regular fa-envelope" aria-hidden="true"></i> ' + value + '</a>'; return '<a href="mailto:' + value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><x-icon type="email" /> ' + value + '</a>';
} }
} }

2
resources/views/partials/forms/edit/submit-button.blade.php
View file

@ -1,5 +1,5 @@
<button type="submit" class="btn btn-primary pull-right"> <button type="submit" class="btn btn-primary pull-right">
<i class="fas fa-check icon-white"></i> <x-icon type="checkmark" />
{{ trans('general.save') }} {{ trans('general.save') }}
</button> </button>

2
resources/views/partials/forms/edit/submit.blade.php
View file

@ -2,6 +2,6 @@
<div class="box-footer text-right" style="padding-bottom: 0px;"> <div class="box-footer text-right" style="padding-bottom: 0px;">
<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" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=s" : ''}} class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=s" : ''}} class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
<!-- / partials/forms/edit/submit.blade.php --> <!-- / partials/forms/edit/submit.blade.php -->

2
resources/views/settings/alerts.blade.php
View file

@ -173,7 +173,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/asset_tags.blade.php
View file

@ -98,7 +98,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/barcodes.blade.php
View file

@ -141,7 +141,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-success"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/branding.blade.php
View file

@ -310,7 +310,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/general.blade.php
View file

@ -395,7 +395,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/google.blade.php
View file

@ -104,7 +104,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"{{ (config('app.lock_passwords')===true) ? ' disabled': '' }}><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords')===true) ? ' disabled': '' }}><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/labels.blade.php
View file

@ -417,7 +417,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/ldap.blade.php
View file

@ -594,7 +594,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/localization.blade.php
View file

@ -105,7 +105,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/saml.blade.php
View file

@ -177,7 +177,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"{{ config('app.lock_passwords') === true ? ' disabled': '' }}><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-primary"{{ config('app.lock_passwords') === true ? ' disabled': '' }}><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/settings/security.blade.php
View file

@ -180,7 +180,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" class="btn btn-success"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>

2
resources/views/users/bulk-edit.blade.php
View file

@ -230,7 +230,7 @@
<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' : '') }}> <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }}>
<i class="fas fa-check icon-white" aria-hidden="true"></i> <x-icon type="checkmark" />
{{ trans('general.update') }} {{ trans('general.update') }}
</button> </button>

2
resources/views/users/confirm-bulk-delete.blade.php
View file

@ -129,7 +129,7 @@
<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' : '') }} disabled="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"><x-icon type="checkmark" /> {{ trans('button.submit') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</form> </form>

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

@ -121,7 +121,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' : '') }} 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><x-icon type="checkmark" /> {{ trans('button.submit') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
@foreach ($users as $user) @foreach ($users as $user)