From a102c085dfb36ecc64f7056720418fd00e268310 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 15:47:37 +0100
Subject: [PATCH 01/36] Added icon helper
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 66 ++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 app/Helpers/IconHelper.php
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
new file mode 100644
index 000000000000..518c87c3f43c
--- /dev/null
+++ b/app/Helpers/IconHelper.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Helpers;
+
+class IconHelper
+{
+
+ public static function icon($type) {
+ switch ($type) {
+ case 'checkout':
+ return 'fa-solid fa-rotate-left';
+ break;
+ case 'checkin':
+ return 'fa-solid fa-rotate-right';
+ break;
+ case 'edit':
+ return 'fas fa-pencil-alt';
+ break;
+ case 'clone':
+ return 'far fa-clone';
+ break;
+ case 'delete':
+ return 'fas fa-trash';
+ break;
+ case 'create':
+ return 'fa-solid fa-plus';
+ break;
+ case 'audit':
+ return 'fa-solid fa-clipboard-check';
+ break;
+ case '2fa reset':
+ return 'fa-solid fa-mobile-screen';
+ break;
+ case 'new-user':
+ return 'fa-solid fa-user-plus';
+ break;
+ case 'merged-user':
+ return 'fa-solid fa-people-arrows';
+ break;
+ case 'delete-user':
+ return 'fa-solid fa-user-minus';
+ break;
+ case 'update-user':
+ return 'fa-solid fa-user-pen';
+ break;
+ case 'user':
+ return 'fa-solid fa-user';
+ break;
+ case 'restore':
+ return 'fa-solid fa-trash-arrow-up';
+ break;
+ case 'external-link':
+ return 'fa fa-external-link';
+ break;
+ case 'email':
+ return 'fa-regular fa-envelope';
+ break;
+ case 'phone':
+ return 'fa-solid fa-phone';
+ break;
+ case 'long-arrow':
+ return 'fas fa-long-arrow-alt-right';
+ break;
+ }
+ }
+}
From d2e585baa76991037b82cfa9b610a279b744ad00 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 15:47:45 +0100
Subject: [PATCH 02/36] Added icon blade
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/blade/icon.blade.php | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 resources/views/blade/icon.blade.php
diff --git a/resources/views/blade/icon.blade.php b/resources/views/blade/icon.blade.php
new file mode 100644
index 000000000000..5b15e0166318
--- /dev/null
+++ b/resources/views/blade/icon.blade.php
@@ -0,0 +1,5 @@
+@props([
+ 'type' => '',
+])
+<i class="{{ Icon::icon($type) }} {{ $attributes->get('class') }}"
+ aria-hidden="true" {{ isset($style) ? 'style="'.$attributes->get('style').'"' : '' }}></i>
\ No newline at end of file
From da71f031f5b66662ec5c64f913f3be76e349e23d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 15:48:24 +0100
Subject: [PATCH 03/36] Use icon in hardware view
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/hardware/view.blade.php | 28 ++++++++++++++++---------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 4961cfce2597..880d0bad22e6 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -178,18 +178,20 @@
@can('checkin', \App\Models\Asset::class)
<div class="col-md-12 hidden-print">
<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-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
- {{ trans('admin/hardware/general.checkin') }}
- </a>
+ <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' : '') }}">
+ <x-icon type="checkin" />
+ {{ trans('admin/hardware/general.checkin') }}
+ </a>
</span>
</div>
@endcan
@elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
- @can('checkout', \App\Models\Asset::class)
+ @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 btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
- {{ trans('admin/hardware/general.checkout') }}
+ <a href="{{ route('hardware.checkout.create', $asset->id) }}" class="btn bg-maroon btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+ <x-icon type="checkout" />
+ {{ trans('admin/hardware/general.checkout') }}
</a>
</span>
</div>
@@ -200,7 +202,8 @@
@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-primary btn-block hidden-print">
+ <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>
@@ -209,7 +212,8 @@
@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-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+ <a href="{{ route('asset.audit.create', $asset->id) }}" class="btn btn-primary btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+ <x-icon type="audit" />
{{ trans('general.audit') }}
</a>
</span>
@@ -219,7 +223,8 @@
@can('create', $asset)
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
- <a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print">
+ <a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-info btn-block btn-social hidden-print">
+ <x-icon type="clone" />
{{ trans('admin/hardware/general.clone') }}
</a>
</div>
@@ -228,7 +233,10 @@
@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-sm btn-block btn-danger 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">{{ trans('general.delete') }}
+ <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">
+
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
</button>
<span class="sr-only">{{ trans('general.delete') }}</span>
@else
From 2b0c67c26381a55ade9104438386fef646b5c17e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 15:51:00 +0100
Subject: [PATCH 04/36] Load the icon helper
Signed-off-by: snipe <snipe@snipe.net>
---
config/app.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/config/app.php b/config/app.php
index 060d82d5254f..bc74b4dd0547 100755
--- a/config/app.php
+++ b/config/app.php
@@ -372,7 +372,9 @@
'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
'Image' => Intervention\Image\ImageServiceProvider::class,
'Carbon' => Carbon\Carbon::class,
- 'Helper' => App\Helpers\Helper::class, // makes it much easier to use 'Helper::blah' in blades (which is where we usually use this)
+ 'Helper' => App\Helpers\Helper::class,
+ // makes it much easier to use 'Helper::blah' in blades (which is where we usually use this)
+ 'Icon' => App\Helpers\IconHelper::class,
'Socialite' => Laravel\Socialite\Facades\Socialite::class,
From 9337cba34030be17c2fd8ccc50d42d8b5cc081e9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 15:53:58 +0100
Subject: [PATCH 05/36] Added download
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 518c87c3f43c..7d7ffca2e1b0 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -9,58 +9,43 @@ public static function icon($type) {
switch ($type) {
case 'checkout':
return 'fa-solid fa-rotate-left';
- break;
case 'checkin':
return 'fa-solid fa-rotate-right';
- break;
case 'edit':
return 'fas fa-pencil-alt';
- break;
case 'clone':
return 'far fa-clone';
- break;
case 'delete':
return 'fas fa-trash';
- break;
case 'create':
return 'fa-solid fa-plus';
- break;
case 'audit':
return 'fa-solid fa-clipboard-check';
- break;
case '2fa reset':
return 'fa-solid fa-mobile-screen';
- break;
case 'new-user':
return 'fa-solid fa-user-plus';
- break;
case 'merged-user':
return 'fa-solid fa-people-arrows';
- break;
case 'delete-user':
return 'fa-solid fa-user-minus';
- break;
case 'update-user':
return 'fa-solid fa-user-pen';
- break;
case 'user':
return 'fa-solid fa-user';
- break;
case 'restore':
return 'fa-solid fa-trash-arrow-up';
- break;
case 'external-link':
return 'fa fa-external-link';
- break;
case 'email':
return 'fa-regular fa-envelope';
- break;
case 'phone':
return 'fa-solid fa-phone';
- break;
case 'long-arrow':
return 'fas fa-long-arrow-alt-right';
- break;
+ case 'download':
+ return 'as fa-download';
+
}
}
}
From 901f4df7eef6a814e9274dd9addc56c715363c3e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 17:03:36 +0100
Subject: [PATCH 06/36] Added more icons
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 61 ++++++++++++++++++++++++++++++++++++--
1 file changed, 59 insertions(+), 2 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 7d7ffca2e1b0..f8512686cba6 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -33,6 +33,8 @@ public static function icon($type) {
return 'fa-solid fa-user-pen';
case 'user':
return 'fa-solid fa-user';
+ case 'users':
+ return 'fas fa-users fa-fw';
case 'restore':
return 'fa-solid fa-trash-arrow-up';
case 'external-link':
@@ -44,8 +46,63 @@ public static function icon($type) {
case 'long-arrow':
return 'fas fa-long-arrow-alt-right';
case 'download':
- return 'as fa-download';
-
+ return 'fas fa-download';
+ case 'checkmark':
+ return 'fas fa-check icon-white';
+ case 'x':
+ return 'fas fa-times fa-fw';
+ case 'logout':
+ return 'fa fa-sign-out fa-fw';
+ case 'admin-settings':
+ return 'fa fa-cogs fa-fw';
+ case 'settings':
+ return 'fa fa-sign-out fa-fw';
+ case 'angle-left':
+ return 'fa fa-angle-left';
+ case 'warning':
+ return 'fas fa-exclamation-triangle';
+ case 'kits':
+ return 'fa fa-object-group fa-fw';
+ case 'assets':
+ return 'fas fa-barcode fa-fw';
+ case 'accessories':
+ return 'far fa-keyboard fa-fw';
+ case 'components':
+ return 'far fa-hdd fa-fw';
+ case 'consumables':
+ return 'fas fa-tint fa-fw';
+ case 'licenses':
+ return 'far fa-save fa-fw';
+ case 'requestable':
+ return 'fa fa-laptop fa-fw';
+ case 'reports':
+ return 'fas fa-chart-bar fa-fw';
+ case 'heart':
+ return 'fas fa-heart';
+ case 'circle':
+ return 'far fa-circle';
+ case 'due':
+ return 'fas fa-history fa-fw';
+ case 'import':
+ return 'fas fa-cloud-upload-alt fa-fw';
+ case 'search':
+ return 'fas fa-search';
+ case 'alerts':
+ return 'far fa-flag';
+ case 'password':
+ return 'fa-solid fa-asterisk fa-fw';
+ case 'api-key':
+ return 'fa-solid fa-user-secret fa-fw';
+ case 'nav-toggle':
+ return 'fas fa-bars';
+ case 'dashboard':
+ return 'fas fa-tachometer-alt fa-fw';
+ case 'info-circle':
+ return 'fas fa-info-circle';
+ case 'carat-right':
+ return 'fa fa-caret-right';
+ case 'carat-up':
+ return 'fa fa-caret-up';
}
}
}
From bffba025113c5f95cf140802f41ea03c49db4030 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 17:26:44 +0100
Subject: [PATCH 07/36] Updated icons
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 38 +++---
.../views/account/change-password.blade.php | 2 +-
resources/views/account/profile.blade.php | 2 +-
.../views/asset_maintenances/edit.blade.php | 2 +-
resources/views/auth/login.blade.php | 4 +-
.../views/auth/passwords/email.blade.php | 8 +-
resources/views/blade/icon.blade.php | 3 +-
.../blade/redirect_submit_options.blade.php | 2 +-
resources/views/components/view.blade.php | 29 +++-
resources/views/dashboard.blade.php | 72 +++++-----
resources/views/hardware/audit.blade.php | 2 +-
.../views/hardware/bulk-checkout.blade.php | 2 +-
.../views/hardware/bulk-delete.blade.php | 2 +-
.../views/hardware/bulk-restore.blade.php | 2 +-
resources/views/hardware/bulk.blade.php | 2 +-
.../hardware/quickscan-checkin.blade.php | 2 +-
resources/views/hardware/quickscan.blade.php | 2 +-
resources/views/kits/checkout.blade.php | 2 +-
resources/views/layouts/default.blade.php | 126 +++++++++---------
resources/views/layouts/edit-form.blade.php | 2 +-
.../livewire/slack-settings-form.blade.php | 2 +-
.../views/locations/bulk-delete.blade.php | 2 +-
resources/views/models/bulk-delete.blade.php | 2 +-
resources/views/models/bulk-edit.blade.php | 2 +-
.../views/partials/bootstrap-table.blade.php | 20 +--
.../forms/edit/submit-button.blade.php | 2 +-
.../partials/forms/edit/submit.blade.php | 2 +-
resources/views/settings/alerts.blade.php | 2 +-
resources/views/settings/asset_tags.blade.php | 2 +-
resources/views/settings/barcodes.blade.php | 2 +-
resources/views/settings/branding.blade.php | 2 +-
resources/views/settings/general.blade.php | 2 +-
resources/views/settings/google.blade.php | 2 +-
resources/views/settings/labels.blade.php | 2 +-
resources/views/settings/ldap.blade.php | 2 +-
.../views/settings/localization.blade.php | 2 +-
resources/views/settings/saml.blade.php | 2 +-
resources/views/settings/security.blade.php | 2 +-
resources/views/users/bulk-edit.blade.php | 2 +-
.../views/users/confirm-bulk-delete.blade.php | 2 +-
resources/views/users/confirm-merge.blade.php | 2 +-
41 files changed, 202 insertions(+), 164 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index f8512686cba6..a73c333f38b8 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -34,7 +34,7 @@ public static function icon($type) {
case 'user':
return 'fa-solid fa-user';
case 'users':
- return 'fas fa-users fa-fw';
+ return 'fas fa-users';
case 'restore':
return 'fa-solid fa-trash-arrow-up';
case 'external-link':
@@ -50,39 +50,39 @@ public static function icon($type) {
case 'checkmark':
return 'fas fa-check icon-white';
case 'x':
- return 'fas fa-times fa-fw';
+ return 'fas fa-times';
case 'logout':
- return 'fa fa-sign-out fa-fw';
+ return 'fa fa-sign-out';
case 'admin-settings':
- return 'fa fa-cogs fa-fw';
+ return 'fa fa-cogs';
case 'settings':
- return 'fa fa-sign-out fa-fw';
+ return 'fa fa-sign-out';
case 'angle-left':
return 'fa fa-angle-left';
case 'warning':
return 'fas fa-exclamation-triangle';
case 'kits':
- return 'fa fa-object-group fa-fw';
+ return 'fa fa-object-group';
case 'assets':
- return 'fas fa-barcode fa-fw';
+ return 'fas fa-barcode';
case 'accessories':
- return 'far fa-keyboard fa-fw';
+ return 'far fa-keyboard';
case 'components':
- return 'far fa-hdd fa-fw';
+ return 'far fa-hdd';
case 'consumables':
- return 'fas fa-tint fa-fw';
+ return 'fas fa-tint';
case 'licenses':
- return 'far fa-save fa-fw';
+ return 'far fa-save';
case 'requestable':
- return 'fa fa-laptop fa-fw';
+ return 'fa fa-laptop';
case 'reports':
- return 'fas fa-chart-bar fa-fw';
+ return 'fas fa-chart-bar';
case 'heart':
return 'fas fa-heart';
case 'circle':
return 'far fa-circle';
case 'due':
- return 'fas fa-history fa-fw';
+ return 'fas fa-history';
case 'import':
return 'fas fa-cloud-upload-alt fa-fw';
case 'search':
@@ -90,19 +90,23 @@ public static function icon($type) {
case 'alerts':
return 'far fa-flag';
case 'password':
- return 'fa-solid fa-asterisk fa-fw';
+ return 'fa fa-key';
case 'api-key':
- return 'fa-solid fa-user-secret fa-fw';
+ return 'fa-solid fa-user-secret';
case 'nav-toggle':
return 'fas fa-bars';
case 'dashboard':
- return 'fas fa-tachometer-alt fa-fw';
+ return 'fas fa-tachometer-alt';
case 'info-circle':
return 'fas fa-info-circle';
case 'carat-right':
return 'fa fa-caret-right';
case 'carat-up':
return 'fa fa-caret-up';
+ case 'arrow-circle-right':
+ return 'fa fa-arrow-circle-right';
+ case 'minus':
+ return 'fas fa-minus';
}
}
}
diff --git a/resources/views/account/change-password.blade.php b/resources/views/account/change-password.blade.php
index 9899a9734e65..57509e5fab5a 100755
--- a/resources/views/account/change-password.blade.php
+++ b/resources/views/account/change-password.blade.php
@@ -59,7 +59,7 @@
</div> <!-- .box-body -->
<div class="box-footer text-right">
<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> <!-- .box-default -->
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index aecd8a4c12b2..d27367192a6b 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -174,7 +174,7 @@
</div> <!-- .box-body -->
<div class="text-right box-footer">
<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> <!-- .box-default -->
{{ Form::close() }}
diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php
index 5c2cd1fa2dd2..0f0903374820 100644
--- a/resources/views/asset_maintenances/edit.blade.php
+++ b/resources/views/asset_maintenances/edit.blade.php
@@ -123,7 +123,7 @@
</div> <!-- .box-body -->
<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> <!-- .box-default -->
</form>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 298d55f4ec97..0a3c93333f6e 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -58,7 +58,7 @@
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<label for="username">
- <i class="fas fa-user" aria-hidden="true"></i>
+ <x-icon type="user" />
{{ trans('admin/users/table.username') }}
</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>
@@ -66,7 +66,7 @@
</div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label for="password">
- <i class="fa fa-key" aria-hidden="true"></i>
+ <x-icon type="password" />
{{ trans('admin/users/table.password') }}
</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' }}">
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 5077b36f9a57..032805818406 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -37,7 +37,7 @@
<div class="row">
<div class="col-md-12">
<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') !!}
</div>
</div>
@@ -55,7 +55,7 @@
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<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">
{!! $errors->first('username', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
</div>
@@ -67,13 +67,13 @@
<br>
<!-- show help text toggle -->
<a href="#" id="show">
- <i class="fa fa-caret-right"></i>
+ <x-icon type="caret-right" />
{{ trans('general.show_help') }}
</a>
<!-- hide help text toggle -->
<a href="#" id="hide" style="display:none">
- <i class="fa fa-caret-up"></i>
+ <x-icon type="caret-up" />
{{ trans('general.hide_help') }}
</a>
diff --git a/resources/views/blade/icon.blade.php b/resources/views/blade/icon.blade.php
index 5b15e0166318..2aad44c9b7e9 100644
--- a/resources/views/blade/icon.blade.php
+++ b/resources/views/blade/icon.blade.php
@@ -1,5 +1,4 @@
@props([
'type' => '',
])
-<i class="{{ Icon::icon($type) }} {{ $attributes->get('class') }}"
- aria-hidden="true" {{ isset($style) ? 'style="'.$attributes->get('style').'"' : '' }}></i>
\ No newline at end of file
+<i class="{{ Icon::icon($type) }} {{ $attributes->get('class') }}"{{ isset($style) ? $attributes->merge(['style' => $style]) : '' }} aria-hidden="true"></i>
\ No newline at end of file
diff --git a/resources/views/blade/redirect_submit_options.blade.php b/resources/views/blade/redirect_submit_options.blade.php
index a6b0c7fc8814..eb0619b520fb 100644
--- a/resources/views/blade/redirect_submit_options.blade.php
+++ b/resources/views/blade/redirect_submit_options.blade.php
@@ -27,7 +27,7 @@
@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' : '') !!}>
- <i class="fas fa-check icon-white" aria-hidden="true"></i>
+ <x-icon type="checkmark" />
{{ $button_label }}
</button>
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index bbb9b6709758..15acdc0eba7d 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -203,15 +203,15 @@ class="table table-striped snipe-table"
</td>
<td>
@if ($file->filename)
- <a href="{{ route('show.componentfile', [$component->id, $file->id]) }}" class="btn btn-sm btn-default">
- <i class="fas fa-download" aria-hidden="true"></i>
+ <nobr><a href="{{ route('show.componentfile', [$component->id, $file->id]) }}" class="btn btn-sm btn-default">
+ <x-icon type="download" />
<span class="sr-only">{{ trans('general.download') }}</span>
</a>
<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>
-
+ </nobr>
@endif
</td>
<td>{{ $file->created_at }}</td>
@@ -284,7 +284,26 @@ class="table table-striped snipe-table"
</div>
@endif
- </div>
+ @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>
+ @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-->
@can('components.files', Component::class)
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 2339122072eb..39a5d8b751fb 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -37,10 +37,12 @@
<p>{{ strtolower(trans('general.assets')) }}</p>
</div>
<div class="icon" aria-hidden="true">
- <i class="fas fa-barcode" aria-hidden="true"></i>
+ <x-icon type="assets" />
</div>
@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
</div>
</a>
@@ -55,10 +57,12 @@
<p>{{ strtolower(trans('general.licenses')) }}</p>
</div>
<div class="icon" aria-hidden="true">
- <i class="far fa-save"></i>
+ <x-icon type="licenses" />
</div>
@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
</div>
</a>
@@ -74,10 +78,12 @@
<p>{{ strtolower(trans('general.accessories')) }}</p>
</div>
<div class="icon" aria-hidden="true">
- <i class="far fa-keyboard"></i>
+ <x-icon type="accessories" />
</div>
@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
</div>
</a>
@@ -93,10 +99,12 @@
<p>{{ strtolower(trans('general.consumables')) }}</p>
</div>
<div class="icon" aria-hidden="true">
- <i class="fas fa-tint"></i>
+ <x-icon type="consumables" />
</div>
@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
</div>
</div><!-- ./col -->
@@ -110,10 +118,12 @@
<p>{{ strtolower(trans('general.components')) }}</p>
</div>
<div class="icon" aria-hidden="true">
- <i class="far fa-hdd"></i>
+ <x-icon type="components" />
</div>
@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
</div>
</a>
@@ -128,10 +138,12 @@
<p>{{ strtolower(trans('general.people')) }}</p>
</div>
<div class="icon" aria-hidden="true">
- <i class="fas fa-users"></i>
+ <x-icon type="users" />
</div>
@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
</div>
</a>
@@ -201,7 +213,7 @@
<h2 class="box-title">{{ trans('general.recent_activity') }}</h2>
<div class="box-tools pull-right">
<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>
</button>
</div>
@@ -253,7 +265,7 @@ class="table table-striped snipe-table"
</h2>
<div class="box-tools pull-right">
<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>
</button>
</div>
@@ -282,7 +294,7 @@ class="table table-striped snipe-table"
<h2 class="box-title">{{ trans('general.companies') }}</h2>
<div class="box-tools pull-right">
<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>
</button>
</div>
@@ -307,27 +319,27 @@ class="table table-striped snipe-table"
<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-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>
</th>
<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>
</th>
<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>
</th>
<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>
</th>
<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>
</th>
<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>
</th>
</tr>
@@ -350,7 +362,7 @@ class="table table-striped snipe-table"
<h2 class="box-title">{{ trans('general.locations') }}</h2>
<div class="box-tools pull-right">
<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>
</button>
</div>
@@ -376,7 +388,7 @@ class="table table-striped snipe-table"
<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">
- <i class="fas fa-barcode" aria-hidden="true"></i>
+ <x-icon type="assets" />
<span class="sr-only">{{ trans('general.asset_count') }}</span>
</th>
<th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
@@ -384,7 +396,7 @@ class="table table-striped snipe-table"
{{ trans('general.assigned') }}
</th>
<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>
</th>
@@ -413,7 +425,7 @@ class="table table-striped snipe-table"
<h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.categories') }}</h2>
<div class="box-tools pull-right">
<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>
</button>
</div>
@@ -441,23 +453,23 @@ class="table table-striped snipe-table"
{{ trans('general.type') }}
</th>
<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>
</th>
<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>
</th>
<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>
</th>
<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>
</th>
<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>
</th>
</tr>
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 965937107159..0bc4455671f0 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -136,7 +136,7 @@
<div class="box-footer">
<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' : '') !!}>
- <i class="fas fa-check icon-white" aria-hidden="true"></i>
+ <x-icon type="checkmark" />
{{ trans('general.audit') }}
</button>
</div>
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 562a27154e2a..bab7849ecb72 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -86,7 +86,7 @@
</div> <!--./box-body-->
<div class="box-footer">
<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>
</form>
diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index df988f5ad2b8..f72e7e4d1bbe 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -59,7 +59,7 @@
<div class="box-footer text-right">
<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 -->
</form>
diff --git a/resources/views/hardware/bulk-restore.blade.php b/resources/views/hardware/bulk-restore.blade.php
index e4bfb6e4dddc..a998642685a8 100644
--- a/resources/views/hardware/bulk-restore.blade.php
+++ b/resources/views/hardware/bulk-restore.blade.php
@@ -53,7 +53,7 @@
<div class="box-footer text-right">
<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 -->
</form>
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index f621d88fa86d..23ffa1b96ce3 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -226,7 +226,7 @@
</div> <!--/.box-body-->
<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> <!--/.box.box-default-->
</form>
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index ec6ef5719f71..7a31e3cf167f 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -69,7 +69,7 @@
</div> <!--/.box-body-->
<div class="box-footer">
<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>
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index e4f6c8a55ec2..c47c31dfe1e2 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -88,7 +88,7 @@
</div> <!--/.box-body-->
<div class="box-footer">
<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>
diff --git a/resources/views/kits/checkout.blade.php b/resources/views/kits/checkout.blade.php
index 265329259c83..2b50412e1755 100644
--- a/resources/views/kits/checkout.blade.php
+++ b/resources/views/kits/checkout.blade.php
@@ -68,7 +68,7 @@
</div> <!--./box-body-->
<div class="box-footer">
<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>
</form>
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 2c38e59111c3..edeeb6bf6fb4 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -145,7 +145,7 @@
@can('index', \App\Models\Asset::class)
<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') }}">
- <i class="fas fa-barcode fa-fw"></i>
+ <x-icon type="assets" />
<span class="sr-only">{{ trans('general.assets') }}</span>
</a>
</li>
@@ -153,7 +153,7 @@
@can('view', \App\Models\License::class)
<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') }}">
- <i class="far fa-save fa-fw"></i>
+ <x-icon type="licenses" />
<span class="sr-only">{{ trans('general.licenses') }}</span>
</a>
</li>
@@ -161,7 +161,7 @@
@can('index', \App\Models\Accessory::class)
<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') }}">
- <i class="far fa-keyboard fa-fw"></i>
+ <x-icon type="accessories" />
<span class="sr-only">{{ trans('general.accessories') }}</span>
</a>
</li>
@@ -169,7 +169,7 @@
@can('index', \App\Models\Consumable::class)
<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') }}">
- <i class="fas fa-tint fa-fw"></i>
+ <x-icon type="consumables" />
<span class="sr-only">{{ trans('general.consumables') }}</span>
</a>
</li>
@@ -177,7 +177,7 @@
@can('view', \App\Models\Component::class)
<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') }}">
- <i class="far fa-hdd fa-fw"></i>
+ <x-icon type="components" />
<span class="sr-only">{{ trans('general.components') }}</span>
</a>
</li>
@@ -197,7 +197,7 @@
</div>
<div class="col-xs-1">
<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>
</button>
</div>
@@ -216,7 +216,7 @@
@can('create', \App\Models\Asset::class)
<li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
<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') }}
</a>
</li>
@@ -224,7 +224,7 @@
@can('create', \App\Models\License::class)
<li {!! (Request::is('licenses/create') ? 'class="active"' : '') !!}>
<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') }}
</a>
</li>
@@ -232,7 +232,7 @@
@can('create', \App\Models\Accessory::class)
<li {!! (Request::is('accessories/create') ? 'class="active"' : '') !!}>
<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') }}
</a>
</li>
@@ -240,7 +240,7 @@
@can('create', \App\Models\Consumable::class)
<li {!! (Request::is('consunmables/create') ? 'class="active"' : '') !!}>
<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') }}
</a>
</li>
@@ -248,7 +248,7 @@
@can('create', \App\Models\Component::class)
<li {!! (Request::is('components/create') ? 'class="active"' : '') !!}>
<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') }}
</a>
</li>
@@ -256,7 +256,7 @@
@can('create', \App\Models\User::class)
<li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
<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') }}
</a>
</li>
@@ -272,7 +272,7 @@
<li class="dropdown tasks-menu">
<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>
@if (count($alert_items))
<span class="label label-danger">{{ count($alert_items) }}</span>
@@ -326,31 +326,33 @@
<img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
alt="">
@else
- <i class="fas fa-user" aria-hidden="true"></i>
+ <x-icon type="user" />
@endif
- <span class="hidden-xs">{{ Auth::user()->getFullNameAttribute() }} <strong
- class="caret"></strong></span>
+ <span class="hidden-xs">
+ {{ Auth::user()->getFullNameAttribute() }}
+ <strong class="caret"></strong>
+ </span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li {!! (Request::is('account/profile') ? ' class="active"' : '') !!}>
<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') }}
</a></li>
@can('viewRequestable', \App\Models\Asset::class)
<li {!! (Request::is('account/requested') ? ' class="active"' : '') !!}>
<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') }}
</a></li>
@endcan
<li {!! (Request::is('account/accept') ? ' class="active"' : '') !!}>
<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') }}
</a></li>
@@ -358,7 +360,7 @@ class="caret"></strong></span>
@can('self.profile')
<li>
<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') }}
</a>
</li>
@@ -366,7 +368,7 @@ class="caret"></strong></span>
<li>
<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') }}
</a>
</li>
@@ -375,8 +377,8 @@ class="caret"></strong></span>
@can('self.api')
<li>
<a href="{{ route('user.api') }}">
- <i class="fa-solid fa-user-secret fa-fw"
- aria-hidden="true"></i></i> {{ trans('general.manage_api_keys') }}
+ <x-icon type="api-key" class="fa-fw" />
+ {{ trans('general.manage_api_keys') }}
</a>
</li>
@endcan
@@ -385,7 +387,8 @@ class="caret"></strong></span>
<a href="{{ route('logout.get') }}"
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>
<form id="logout-form" action="{{ route('logout.post') }}" method="POST"
@@ -402,7 +405,7 @@ class="caret"></strong></span>
@can('superadmin')
<li>
<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>
</a>
</li>
@@ -413,7 +416,7 @@ class="caret"></strong></span>
<a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="push-menu"
role="button">
<span class="sr-only">{{ trans('general.toggle_navigation') }}</span>
- <i class="fas fa-bars"></i>
+ <x-icon type="nav-toggle" />
</a>
<!-- Sidebar toggle button-->
</header>
@@ -427,21 +430,22 @@ class="caret"></strong></span>
@can('admin')
<li {!! (\Request::route()->getName()=='home' ? ' class="active"' : '') !!} class="firstnav">
<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>
</a>
</li>
@endcan
@can('index', \App\Models\Asset::class)
<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>
- <i class="fa fa-angle-left pull-right"></i>
+ <x-icon type="angle-left" class="pull-right"/>
</a>
<ul class="treeview-menu">
<li>
<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') }}
<span class="badge">
{{ (isset($total_assets)) ? $total_assets : '' }}
@@ -464,49 +468,48 @@ class="caret"></strong></span>
<li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
<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') }}
<span class="badge">{{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }}</span>
</a>
</li>
<li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
<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') }}
<span class="badge">{{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }}</span>
</a>
</li>
- <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a
- href="{{ url('hardware?status=Pending') }}"><i
- class="far fa-circle text-orange fa-fw"></i>
+ <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}">
+ <x-icon type="circle" class="text-orange fa-fw" />
{{ trans('general.pending') }}
<span class="badge">{{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }}</span>
</a>
</li>
<li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a
- href="{{ url('hardware?status=Undeployable') }}"><i
- class="fas fa-times text-red fa-fw"></i>
+ href="{{ url('hardware?status=Undeployable') }}">
+ <x-icon type="x" class="text-red fa-fw" />
{{ trans('general.undeployable') }}
<span class="badge">{{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }}</span>
</a>
</li>
<li{!! (Request::query('status') == 'byod' ? ' class="active"' : '') !!}><a
- href="{{ url('hardware?status=byod') }}"><i
- class="fas fa-times text-red fa-fw"></i>
+ href="{{ url('hardware?status=byod') }}">
+ <x-icon type="x" class="text-red fa-fw" />
{{ trans('general.byod') }}
<span class="badge">{{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }}</span>
</a>
</li>
<li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a
- href="{{ url('hardware?status=Archived') }}"><i
- class="fas fa-times text-red fa-fw"></i>
+ href="{{ url('hardware?status=Archived') }}">
+ <x-icon type="x" class="text-red fa-fw" />
{{ trans('admin/hardware/general.archived') }}
<span class="badge">{{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }}</span>
</a>
</li>
<li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a
- href="{{ url('hardware?status=Requestable') }}"><i
- class="fas fa-check text-blue fa-fw"></i>
+ href="{{ url('hardware?status=Requestable') }}">
+ <x-icon type="checkmark" class="text-blue fa-fw" />
{{ trans('admin/hardware/general.requestable') }}
</a>
</li>
@@ -514,7 +517,8 @@ class="fas fa-check text-blue fa-fw"></i>
@can('audit', \App\Models\Asset::class)
<li{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
<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>
</a>
</li>
@@ -523,7 +527,8 @@ class="fas fa-check text-blue fa-fw"></i>
@can('checkin', \App\Models\Asset::class)
<li{!! (Request::is('hardware/checkins/due') ? ' class="active"' : '') !!}>
<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>
</a>
</li>
@@ -582,7 +587,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('view', \App\Models\License::class)
<li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
<a href="{{ route('licenses.index') }}">
- <i class="far fa-save fa-fw"></i>
+ <x-icon type="licenses" />
<span>{{ trans('general.licenses') }}</span>
</a>
</li>
@@ -590,7 +595,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('index', \App\Models\Accessory::class)
<li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
<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>
</a>
</li>
@@ -598,7 +603,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('view', \App\Models\Consumable::class)
<li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
<a href="{{ url('consumables') }}">
- <i class="fas fa-tint fa-fw"></i>
+ <x-icon type="consumables" class="fa-fw" />
<span>{{ trans('general.consumables') }}</span>
</a>
</li>
@@ -606,7 +611,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('view', \App\Models\Component::class)
<li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
<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>
</a>
</li>
@@ -614,7 +619,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('view', \App\Models\PredefinedKit::class)
<li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
<a href="{{ route('kits.index') }}">
- <i class="fa fa-object-group fa-fw"></i>
+ <x-icon type="kits" />
<span>{{ trans('general.kits') }}</span>
</a>
</li>
@@ -623,7 +628,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('view', \App\Models\User::class)
<li{!! (Request::is('users*') ? ' class="active"' : '') !!}>
<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>
</a>
</li>
@@ -631,7 +636,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('import')
<li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
<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>
</a>
</li>
@@ -640,9 +645,9 @@ class="fas fa-check text-blue fa-fw"></i>
@can('backend.interact')
<li class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}">
<a href="#" id="settings">
- <i class="fas fa-cog" aria-hidden="true"></i>
+ <x-icon type="settings" />
<span>{{ trans('general.settings') }}</span>
- <i class="fa fa-angle-left pull-right"></i>
+ <x-icon type="angle-left" class="pull-right"/>
</a>
<ul class="treeview-menu">
@@ -732,9 +737,9 @@ class="fas fa-check text-blue fa-fw"></i>
@can('reports.view')
<li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
<a href="#" class="dropdown-toggle">
- <i class="fas fa-chart-bar fa-fw"></i>
+ <x-icon type="reports" />
<span>{{ trans('general.reports') }}</span>
- <i class="fa fa-angle-left pull-right"></i>
+ <x-icon type="angle-left" class="pull-right"/>
</a>
<ul class="treeview-menu">
@@ -784,7 +789,7 @@ class="fas fa-check text-blue fa-fw"></i>
@can('viewRequestable', \App\Models\Asset::class)
<li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>
<a href="{{ route('requestable-assets') }}">
- <i class="fa fa-laptop fa-fw"></i>
+ <x-icon type="requestable" />
<span>{{ trans('general.requestable_items') }}</span>
</a>
</li>
@@ -805,7 +810,7 @@ class="fas fa-check text-blue fa-fw"></i>
<div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">
<div class="col-md-12"
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>
{!! trans('general.debug_warning_text') !!}
</div>
@@ -859,9 +864,8 @@ class="fas fa-check text-blue fa-fw"></i>
<div class="1hidden-xs pull-left">
<div class="pull-left" >
- <a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
- made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
- class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
+ <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" />
+ <span class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
</div>
<div class="pull-right">
@if ($snipeSettings->version_footer!='off')
diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index 2c582ec4b52c..dbe010ab3c24 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -46,7 +46,7 @@
@if (isset($topSubmit) && ($topSubmit=='true'))
<div class="col-md-3 text-right" style="padding-right: 10px;">
<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') }}
</button>
</div>
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index a5de8585e3dc..069ddb49fda8 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -153,7 +153,7 @@ class="btn btn-default btn-sm pull-left">
<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><!--box-footer-->
diff --git a/resources/views/locations/bulk-delete.blade.php b/resources/views/locations/bulk-delete.blade.php
index deab1e7fbd29..e75d5f5f730a 100644
--- a/resources/views/locations/bulk-delete.blade.php
+++ b/resources/views/locations/bulk-delete.blade.php
@@ -51,7 +51,7 @@
<div class="box-footer text-right">
<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 -->
</form>
diff --git a/resources/views/models/bulk-delete.blade.php b/resources/views/models/bulk-delete.blade.php
index 570be2bce878..79b41b20643e 100644
--- a/resources/views/models/bulk-delete.blade.php
+++ b/resources/views/models/bulk-delete.blade.php
@@ -55,7 +55,7 @@
<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>
- <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 -->
</form>
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 91b9e5f882c6..8a053b048fbf 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -108,7 +108,7 @@
<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>
- <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.box-default-->
</form>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 837a95b3be4a..bdef53ecc4b3 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -299,14 +299,14 @@ function genericActionsFormatter(owner_name, element_name) {
}
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> ';
+ 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> ';
}
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> ';
+ 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> ';
} else {
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> ';
+ 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> ';
}
}
@@ -323,11 +323,11 @@ function genericActionsFormatter(owner_name, element_name) {
+ ' data-toggle="modal" '
+ ' data-content="{{ trans('general.sure_to_delete') }} ' + name_for_box + '?" '
+ ' 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> ';
+ + '<x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a> ';
} else {
// Do not show the delete button on things that are already deleted
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> ';
+ 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> ';
}
}
@@ -336,7 +336,7 @@ function genericActionsFormatter(owner_name, element_name) {
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 += '@csrf';
- actions += '<button class="btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.restore') }}"><i class="fas fa-retweet"></i></button> ';
+ 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> ';
}
actions +='</nobr>';
@@ -576,7 +576,7 @@ function externalLinkFormatter(value) {
if (value) {
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;
}
@@ -612,7 +612,7 @@ function changeLogFormatter(value) {
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;
@@ -643,7 +643,7 @@ function minAmtFormatter(row, value) {
// Create a linked phone number in the table list
function phoneFormatter(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 iconFormatter(value) {
function emailFormatter(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>';
}
}
diff --git a/resources/views/partials/forms/edit/submit-button.blade.php b/resources/views/partials/forms/edit/submit-button.blade.php
index f0b18073d2d3..7f2a99bfa89f 100644
--- a/resources/views/partials/forms/edit/submit-button.blade.php
+++ b/resources/views/partials/forms/edit/submit-button.blade.php
@@ -1,5 +1,5 @@
<button type="submit" class="btn btn-primary pull-right">
- <i class="fas fa-check icon-white"></i>
+ <x-icon type="checkmark" />
{{ trans('general.save') }}
</button>
diff --git a/resources/views/partials/forms/edit/submit.blade.php b/resources/views/partials/forms/edit/submit.blade.php
index 3d132b6e16d0..ba63f795811a 100644
--- a/resources/views/partials/forms/edit/submit.blade.php
+++ b/resources/views/partials/forms/edit/submit.blade.php
@@ -2,6 +2,6 @@
<div class="box-footer text-right" style="padding-bottom: 0px;">
<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>
<!-- / partials/forms/edit/submit.blade.php -->
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index 870692f1f52b..2798fe4bb4a0 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -173,7 +173,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php
index 858ad718cb5b..e1aa0a8ff5a7 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -98,7 +98,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php
index 66e223f85f4e..41e0319c1fb4 100644
--- a/resources/views/settings/barcodes.blade.php
+++ b/resources/views/settings/barcodes.blade.php
@@ -141,7 +141,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 4f984b4d4a25..89204a99003d 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -310,7 +310,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 99ed0ddd4409..4066250799bd 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -395,7 +395,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php
index d9a4c4c622ed..c4119b99a87d 100644
--- a/resources/views/settings/google.blade.php
+++ b/resources/views/settings/google.blade.php
@@ -104,7 +104,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 058446e746cb..0aae313ecef1 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -417,7 +417,7 @@ class="table table-striped snipe-table"
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index d7b703e54dcd..08e704806ec8 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -594,7 +594,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index 71067a80fa92..4fad2cadba68 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -105,7 +105,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 020124af56f2..93826dc49a5d 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -177,7 +177,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index a071b9a0fb50..9e114c2ba9ec 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -180,7 +180,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div>
<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>
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index b28eb602d2a0..e1d3b4201aa2 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -230,7 +230,7 @@
<a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }}>
- <i class="fas fa-check icon-white" aria-hidden="true"></i>
+ <x-icon type="checkmark" />
{{ trans('general.update') }}
</button>
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index b20c904d994a..74fbaf83075b 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -129,7 +129,7 @@
<div class="box-footer text-right">
<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 -->
</form>
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index f2658cbb6856..8a26311344f7 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -121,7 +121,7 @@
</div> <!--/box-body-->
<div class="box-footer text-right">
<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 -->
@foreach ($users as $user)
From 0c09f2b2c0e935c93f66088552589a6c7950ec61 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 18:13:49 +0100
Subject: [PATCH 08/36] Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 11 +++++++++++
resources/views/accessories/view.blade.php | 4 ++--
resources/views/account/view-assets.blade.php | 2 +-
resources/views/auth/passwords/reset.blade.php | 4 +---
resources/views/blade/icon.blade.php | 4 +++-
resources/views/companies/view.blade.php | 2 +-
resources/views/components/view.blade.php | 4 ++--
resources/views/consumables/view.blade.php | 4 ++--
resources/views/custom_fields/fields/edit.blade.php | 2 +-
resources/views/groups/index.blade.php | 2 +-
resources/views/hardware/audit.blade.php | 2 +-
resources/views/hardware/checkin.blade.php | 2 +-
resources/views/hardware/checkout.blade.php | 6 +++---
resources/views/hardware/quickscan-checkin.blade.php | 2 +-
resources/views/hardware/quickscan.blade.php | 5 ++++-
resources/views/hardware/view.blade.php | 8 ++++----
resources/views/licenses/view.blade.php | 10 +++++-----
resources/views/locations/view.blade.php | 2 +-
resources/views/manufacturers/view.blade.php | 2 +-
resources/views/models/view.blade.php | 2 +-
resources/views/partials/bootstrap-table.blade.php | 2 +-
.../views/partials/forms/checkout-selector.blade.php | 2 +-
resources/views/partials/more-info.blade.php | 3 ++-
resources/views/reports/activity.blade.php | 5 ++++-
resources/views/settings/backups.blade.php | 2 +-
resources/views/suppliers/view.blade.php | 2 +-
resources/views/users/view.blade.php | 4 ++--
27 files changed, 59 insertions(+), 41 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index a73c333f38b8..f56c6d75a66d 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -107,6 +107,17 @@ public static function icon($type) {
return 'fa fa-arrow-circle-right';
case 'minus':
return 'fas fa-minus';
+ case 'spinner':
+ return 'fas fa-spinner fa-spin';
+ case 'copy-clipboard':
+ return 'fa-regular fa-clipboard';
+ case 'paperclip':
+ return 'fas fa-paperclip';
+ case 'files':
+ return 'fas fa-paperclip';
+ case 'more-info':
+ return 'far fa-life-ring';
+
}
}
}
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index f3add91d405d..039ffb5db998 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -25,7 +25,7 @@
<li class="active">
<a href="#checkedout" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+ <x-icon type="info-circle" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
</a>
@@ -55,7 +55,7 @@
@can('update', $accessory)
<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}
+ <x-icon type="paperclip" /> {{ trans('button.upload') }}
</a>
</li>
@endcan
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index a4ffa16ec70e..40b5d1db991a 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -64,7 +64,7 @@
<li>
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-keyboard fa-2x"></i>
+ <x-icon type="accessory" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}
{!! ($user->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->accessories->count()).'</badge>' : '' !!}
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 1be653fe0ae8..5685719da5a1 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -11,8 +11,6 @@
<div class="container">
<div class="row">
-
-
<div class="col-md-6 col-md-offset-3">
<div class="box login-box" style="width: 100%">
@@ -32,7 +30,7 @@
<input type="hidden" name="token" value="{{ $token }}">
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
- <label class="col-md-4 control-label"><i class="fas fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username') }}</label>
+ <label class="col-md-4 control-label"><x-icon type="user" /> {{ trans('admin/users/table.username') }}</label>
<div class="col-md-6">
<input type="text" class="form-control" name="username" value="{{ old('username', $username) }}">
diff --git a/resources/views/blade/icon.blade.php b/resources/views/blade/icon.blade.php
index 2aad44c9b7e9..06b993c83d11 100644
--- a/resources/views/blade/icon.blade.php
+++ b/resources/views/blade/icon.blade.php
@@ -1,4 +1,6 @@
@props([
'type' => '',
+ 'class' => '',
+ 'style' => '',
])
-<i class="{{ Icon::icon($type) }} {{ $attributes->get('class') }}"{{ isset($style) ? $attributes->merge(['style' => $style]) : '' }} aria-hidden="true"></i>
\ No newline at end of file
+<i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ $attributes->merge(['style' => $style]) }} aria-hidden="true"></i>
\ No newline at end of file
diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php
index 0b94446b2bef..d5911c13604c 100644
--- a/resources/views/companies/view.blade.php
+++ b/resources/views/companies/view.blade.php
@@ -71,7 +71,7 @@
<li>
<a href="#users_tab" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-users"></i></span>
+ <x-icon type="users" /></span>
<span class="hidden-xs hidden-sm">{{ trans('general.people') }}
{!! (($company->users) && ($company->users->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($company->users->count()).'</badge>' : '' !!}
</span>
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 15acdc0eba7d..fe1eaa773071 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -61,7 +61,7 @@
<li class="active">
<a href="#checkedout" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+ <x-icon type="info-circle" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
</a>
@@ -83,7 +83,7 @@
@can('components.files', $component)
<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}
+ <x-icon type="paperclip" /> {{ trans('button.upload') }}
</a>
</li>
@endcan
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index f6ea14042e4f..7b1764f361ca 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -38,7 +38,7 @@
<li>
<a href="#checkedout" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-users fa-2x" aria-hidden="true"></i>
+ <x-icon type="users" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.assigned') }}
{!! ($consumable->users_consumables > 0 ) ? '<badge class="badge badge-secondary">'.number_format($consumable->users_consumables).'</badge>' : '' !!}
@@ -74,7 +74,7 @@
@can('update', $consumable)
<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}
+ <x-icon type="paperclip" /> {{ trans('button.upload') }}
</a>
</li>
@endcan
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 0ffc6f5d4310..12c3a3fb735e 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -143,7 +143,7 @@
</div>
<div class="col-md-9 col-md-offset-3" id="encrypt_warning" style="display:none;">
<div class="callout callout-danger">
- <p><i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
+ <p><x-icon type="warning" /> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
</div>
</div>
@endif
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php
index 49d7d768b979..5f96551d3161 100755
--- a/resources/views/groups/index.blade.php
+++ b/resources/views/groups/index.blade.php
@@ -43,7 +43,7 @@ class="table table-striped snipe-table"
<tr>
<th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-switchable="true" data-sortable="true" data-field="name" data-formatter="groupsAdminLinkFormatter" data-visible="true">{{ trans('admin/groups/table.name') }}</th>
- <th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true"><i class="fas fa-user" aria-hidden="true"></i><span class="sr-only">{{ trans('admin/groups/table.users') }}</span></th>
+ <th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true"><x-icon type="user" /><span class="sr-only">{{ trans('admin/groups/table.users') }}</span></th>
<th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="created_by" data-formatter="usersLinkFormatter">{{ trans('general.created_by') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="groupsActionsFormatter">{{ trans('table.actions') }}</th>
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 0bc4455671f0..be2771fb682f 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -44,7 +44,7 @@
{{ $asset->model->name }}
@else
<span class="text-danger text-bold">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+ <x-icon type="warning" />
{{ trans('admin/hardware/general.model_invalid')}}
</span>
{{ trans('admin/hardware/general.model_invalid_fix')}}
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 12a0627aecd7..5686e74dd40e 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -53,7 +53,7 @@
{{ $asset->model->name }}
@else
<span class="text-danger text-bold">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+ <x-icon type="warning" />
{{ trans('admin/hardware/general.model_invalid')}}
</span>
{{ trans('admin/hardware/general.model_invalid_fix')}}
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 17b971a5baa1..a3a12475266b 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -50,7 +50,7 @@
{{ $asset->model->name }}
@else
<span class="text-danger text-bold">
- <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+ <x-icon type="warning" />
{{ trans('admin/hardware/general.model_invalid')}}
</span>
@@ -153,13 +153,13 @@
<div class="callout callout-info">
@if ($asset->requireAcceptance())
- <i class="far fa-envelope" aria-hidden="true"></i>
+ <x-icon type="email" />
{{ trans('admin/categories/general.required_acceptance') }}
<br>
@endif
@if ($asset->getEula())
- <i class="far fa-envelope" aria-hidden="true"></i>
+ <x-icon type="email" />
{{ trans('admin/categories/general.required_eula') }}
<br>
@endif
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index 7a31e3cf167f..de892399cc3a 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -99,7 +99,7 @@
</tr>
<tr id="checkin-loader" style="display: none;">
<td colspan="3">
- <i class="fas fa-spinner spin" aria-hidden="true"></i> {{ trans('general.processing') }}...
+ <x-icon type="spinner" /> {{ trans('general.processing') }}...
</td>
</tr>
</thead>
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index c47c31dfe1e2..20c40f126590 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -51,7 +51,10 @@
<label class="form-control">
<input type="checkbox" value="1" name="update_location" {{ old('update_location') == '1' ? ' checked="checked"' : '' }}>
<span>{{ trans('admin/hardware/form.asset_location') }}
- <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> {{ trans('general.more_info') }}" data-html="true" data-content="{{ trans('general.quickscan_bulk_help') }}"><i class="far fa-life-ring"></i></a></span>
+ <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> {{ trans('general.more_info') }}" data-html="true" data-content="{{ trans('general.quickscan_bulk_help') }}">
+ <i class="far fa-life-ring">
+
+ </i></a></span>
</label>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 880d0bad22e6..3703a861dd26 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -135,7 +135,7 @@
@can('update', \App\Models\Asset::class)
<li class="pull-right hidden-print">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <i class="fas fa-paperclip" aria-hidden="true"></i>
+ <x-icon type="paperclip" />
{{ trans('button.upload') }}
</a>
</li>
@@ -264,7 +264,7 @@
<ul class="list-unstyled" style="line-height: 25px;">
@if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
<li>
- <i class="far fa-envelope" aria-hidden="true"></i>
+ <x-icon type="email" />
<a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
</li>
@endif
@@ -502,7 +502,7 @@
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->support_url!=''))
<li>
- <i class="far fa-life-ring" aria-hidden="true"></i>
+ <x-icon type="more-info" />
<a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}
<i class="fa fa-external-link" aria-hidden="true"></i>
@@ -532,7 +532,7 @@
@if (($asset->model) && ($asset->model->manufacturer->support_email))
<li>
- <i class="far fa-envelope" aria-hidden="true"></i>
+ <x-icon type="email" />
<a href="mailto:{{ $asset->model->manufacturer->support_email }}">
{{ $asset->model->manufacturer->support_email }}
</a>
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index aabbdb260882..54c41a9a6121 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -20,7 +20,7 @@
<li class="active">
<a href="#details" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+ <x-icon type="info-circle" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
</a>
@@ -59,7 +59,7 @@
@can('update', \App\Models\License::class)
<li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}</a>
+ <x-icon type="paperclip" /> {{ trans('button.upload') }}</a>
</li>
@endcan
</ul>
@@ -101,7 +101,7 @@
@endif
@if ($license->manufacturer->support_url)
- <br><i class="far fa-life-ring" aria-hidden="true"></i>
+ <br><x-icon type="more-info" />
<a href="{{ $license->manufacturer->support_url }}" rel="noopener">{{ $license->manufacturer->support_url }}</a>
@endif
@@ -111,7 +111,7 @@
@endif
@if ($license->manufacturer->support_email)
- <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->manufacturer->support_email }}">{{ $license->manufacturer->support_email }}</a>
+ <br><x-icon type="email" /> <a href="mailto:{{ $license->manufacturer->support_email }}">{{ $license->manufacturer->support_email }}</a>
@endif
</div>
</div>
@@ -200,7 +200,7 @@
@endif
@if ($license->supplier->email)
- <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->supplier->email }}">{{ $license->supplier->email }}</a>
+ <br><x-icon type="email" /> <a href="mailto:{{ $license->supplier->email }}">{{ $license->supplier->email }}</a>
@endif
@if ($license->supplier->address)
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index c6aa083bf587..45c5180d64c3 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -21,7 +21,7 @@
<li class="active">
<a href="#users" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-users fa-2x"></i>
+ <x-icon type="users" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.users') }}
diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php
index 5e7bccc63337..4a1ed16b1b85 100644
--- a/resources/views/manufacturers/view.blade.php
+++ b/resources/views/manufacturers/view.blade.php
@@ -64,7 +64,7 @@
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-keyboard fa-2x"></i>
+ <x-icon type="accessory" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.accessories') }}
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 7192e1edaed9..302d90867996 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -62,7 +62,7 @@
</li>
<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <i class="fas fa-paperclip" aria-hidden="true"></i>
+ <x-icon type="paperclip" />
{{ trans('button.upload') }}
</a>
</li>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index bdef53ecc4b3..7aeca77ca9ae 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -78,7 +78,7 @@ classes: 'table table-responsive table-no-bordered',
return newParams;
},
formatLoadingMessage: function () {
- return '<h2><i class="fas fa-spinner fa-spin" aria-hidden="true"></i> {{ trans('general.loading') }} </h2>';
+ return '<h2><x-icon type="spinner" /> {{ trans('general.loading') }} </h2>';
},
icons: {
advancedSearchIcon: 'fas fa-search-plus',
diff --git a/resources/views/partials/forms/checkout-selector.blade.php b/resources/views/partials/forms/checkout-selector.blade.php
index c24c90d25e64..268089a7d2bc 100644
--- a/resources/views/partials/forms/checkout-selector.blade.php
+++ b/resources/views/partials/forms/checkout-selector.blade.php
@@ -4,7 +4,7 @@
<div class="btn-group" data-toggle="buttons">
@if ((isset($user_select)) && ($user_select!='false'))
<label class="btn btn-default active">
- <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked"><i class="fas fa-user" aria-hidden="true"></i> {{ trans('general.user') }}
+ <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked"><x-icon type="user" /> {{ trans('general.user') }}
</label>
@endif
@if ((isset($asset_select)) && ($asset_select!='false'))
diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php
index bc2e56a3ab86..c0d6aa5f1871 100644
--- a/resources/views/partials/more-info.blade.php
+++ b/resources/views/partials/more-info.blade.php
@@ -1,3 +1,4 @@
<a style="padding-left: 10px; font-size: 18px;" class="text-dark-gray hidden-print" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="{{ trans('general.more_info') }}" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing' }}">
- <i class="far fa-life-ring" aria-hidden="true"><span class="sr-only">{{ trans('general.moreinfo') }}</span></i>
+ <x-icon type="more-info" />
+ span class="sr-only">{{ trans('general.moreinfo') }}</span>
</a>
diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php
index 6ed55dc1630d..d677386ac2e6 100644
--- a/resources/views/reports/activity.blade.php
+++ b/resources/views/reports/activity.blade.php
@@ -9,7 +9,10 @@
@section('header_right')
{{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
{{csrf_field()}}
- <button type="submit" class="btn btn-default"><i class="fas fa-download icon-white" aria-hidden="true"></i> {{ trans('general.download_all') }}</button>
+ <button type="submit" class="btn btn-default">
+ <x-icon type="download" />
+ {{ trans('general.download_all') }}
+ </button>
{{ Form::close() }}
@stop
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index d090daf3bb2a..2a2ce81bd6de 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -144,7 +144,7 @@ class="btn btn-warning btn-sm restore-asset {{ (config('app.lock_passwords')) ?
<!-- displayed on screen -->
<label class="btn btn-default col-md-12 col-xs-12" aria-hidden="true">
- <i class="fas fa-paperclip" aria-hidden="true"></i>
+ <x-icon type="paperclip" />
{{ trans('button.select_file') }}
<input type="file" name="file" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="application/zip" style="display:none;" aria-label="file" aria-hidden="true">
</label>
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index a0dea958e66d..f9fdadd2969f 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -295,7 +295,7 @@ class="table table-striped snipe-table"
<ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px; padding-top: 20px;">
@if ($supplier->contact!='')
- <li><i class="fas fa-user" aria-hidden="true"></i> {{ $supplier->contact }}</li>
+ <li><x-icon type="user" /> {{ $supplier->contact }}</li>
@endif
@if ($supplier->phone!='')
<li><i class="fas fa-phone"></i>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 00bfc84df848..fc91f9e8b765 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -50,7 +50,7 @@
<li>
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-keyboard fa-2x"></i>
+ <x-icon type="accessory" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}
{!! ($user->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->accessories->count()).'</badge>' : '' !!}
@@ -136,7 +136,7 @@
@can('update', \App\Models\User::class)
<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <span class="hidden-xs"><i class="fas fa-paperclip" aria-hidden="true"></i></span>
+ <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-xs hidden-sm">{{ trans('button.upload') }}</span>
</a>
From 4d8904938dfa80487a37b72171a5a692f5dbcdb0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 18:24:26 +0100
Subject: [PATCH 09/36] Added calendar icon for datepickers
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 6 ++++--
resources/views/asset_maintenances/edit.blade.php | 4 ++--
resources/views/blade/icon.blade.php | 3 ++-
resources/views/hardware/audit.blade.php | 2 +-
resources/views/hardware/bulk-checkout.blade.php | 4 ++--
resources/views/hardware/bulk.blade.php | 6 +++---
resources/views/hardware/checkout.blade.php | 5 +++--
resources/views/hardware/edit.blade.php | 6 +++---
resources/views/hardware/quickscan.blade.php | 2 +-
resources/views/licenses/edit.blade.php | 4 ++--
.../custom-field-set-default-values-for-model.blade.php | 2 +-
resources/views/models/custom_fields_form.blade.php | 2 +-
.../views/models/custom_fields_form_bulk_edit.blade.php | 2 +-
resources/views/partials/forms/edit/datepicker.blade.php | 2 +-
resources/views/partials/forms/edit/eol_date.blade.php | 2 +-
resources/views/partials/forms/edit/purchase_date.blade.php | 2 +-
resources/views/partials/more-info.blade.php | 2 +-
17 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index f56c6d75a66d..4173f0b93032 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -99,9 +99,9 @@ public static function icon($type) {
return 'fas fa-tachometer-alt';
case 'info-circle':
return 'fas fa-info-circle';
- case 'carat-right':
+ case 'caret-right':
return 'fa fa-caret-right';
- case 'carat-up':
+ case 'caret-up':
return 'fa fa-caret-up';
case 'arrow-circle-right':
return 'fa fa-arrow-circle-right';
@@ -117,6 +117,8 @@ public static function icon($type) {
return 'fas fa-paperclip';
case 'more-info':
return 'far fa-life-ring';
+ case 'calendar':
+ return 'fas fa-calendar';
}
}
diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php
index 0f0903374820..c3aa8e148304 100644
--- a/resources/views/asset_maintenances/edit.blade.php
+++ b/resources/views/asset_maintenances/edit.blade.php
@@ -63,7 +63,7 @@
<div class="input-group col-md-3{{ (Helper::checkIfRequired($item, 'start_date')) ? ' required' : '' }}">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="start_date" id="start_date" value="{{ old('start_date', $item->start_date) }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('start_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
@@ -78,7 +78,7 @@
<div class="input-group col-md-3{{ (Helper::checkIfRequired($item, 'completion_date')) ? ' required' : '' }}">
<div class="input-group date" data-date-clear-btn="true" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="completion_date" id="completion_date" value="{{ old('completion_date', $item->completion_date) }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('completion_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/blade/icon.blade.php b/resources/views/blade/icon.blade.php
index 06b993c83d11..2f7ca307440c 100644
--- a/resources/views/blade/icon.blade.php
+++ b/resources/views/blade/icon.blade.php
@@ -2,5 +2,6 @@
'type' => '',
'class' => '',
'style' => '',
+ 'id' => '',
])
-<i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ $attributes->merge(['style' => $style]) }} aria-hidden="true"></i>
\ No newline at end of file
+<i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ $attributes->merge(['style' => $style]) }} {{ $attributes->merge(['id' => $id]) }} aria-hidden="true"></i>
\ No newline at end of file
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index be2771fb682f..2a88e171bc43 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -109,7 +109,7 @@
<div class="col-md-8">
<div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $next_audit_date) }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
<p class="help-block">{!! trans('general.next_audit_date_help') !!}</p>
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index bab7849ecb72..465336563d9c 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -42,7 +42,7 @@
<div class="col-md-8">
<div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at') }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
@@ -56,7 +56,7 @@
<div class="col-md-8">
<div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index 23ffa1b96ce3..d36513e889b8 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -60,7 +60,7 @@
<div class="col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ old('purchase_date') }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
</div>
@@ -78,7 +78,7 @@
<div class="col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -178,7 +178,7 @@
<div class="col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date') }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true">
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index a3a12475266b..27d27b45d317 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -128,8 +128,9 @@
<input type="text" class="form-control"
placeholder="{{ trans('general.select_date') }}" name="expected_checkin"
id="expected_checkin" value="{{ old('expected_checkin') }}">
- <span class="input-group-addon"><i class="fas fa-calendar"
- aria-hidden="true"></i></span>
+ <span class="input-group-addon">
+ <x-icon type="calendar" />
+ </span>
</div>
{!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index f31326cc4d29..78e85daa78cc 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -103,7 +103,7 @@
<div class="col-md-9 col-sm-9 col-md-offset-3">
<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" />
<strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
</a>
@@ -124,7 +124,7 @@
<div class="input-group col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $item->next_audit_date) }}" readonly style="background-color:inherit" maxlength="10">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
</div>
<div class="col-md-8 col-md-offset-3">
@@ -153,7 +153,7 @@
<div class="form-group">
<div class="col-md-9 col-sm-9 col-md-offset-3">
<a id="order_info" class="text-primary">
- <i class="fa fa-caret-right fa-2x" id="order_info_icon"></i>
+ <x-icon type="caret-right" class="fa-2x" id="order_info_icon" />
<strong>{{ trans('admin/hardware/form.order_details') }}</strong>
</a>
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 20c40f126590..4b6f8e2d7b61 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -70,7 +70,7 @@
<div class="col-md-9">
<div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $next_audit_date) }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index b8429a21236a..c092324a635d 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -87,7 +87,7 @@
<div class="input-group col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expiration_date" id="expiration_date" value="{{ old('expiration_date', ($item->expiration_date) ? $item->expiration_date->format('Y-m-d') : '') }}" maxlength="10">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('expiration_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
@@ -101,7 +101,7 @@
<div class="input-group col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="termination_date" id="termination_date" value="{{ old('termination_date', ($item->termination_date) ? $item->termination_date->format('Y-m-d') : '') }}" maxlength="10">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('termination_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
index 7f61db8cea23..d2118e500409 100644
--- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
+++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -31,7 +31,7 @@
<div class="input-group col-md-4" style="padding-left: 0px;">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="default_values[{{ $field->id }}]" id="default-value{{ $field->id }}" value="{{ $field->defaultValue($model_id) }}">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
</div>
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index d3773f97c78d..8d414f337d09 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -47,7 +47,7 @@
<div class="input-group col-md-5" style="padding-left: 0px;">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" style="background-color:inherit">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
</div>
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index 251ec8478fcd..e048b38d0962 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -63,7 +63,7 @@
<div class="input-group col-md-5" style="padding-left: 0px;">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" style="background-color:inherit">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
</div>
diff --git a/resources/views/partials/forms/edit/datepicker.blade.php b/resources/views/partials/forms/edit/datepicker.blade.php
index 9d2a714bb734..3bd0200d0acc 100644
--- a/resources/views/partials/forms/edit/datepicker.blade.php
+++ b/resources/views/partials/forms/edit/datepicker.blade.php
@@ -4,7 +4,7 @@
<div class="input-group col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $fieldname }}" id="{{ $fieldname }}" value="{{ old($fieldname, ($item->{$fieldname}) ? date('Y-m-d', strtotime($item->{$fieldname})) : '') }}" readonly style="background-color:inherit" maxlength="10">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first($fieldname, '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/partials/forms/edit/eol_date.blade.php b/resources/views/partials/forms/edit/eol_date.blade.php
index fb461cf44eda..c6764a3f7c48 100644
--- a/resources/views/partials/forms/edit/eol_date.blade.php
+++ b/resources/views/partials/forms/edit/eol_date.blade.php
@@ -4,7 +4,7 @@
<div class="input-group col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="asset_eol_date" id="asset_eol_date" readonly value="{{ old('asset_eol_date', optional($item->asset_eol_date)->format('Y-m-d') ?? $item->asset_eol_date ?? '') }}" style="background-color:inherit" />
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('asset_eol_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/partials/forms/edit/purchase_date.blade.php b/resources/views/partials/forms/edit/purchase_date.blade.php
index 97f81719bed7..f07387c3093c 100644
--- a/resources/views/partials/forms/edit/purchase_date.blade.php
+++ b/resources/views/partials/forms/edit/purchase_date.blade.php
@@ -4,7 +4,7 @@
<div class="input-group col-md-4">
<div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" readonly value="{{ old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}" style="background-color:inherit">
- <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php
index c0d6aa5f1871..370eb350dc9e 100644
--- a/resources/views/partials/more-info.blade.php
+++ b/resources/views/partials/more-info.blade.php
@@ -1,4 +1,4 @@
<a style="padding-left: 10px; font-size: 18px;" class="text-dark-gray hidden-print" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="{{ trans('general.more_info') }}" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing' }}">
<x-icon type="more-info" />
- span class="sr-only">{{ trans('general.moreinfo') }}</span>
+ <span class="sr-only">{{ trans('general.moreinfo') }}</span>
</a>
From d545537a431942b3b1b0d0e625c2daa8ab95853f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 18:34:13 +0100
Subject: [PATCH 10/36] More icons
Signed-off-by: snipe <snipe@snipe.net>
---
.../views/auth/passwords/reset.blade.php | 9 ++++++--
resources/views/errors/404.blade.php | 2 +-
resources/views/hardware/checkout.blade.php | 4 ++--
resources/views/hardware/quickscan.blade.php | 21 +++++++------------
resources/views/hardware/view.blade.php | 2 +-
resources/views/models/view.blade.php | 2 +-
6 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 5685719da5a1..0e529d3f52ce 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -40,7 +40,10 @@
</div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
- <label class="col-md-4 control-label" for="password"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password') }}</label>
+ <label class="col-md-4 control-label" for="password">
+ <x-icon type="password" />
+ {{ trans('admin/users/table.password') }}
+ </label>
<div class="col-md-6">
<input type="password" class="form-control" name="password" aria-label="password">
@@ -49,7 +52,9 @@
</div>
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
- <label class="col-md-4 control-label" for="password_confirmation"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password_confirm') }}</label>
+ <label class="col-md-4 control-label" for="password_confirmation">
+ <x-icon type="password" />
+ {{ trans('admin/users/table.password_confirm') }}</label>
<div class="col-md-6">
<input type="password" class="form-control" name="password_confirmation" aria-label="password_confirmation">
{!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 77d7c3252148..021897922e07 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -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> 404 Page not found.</h2>
+ <h2><x-icon type="warning" class="text-yellow" /> 404 Page not found.</h2>
<p>
Sad panda. We could not find the page you were looking for.
You should maybe <a href="{{ config('app.url') }}">return to the dashboard</a>.
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 27d27b45d317..a067a5a11d82 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -109,8 +109,8 @@
<input type="text" class="form-control"
placeholder="{{ trans('general.select_date') }}" name="checkout_at"
id="checkout_at" value="{{ old('checkout_at', date('Y-m-d')) }}">
- <span class="input-group-addon"><i class="fas fa-calendar"
- aria-hidden="true"></i></span>
+ <span class="input-group-addon">
+ <x-icon type="calendar" /></span>
</div>
{!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 4b6f8e2d7b61..867eeaa2b098 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -52,14 +52,8 @@
<input type="checkbox" value="1" name="update_location" {{ old('update_location') == '1' ? ' checked="checked"' : '' }}>
<span>{{ trans('admin/hardware/form.asset_location') }}
<a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> {{ trans('general.more_info') }}" data-html="true" data-content="{{ trans('general.quickscan_bulk_help') }}">
- <i class="far fa-life-ring">
-
- </i></a></span>
-
+ <x-icon type="more-info" /></a></span>
</label>
-
-
-
</div>
</div>
@@ -86,16 +80,14 @@
</div>
</div>
-
-
</div> <!--/.box-body-->
<div class="box-footer">
<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"><x-icon type="checkmark" /> {{ 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>
@@ -119,7 +111,8 @@
</tr>
<tr id="audit-loader" style="display: none;">
<td colspan="3">
- <i class="fas fa-spinner spin" aria-hidden="true"></i> {{ trans('admin/hardware/form.processing_spinner') }}
+ <x-icon type="spinner" />
+ {{ trans('admin/hardware/form.processing_spinner') }}
</td>
</tr>
</thead>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 3703a861dd26..d4f1aa642d2e 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -44,7 +44,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>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 302d90867996..829df0e9a291 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -268,7 +268,7 @@ class="table table-striped snipe-table"
@if ($model->manufacturer->support_url)
<li>
- <i class="far fa-life-ring"></i> <a href="{{ $model->manufacturer->support_url }}">{{ $model->manufacturer->support_url }}</a>
+ <x-icon type="more-info" /> <a href="{{ $model->manufacturer->support_url }}">{{ $model->manufacturer->support_url }}</a>
</li>
@endif
From 7c9b1f6e38b56305a2f6f59c7bb28df9cc3c599d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 18:39:22 +0100
Subject: [PATCH 11/36] Added the plus icon
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 2 ++
resources/views/hardware/edit.blade.php | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 4173f0b93032..bf0036b679d7 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -119,6 +119,8 @@ public static function icon($type) {
return 'far fa-life-ring';
case 'calendar':
return 'fas fa-calendar';
+ case 'plus':
+ return 'fas fa-plus';
}
}
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 78e85daa78cc..27f578a32bb0 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -44,7 +44,7 @@
</div>
<div class="col-md-2 col-sm-12">
<button class="add_field_button btn btn-default btn-sm">
- <i class="fas fa-plus"></i>
+ <x-icon type="plus" />
</button>
</div>
@endif
From 803bdb457c12f186c75e7d837d301aeb6b8ad217 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 18:48:19 +0100
Subject: [PATCH 12/36] Added calendar
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/kits/checkout.blade.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/resources/views/kits/checkout.blade.php b/resources/views/kits/checkout.blade.php
index 2b50412e1755..212f72c11854 100644
--- a/resources/views/kits/checkout.blade.php
+++ b/resources/views/kits/checkout.blade.php
@@ -33,7 +33,7 @@
<div class="col-md-8">
<div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d" data-date-clear-btn="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at') }}">
- <span class="input-group-addon"><i class="fas fa-calendar"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('checkout_at', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
</div>
@@ -47,7 +47,7 @@
<div class="col-md-8">
<div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
- <span class="input-group-addon"><i class="fas fa-calendar"></i></span>
+ <span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
{!! $errors->first('expected_checkin', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
</div>
From d2e889e927a1b88aca3564d140093f146e7bfb71 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 19:21:59 +0100
Subject: [PATCH 13/36] Still more
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 11 ++++-
resources/views/hardware/view.blade.php | 17 ++++----
resources/views/licenses/view.blade.php | 58 +++++++++++++++++--------
3 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index bf0036b679d7..92d7cdbea749 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -114,13 +114,22 @@ public static function icon($type) {
case 'paperclip':
return 'fas fa-paperclip';
case 'files':
- return 'fas fa-paperclip';
+ return 'fa-regular fa-file';
case 'more-info':
return 'far fa-life-ring';
case 'calendar':
return 'fas fa-calendar';
case 'plus':
return 'fas fa-plus';
+ case 'history':
+ return 'fas fa-history';
+ case 'more-files':
+ return 'fa-solid fa-laptop-file';
+ case 'maintenances':
+ return 'fas fa-wrench';
+ case 'seats':
+ return 'far fa-list-alt';
+
}
}
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index d4f1aa642d2e..8e6eebf64bf1 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -53,7 +53,7 @@
<li>
<a href="#software" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-save fa-2x" aria-hidden="true"></i>
+ <x-icon type="licenses" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
{!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
@@ -64,7 +64,7 @@
<li>
<a href="#components" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-hdd fa-2x" aria-hidden="true"></i>
+ <x-icon type="components" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.components') }}
{!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
@@ -75,7 +75,7 @@
<li>
<a href="#assets" 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') }}
{!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
@@ -88,7 +88,7 @@
<li>
<a href="#history" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-history fa-2x" aria-hidden="true"></i>
+ <x-icon type="history" class="fa-2x "/>
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.history') }}
</span>
@@ -98,7 +98,7 @@
<li>
<a href="#maintenances" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-wrench fa-2x" aria-hidden="true"></i>
+ <x-icon type="maintenances" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
{!! ($asset->assetmaintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assetmaintenances()->count()).'</span>' : '' !!}
@@ -109,7 +109,7 @@
<li>
<a href="#files" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-file fa-2x" aria-hidden="true"></i>
+ <x-icon type="files" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.files') }}
{!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
@@ -121,7 +121,7 @@
<li>
<a href="#modelfiles" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fa-solid fa-laptop-file fa-2x" aria-hidden="true"></i>
+ <x-icon type="more-files" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.additional_files') }}
@@ -300,7 +300,8 @@
</li>
@if (isset($asset->expected_checkin))
<li>
- <i class="fas fa-calendar"></i> {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
+ <x-icon type="calendar" />
+ {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
</li>
@endif
</ul>
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 54c41a9a6121..9127b4cccce7 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -29,7 +29,7 @@
<li>
<a href="#seats" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-list-alt fa-2x" aria-hidden="true"></i>
+ <x-icon type="seats" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('admin/licenses/form.seats') }}</span>
<span class="badge badge-secondary">{{ number_format($license->availCount()->count()) }} / {{ number_format($license->seats) }}</span>
@@ -41,7 +41,8 @@
<li>
<a href="#files" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-file fa-2x" aria-hidden="true"></i></span>
+ <x-icon type="files" class="fa-2x" />
+ </span>
<span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
{!! ($license->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($license->uploads->count()).'</badge>' : '' !!}
</span>
@@ -52,7 +53,8 @@
<li>
<a href="#history" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-history fa-2x" aria-hidden="true"></i></span>
+ <x-icon type="history" class="fa-2x" />
+ </span>
<span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
</a>
</li>
@@ -610,29 +612,42 @@ class="table table-striped snipe-table"
<div class="col-md-3">
@can('update', $license)
- <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
- <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.clone') }}</a>
+ <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-warning btn-social btn-block hidden-print" style="margin-bottom: 10px;">
+ <x-icon type="edit" />
+ {{ trans('admin/licenses/general.edit') }}
+ </a>
+ <a href="{{ route('clone/license', $license->id) }}" class="btn btn-info btn-block btn-social hidden-print" style="margin-bottom: 10px;">
+ <x-icon type="clone" />
+ {{ trans('admin/licenses/general.clone') }}</a>
@endcan
@can('checkout', $license)
@if ($license->availCount()->count() > 0)
- <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">
+
+ <a href="{{ route('licenses.checkout', $license->id) }}" class="btn bg-maroon btn-social btn-block hidden-print" style="margin-bottom: 10px;">
+ <x-icon type="checkout" />
{{ trans('general.checkout') }}
</a>
- <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+
+ <a href="#" class="btn bg-maroon btn-social btn-block hidden-print" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+ <x-icon type="checkout" />
{{ trans('admin/licenses/general.bulk.checkout_all.button') }}
</a>
@else
- <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">
- {{ trans('general.checkout') }}
- </a>
+ <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
+ <a href="#" class="btn bg-maroon btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+ <x-icon type="checkout" />
+ {{ trans('general.checkout') }}
+ </a>
+ </span>
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
- <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
- {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
- </a>
- </span>
+ <a href="#" class="btn bg-maroon btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+ <x-icon type="checkout" />
+ {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
+ </a>
+ </span>
@endif
@endcan
@@ -640,18 +655,21 @@ class="table table-striped snipe-table"
@if (($license->seats - $license->availCount()->count()) <= 0 )
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
- <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
+ <a href="#" class="btn btn-primary bg-purple btn-social btn-block hidden-print disabled" style="margin-bottom: 25px;">
+ <x-icon type="checkin" />
{{ trans('admin/licenses/general.bulk.checkin_all.button') }}
</a>
</span>
@elseif (! $license->reassignable)
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip_reassignable') }}">
- <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
+ <a href="#" class="btn btn-primary bg-purple btn-social btn-block hidden-print disabled" style="margin-bottom: 25px;">
+ <x-icon type="checkin" />
{{ trans('admin/licenses/general.bulk.checkin_all.button') }}
</a>
</span>
@else
- <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true" data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{ trans('general.delete') }}" onClick="return false;">
+ <a href="#" class="btn btn-primary bg-purple btn-social btn-block hidden-print" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true" data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{ trans('general.delete') }}" onClick="return false;">
+ <x-icon type="checkin" />
{{ trans('admin/licenses/general.bulk.checkin_all.button') }}
</a>
@endif
@@ -660,12 +678,14 @@ class="table table-striped snipe-table"
@can('delete', $license)
@if ($license->availCount()->count() == $license->seats)
- <button class="btn btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
+ <button class="btn btn-block btn-danger btn-social delete-license" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
+ <x-icon type="delete" />
{{ trans('general.delete') }}
</button>
@else
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.delete_disabled') }}">
- <a href="#" class="btn btn-block btn-danger disabled">
+ <a href="#" class="btn btn-block btn-danger btn-social delete-license disabled">
+ <x-icon type="delete" />
{{ trans('general.delete') }}
</a>
</span>
From 7ace9324b4450ef0da8fa2c2dd9d21cc96a32175 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 20:30:22 +0100
Subject: [PATCH 14/36] Added padlock sound
Signed-off-by: snipe <snipe@snipe.net>
---
public/sounds/lock.mp3 | Bin 0 -> 22080 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 public/sounds/lock.mp3
diff --git a/public/sounds/lock.mp3 b/public/sounds/lock.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..8628f2fd3c5cd51987c58ca3824168a43b19fad5
GIT binary patch
literal 22080
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
L4-EAG(uDs9pnbBU
literal 0
HcmV?d00001
From a77dcad33654a960f117ba993ba78a78c5c76aab Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 20:30:53 +0100
Subject: [PATCH 15/36] More links
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 11 ++--
resources/views/accessories/view.blade.php | 41 +++++++++++----
resources/views/blade/icon.blade.php | 11 ++--
resources/views/consumables/view.blade.php | 2 +-
resources/views/hardware/view.blade.php | 51 ++++++++++++-------
resources/views/layouts/default.blade.php | 9 ++++
resources/views/licenses/view.blade.php | 10 ++--
resources/views/models/view.blade.php | 2 +-
.../views/settings/localization.blade.php | 2 +-
resources/views/users/view.blade.php | 4 +-
10 files changed, 96 insertions(+), 47 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 92d7cdbea749..10e644177191 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -56,7 +56,7 @@ public static function icon($type) {
case 'admin-settings':
return 'fa fa-cogs';
case 'settings':
- return 'fa fa-sign-out';
+ return 'fa fa-cog';
case 'angle-left':
return 'fa fa-angle-left';
case 'warning':
@@ -90,7 +90,7 @@ public static function icon($type) {
case 'alerts':
return 'far fa-flag';
case 'password':
- return 'fa fa-key';
+ return 'fa-solid fa-key';
case 'api-key':
return 'fa-solid fa-user-secret';
case 'nav-toggle':
@@ -129,7 +129,12 @@ public static function icon($type) {
return 'fas fa-wrench';
case 'seats':
return 'far fa-list-alt';
-
+ case 'globe-us':
+ return 'fas fa-globe-americas';
+ case 'locked':
+ return 'fas fa-lock';
+ case 'unlocked':
+ return 'fas fa-lock';
}
}
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 039ffb5db998..9d0116ef5f34 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -34,7 +34,8 @@
<li>
<a href="#history" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-history fa-2x" aria-hidden="true"></i></span>
+ <x-icon type="history" class="fa-2x" />
+ </span>
<span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
</a>
</li>
@@ -43,11 +44,12 @@
@can('accessories.files', $accessory)
<li>
<a href="#files" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <i class="far fa-file fa-2x" aria-hidden="true"></i></span>
+ <span class="hidden-lg hidden-md">
+ <x-icon type="files" class="fa-2x" />
+ </span>
<span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
{!! ($accessory->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($accessory->uploads->count()).'</badge>' : '' !!}
- </span>
+ </span>
</a>
</li>
@endcan
@@ -55,7 +57,13 @@
@can('update', $accessory)
<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <x-icon type="paperclip" /> {{ trans('button.upload') }}
+ <span class="hidden-lg hidden-xl hidden-md">
+ <x-icon type="paperclip" class="fa-2x" />
+ </span>
+ <span class="hidden-xs hidden-sm">
+ <x-icon type="paperclip" />
+ {{ trans('button.upload') }}
+ </span>
</a>
</li>
@endcan
@@ -186,6 +194,7 @@ class="table table-striped snipe-table"
@foreach ($accessory->uploads as $file)
<tr>
<td>
+ <x-icon type="paperclip" class="fa-2x" />
<i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
<span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
@@ -217,7 +226,7 @@ class="table table-striped snipe-table"
</a>
<a href="{{ route('show.accessoryfile', [$accessory->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>
@endif
@@ -322,31 +331,41 @@ class="table table-striped snipe-table"
<div class="col-md-3 pull-right">
@can('checkout', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;">
- <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-primary btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
+ <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn bg-maroon btn-social btn-block hidden-print {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}">
+ <x-icon type="checkout" />
+ {{ trans('general.checkout') }}
+ </a>
</div>
@endcan
@can('update', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;">
- <a href="{{ route('accessories.edit', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-primary btn-sm">{{ trans('admin/accessories/general.edit') }}</a>
+ <a href="{{ route('accessories.edit', $accessory->id) }}" style="margin-right:5px;" class="btn btn-warning btn-social btn-block hidden-print">
+ <x-icon type="edit" />
+ {{ trans('admin/accessories/general.edit') }}
+ </a>
</div>
@endcan
@can('create', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;">
- <a href="{{ route('clone/accessories', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-primary btn-sm">{{ trans('admin/accessories/general.clone') }}</a>
+ <a href="{{ route('clone/accessories', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-info btn-block btn-social hidden-print">
+ <x-icon type="clone" />
+ {{ trans('admin/accessories/general.clone') }}</a>
</div>
@endcan
@can('delete', $accessory)
@if ($accessory->checkouts_count == 0)
<div class="text-center" style="padding-top:5px;">
- <button class="btn btn-block btn-danger delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
+ <button class="btn btn-block btn-danger btn-social delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
+ <x-icon type="delete" />
{{ trans('general.delete') }}
</button>
</div>
@else
<div class="text-center" style="padding-top:5px;">
<span data-tooltip="true" title=" {{ trans('admin/accessories/general.delete_disabled') }}">
- <a href="#" class="btn btn-block btn-danger disabled">
+ <a href="#" class="btn btn-block btn-danger btn-social delete-asset disabled">
+ <x-icon type="delete" />
{{ trans('general.delete') }}
</a>
</span>
diff --git a/resources/views/blade/icon.blade.php b/resources/views/blade/icon.blade.php
index 2f7ca307440c..7aa6fdd4081c 100644
--- a/resources/views/blade/icon.blade.php
+++ b/resources/views/blade/icon.blade.php
@@ -1,7 +1,10 @@
+{{-- IMPORTANT!!! Make sure there is no newline at the end of this file, or it will break the loaders for the tables --}}
+
@props([
'type' => '',
- 'class' => '',
- 'style' => '',
- 'id' => '',
+ 'class' => false,
+ 'style' => false,
+ 'id' => false,
+ 'title' => false,
])
-<i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ $attributes->merge(['style' => $style]) }} {{ $attributes->merge(['id' => $id]) }} aria-hidden="true"></i>
\ No newline at end of file
+<i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ isset($style) ? $attributes->merge(['style' => $style]): '' }} {{ isset($title) ? $attributes->merge(['title' => $title]): '' }} aria-hidden="true"></i>
\ No newline at end of file
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 7b1764f361ca..9479c1f65129 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -487,7 +487,7 @@ class="table table-striped snipe-table"
</a>
<a href="{{ route('show.consumablefile', [$consumable->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>
@endif
</td>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 8e6eebf64bf1..dabe5cc2d4d1 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -133,10 +133,15 @@
@can('update', \App\Models\Asset::class)
- <li class="pull-right hidden-print">
+ <li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <x-icon type="paperclip" />
- {{ trans('button.upload') }}
+ <span class="hidden-lg hidden-xl hidden-md">
+ <x-icon type="paperclip" class="fa-2x" />
+ </span>
+ <span class="hidden-xs hidden-sm">
+ <x-icon type="paperclip" />
+ {{ trans('button.upload') }}
+ </span>
</a>
</li>
@endcan
@@ -271,7 +276,7 @@
@if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
<li>
- <i class="fas fa-phone" aria-hidden="true"></i>
+ <x-icon type="phone" />
<a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
</li>
@endif
@@ -493,10 +498,10 @@
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!=''))
<li>
- <i class="fas fa-globe-americas" aria-hidden="true"></i>
+ <x-icon type="globe-us" />
<a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}
- <i class="fa fa-external-link" aria-hidden="true"></i>
+ <x-icon type="external-link" />
</a>
</li>
@endif
@@ -506,25 +511,26 @@
<x-icon type="more-info" />
<a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}
- <i class="fa fa-external-link" aria-hidden="true"></i>
+ <x-icon type="external-link" />
</a>
</li>
@endif
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
<li>
- <i class="far fa-wrench" aria-hidden="true"></i>
+ <x-icon type="maintenances" />
<a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}
- <i class="fa fa-external-link" aria-hidden="true"><span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
+ <i class="fa fa-external-link" aria-hidden="true">
+ <span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
</a>
</li>
@endif
@if (($asset->model) && ($asset->model->manufacturer->support_phone))
<li>
- <i class="fas fa-phone" aria-hidden="true"></i>
+ <x-icon type="phone" />
<a href="tel:{{ $asset->model->manufacturer->support_phone }}">
{{ $asset->model->manufacturer->support_phone }}
</a>
@@ -621,6 +627,7 @@
</div>
<div class="col-md-9{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
@if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!=''))
+
<i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}" onclick="showHideEncValue(this)" id="text-{{ $field->id }}"></i>
@endif
@@ -792,7 +799,8 @@
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
<a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
- <i class="fa fa-external-link" aria-hidden="true"><span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
+ <x-icon type="external-link" />
+ <span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
</a>
@endif
</div>
@@ -886,12 +894,17 @@
{{ trans('general.na_no_purchase_date') }}
@endif
@if ($asset->eol_explicit)
- <i class="fas fa-exclamation-triangle text-orange"
- aria-hidden="true"
- data-tooltip="true"
- data-placement="top"
- data-title="Explicit EOL"
- title="Explicit EOL">
+
+ <span data-tooltip="true"
+ data-placement="top"
+ data-title="Explicit EOL"
+ title="Explicit EOL">
+ <x-icon type="warning" class="text-orange" />
+ </span>
+
+ <i class="fas fa-exclamation-triangle text-orange"
+
+ >
</i>
@endif
</div>
@@ -1385,7 +1398,7 @@ class="table table-striped snipe-table"
</a>
<a href="{{ route('show/assetfile', [$asset->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>
@endif
</td>
@@ -1487,7 +1500,7 @@ class="table table-striped snipe-table"
</a>
<a href="{{ route('show/modelfile', [$asset->model->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>
@endif
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index edeeb6bf6fb4..72d1249c311b 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1014,16 +1014,25 @@ function showHideEncValue(e) {
// Use element id to find the text element to hide / show
var targetElement = e.id+"-to-show";
var hiddenElement = e.id+"-to-hide";
+ var audio = new Audio('{{ config('app.url') }}/sounds/lock.mp3');
if($(e).hasClass('fa-lock')) {
+ @if ($user->enable_sounds)
+ audio.play()
+ @endif
$(e).removeClass('fa-lock').addClass('fa-unlock');
// Show the encrypted custom value and hide the element with asterisks
document.getElementById(targetElement).style.fontSize = "100%";
document.getElementById(hiddenElement).style.display = "none";
+
} else {
+ @if ($user->enable_sounds)
+ audio.play()
+ @endif
$(e).removeClass('fa-unlock').addClass('fa-lock');
// ClipboardJS can't copy display:none elements so use a trick to hide the value
document.getElementById(targetElement).style.fontSize = "0px";
document.getElementById(hiddenElement).style.display = "";
+
}
}
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 9127b4cccce7..676adf415196 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -99,7 +99,7 @@
@endcan
@if ($license->manufacturer->url)
- <br><i class="fas fa-globe-americas" aria-hidden="true"></i> <a href="{{ $license->manufacturer->url }}" rel="noopener">{{ $license->manufacturer->url }}</a>
+ <br><x-icon type="globe-us" /> <a href="{{ $license->manufacturer->url }}" rel="noopener">{{ $license->manufacturer->url }}</a>
@endif
@if ($license->manufacturer->support_url)
@@ -108,7 +108,7 @@
@endif
@if ($license->manufacturer->support_phone)
- <br><i class="fas fa-phone" aria-hidden="true"></i>
+ <br><x-icon type="phone" />
<a href="tel:{{ $license->manufacturer->support_phone }}">{{ $license->manufacturer->support_phone }}</a>
@endif
@@ -193,11 +193,11 @@
@endcan
@if ($license->supplier->url)
- <br><i class="fas fa-globe-americas" aria-hidden="true"></i> <a href="{{ $license->supplier->url }}" rel="noopener">{{ $license->supplier->url }}</a>
+ <br><x-icon type="globe-us" /> <a href="{{ $license->supplier->url }}" rel="noopener">{{ $license->supplier->url }}</a>
@endif
@if ($license->supplier->phone)
- <br><i class="fas fa-phone" aria-hidden="true"></i>
+ <br><x-icon type="phone" />
<a href="tel:{{ $license->supplier->phone }}">{{ $license->supplier->phone }}</a>
@endif
@@ -536,7 +536,7 @@ class="table table-striped snipe-table"
</a>
<a href="{{ route('show.licensefile', [$license->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>
@endif
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 829df0e9a291..f9b9cf632e46 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -173,7 +173,7 @@ class="table table-striped snipe-table"
</a>
<a href="{{ route('show/modelfile', [$model->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>
@endif
diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index 4fad2cadba68..d8f3e436e30e 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -32,7 +32,7 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-globe-americas" aria-hidden="true"></i> {{ trans('admin/settings/general.localization') }}
+ <x-icon type="globe-us" /> {{ trans('admin/settings/general.localization') }}
</h2>
</div>
<div class="box-body">
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index fc91f9e8b765..0fe528349aca 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -459,7 +459,7 @@
{{ trans('general.website') }}
</div>
<div class="col-md-9">
- <a href="{{ $user->website }}" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i> {{ $user->website }}</a>
+ <a href="{{ $user->website }}" target="_blank"><x-icon type="external-link" /> {{ $user->website }}</a>
</div>
</div>
@endif
@@ -957,7 +957,7 @@ class="table table-striped snipe-table"
</a>
<a href="{{ route('show/userfile', [$user->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>
@endif
@endif
From ae2f9571b43665eee44b7e9ed48e0358b65eff04 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 21:57:37 +0100
Subject: [PATCH 16/36] And still more
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 10 +-
resources/views/errors/403.blade.php | 2 +-
resources/views/errors/503.blade.php | 2 +-
resources/views/hardware/edit.blade.php | 10 +-
resources/views/hardware/view.blade.php | 86 +++++++-----
.../views/partials/bootstrap-table.blade.php | 16 +--
resources/views/users/view.blade.php | 128 ++++++++++++------
7 files changed, 163 insertions(+), 91 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 10e644177191..e1df5f59d6af 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -43,7 +43,7 @@ public static function icon($type) {
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 @@ public static function icon($type) {
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 @@ public static function icon($type) {
return 'fas fa-lock';
case 'unlocked':
return 'fas fa-lock';
+ case 'locations':
+ return 'fas fa-map-marker-alt';
+ case 'superadmin':
+ return 'fas fa-crown';
}
}
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index e2a8642ca6fc..1196f699943b 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -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>
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 4adb020d4e93..c3af4644a264 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -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 -->
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 27f578a32bb0..bdbc3c3c2e73 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -255,17 +255,15 @@ function user_add(status_id) {
$("#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 @@ function user_add(status_id) {
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>';
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index dabe5cc2d4d1..54ac703e7901 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -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 @@ class="table table-striped snipe-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
@@ -1394,7 +1406,7 @@ class="table table-striped snipe-table"
<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 @@ class="table table-striped snipe-table"
</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 @@ class="table table-striped snipe-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
@@ -1496,7 +1510,7 @@ class="table table-striped snipe-table"
<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 @@ class="table table-striped snipe-table"
</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 @@ class="table table-striped snipe-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
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 7aeca77ca9ae..f24552d75366 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -556,7 +556,7 @@ function customFieldsFormatter(value, row) {
} 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 @@ function changeLogFormatter(value) {
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 groupsAdminLinkFormatter(value, row) {
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 @@ function assetSerialLinkFormatter(value, row) {
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 assetSerialLinkFormatter(value, row) {
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 imageFormatter(value, row) {
}
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 @@ function fileUploadFormatter(value) {
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>';
}
}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 0fe528349aca..a799571154ed 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -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 @@ class="table table-striped snipe-table"
{{ 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 @@ class="table table-striped snipe-table"
@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 @@ class="table table-striped snipe-table"
<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 @@ class="table table-striped snipe-table"
$("#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 @@ class="table table-striped snipe-table"
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 @@ class="table table-striped snipe-table"
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");
});
From c700127f1ae3db8cd2d4585476ac27b1c146fe43 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 22:09:00 +0100
Subject: [PATCH 17/36] Updated user view
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 4 ++
resources/views/users/view.blade.php | 77 ++++++++++++++++++++--------
2 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index e1df5f59d6af..807f9fe84c48 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -141,6 +141,10 @@ public static function icon($type) {
return 'fas fa-map-marker-alt';
case 'superadmin':
return 'fas fa-crown';
+ case 'print':
+ return 'fa-solid fa-print';
+ case 'checkin-and-delete':
+ return 'fa-solid fa-user-xmark';
}
}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index a799571154ed..e1f3953c5f64 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -182,20 +182,20 @@
@can('update', $user)
<div class="col-md-12">
- <a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.edit') }}</a>
+ <a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
+ <x-icon type="edit" />
+ {{ trans('admin/users/general.edit') }}
+ </a>
</div>
@endcan
- @can('create', $user)
- <div class="col-md-12" style="padding-top: 5px;">
- <a href="{{ route('users.clone.show', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a>
- </div>
- @endcan
-
@can('view', $user)
<div class="col-md-12" style="padding-top: 5px;">
@if($user->allAssignedCount() != '0')
- <a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print" target="_blank" rel="noopener">{{ trans('admin/users/general.print_assigned') }}</a>
+ <a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" target="_blank" rel="noopener">
+ <x-icon type="print" />
+ {{ trans('admin/users/general.print_assigned') }}
+ </a>
@else
<button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">{{ trans('admin/users/general.print_assigned') }}</button>
@endif
@@ -207,12 +207,21 @@
@if(!empty($user->email) && ($user->allAssignedCount() != '0'))
<form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
{{ csrf_field() }}
- <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener">{{ trans('admin/users/general.email_assigned') }}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener">
+ <x-icon type="email" />
+ {{ trans('admin/users/general.email_assigned') }}
+ </button>
</form>
@elseif(!empty($user->email) && ($user->allAssignedCount() == '0'))
- <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">{{ trans('admin/users/general.email_assigned') }}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">
+ <x-icon type="email" />
+ {{ trans('admin/users/general.email_assigned') }}
+ </button>
@else
- <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('admin/users/general.email_assigned') }}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
+ <x-icon type="email" />
+ {{ trans('admin/users/general.email_assigned') }}
+ </button>
@endif
</div>
@endcan
@@ -223,26 +232,48 @@
@if($user->email != '')
<form action="{{ route('users.password',['userId'=> $user->id]) }}" method="POST">
{{ csrf_field() }}
- <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('button.send_password_link') }}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
+ <x-icon type="password" />
+ {{ trans('button.send_password_link') }}
+ </button>
</form>
@else
- <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('button.send_password_link') }}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
+ <x-icon type="email" />
+ {{ trans('button.send_password_link') }}
+ </button>
@endif
</div>
@endif
@endcan
- @can('delete', $user)
+ @can('create', $user)
+ <div class="col-md-12" style="padding-top: 5px;">
+ <a href="{{ route('users.clone.show', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-info btn-social hidden-print">
+ <x-icon type="clone" />
+ {{ trans('admin/users/general.clone') }}
+ </a>
+ </div>
+ @endcan
+
+
+ @can('delete', $user)
@if ($user->deleted_at=='')
<div class="col-md-12" style="padding-top: 30px;">
@if ($user->isDeletable())
<form action="{{route('users.destroy',$user->id)}}" method="POST">
{{csrf_field()}}
{{ method_field("DELETE")}}
- <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
+ <x-icon type="delete" />
+ {{ trans('button.delete')}}
+ </button>
</form>
@else
- <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print disabled">{{ trans('button.delete')}}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print disabled">
+ <x-icon type="delete" />
+ {{ trans('button.delete')}}
+ </button>
@endif
</div>
<div class="col-md-12" style="padding-top: 5px;">
@@ -252,14 +283,20 @@
<input type="hidden" name="bulk_actions" value="delete" />
<input type="hidden" name="ids[{{ $user->id }}]" value="{{ $user->id }}" />
- <button style="width: 100%;" class="btn btn-sm btn-danger hidden-print">{{ trans('button.checkin_and_delete') }}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-danger btn-social hidden-print">
+ <x-icon type="checkin-and-delete" />
+ {{ trans('button.checkin_and_delete') }}
+ </button>
</form>
</div>
@else
<div class="col-md-12" style="padding-top: 5px;">
<form method="POST" action="{{ route('users.restore.store', $user->id) }}">
@csrf
- <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button>
+ <button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
+ <x-icon type="restore" />
+ {{ trans('button.restore') }}
+ </button>
</form>
</div>
@endif
@@ -636,7 +673,7 @@
{{ trans('admin/users/general.two_factor_active') }}
</div>
<div class="col-md-9">
- @if ($user->$user->two_factor_active()) == '1')
+ @if ($user->two_factor_active()) == '1')
<x-icon type="checkmark" class="fa-fw text-success" />
{{ trans('general.yes') }}
@else
@@ -653,7 +690,7 @@
{{ trans('admin/users/general.two_factor_enrolled') }}
</div>
<div class="col-md-9" id="two_factor_reset_toggle">
- @if ($user->$user->two_factor_active_and_enrolled()) == '1')
+ @if ($user->two_factor_active_and_enrolled()) == '1')
<x-icon type="checkmark" class="fa-fw text-success" />
{{ trans('general.yes') }}
@else
From f200960a5756e306d4230b70b702c8c772505597 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 22:26:57 +0100
Subject: [PATCH 18/36] Aaaand more
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 2 +
resources/views/accessories/view.blade.php | 27 ++++++------
resources/views/consumables/view.blade.php | 50 ++++++++++++++--------
resources/views/licenses/view.blade.php | 24 +++++------
resources/views/users/view.blade.php | 10 ++---
5 files changed, 65 insertions(+), 48 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 807f9fe84c48..0c01de3f05a5 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -105,6 +105,8 @@ public static function icon($type) {
return 'fa fa-caret-right';
case 'caret-up':
return 'fa fa-caret-up';
+ case 'caret-down':
+ return 'fa fa-caret-down';
case 'arrow-circle-right':
return 'fa fa-arrow-circle-right';
case 'minus':
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 9d0116ef5f34..41e8d1c41bd9 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -329,25 +329,28 @@ class="table table-striped snipe-table"
</div>
<div class="col-md-3 pull-right">
+
+ @can('update', \App\Models\Accessory::class)
+ <div class="text-center" style="padding-top:5px;">
+ <a href="{{ route('accessories.edit', $accessory->id) }}" style="margin-right:5px;" class="btn btn-warning btn-sm btn-social btn-block hidden-print">
+ <x-icon type="edit" />
+ {{ trans('admin/accessories/general.edit') }}
+ </a>
+ </div>
+ @endcan
+
@can('checkout', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;">
- <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn bg-maroon btn-social btn-block hidden-print {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}">
+ <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn bg-maroon btn-sm btn-social btn-block hidden-print {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}">
<x-icon type="checkout" />
{{ trans('general.checkout') }}
</a>
</div>
@endcan
- @can('update', \App\Models\Accessory::class)
- <div class="text-center" style="padding-top:5px;">
- <a href="{{ route('accessories.edit', $accessory->id) }}" style="margin-right:5px;" class="btn btn-warning btn-social btn-block hidden-print">
- <x-icon type="edit" />
- {{ trans('admin/accessories/general.edit') }}
- </a>
- </div>
- @endcan
+
@can('create', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;">
- <a href="{{ route('clone/accessories', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-info btn-block btn-social hidden-print">
+ <a href="{{ route('clone/accessories', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-info btn-block btn-sm btn-social hidden-print">
<x-icon type="clone" />
{{ trans('admin/accessories/general.clone') }}</a>
</div>
@@ -356,7 +359,7 @@ class="table table-striped snipe-table"
@can('delete', $accessory)
@if ($accessory->checkouts_count == 0)
<div class="text-center" style="padding-top:5px;">
- <button class="btn btn-block btn-danger btn-social delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
+ <button class="btn btn-block btn-danger btn-sm btn-social delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
<x-icon type="delete" />
{{ trans('general.delete') }}
</button>
@@ -364,7 +367,7 @@ class="table table-striped snipe-table"
@else
<div class="text-center" style="padding-top:5px;">
<span data-tooltip="true" title=" {{ trans('admin/accessories/general.delete_disabled') }}">
- <a href="#" class="btn btn-block btn-danger btn-social delete-asset disabled">
+ <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-asset disabled">
<x-icon type="delete" />
{{ trans('general.delete') }}
</a>
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 9479c1f65129..7cfbef244592 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -97,39 +97,51 @@
@can('update', $consumable)
<div class="col-md-12">
- <a href="{{ route('consumables.edit', $consumable->id) }}" style="margin-bottom:5px;" class="btn btn-sm btn-block btn-primary hidden-print">{{ trans('button.edit') }}</a>
+ <a href="{{ route('consumables.edit', $consumable->id) }}" style="margin-bottom:5px;" class="btn btn-sm btn-block btn-social btn-warning hidden-print">
+ <x-icon type="edit" />
+ {{ trans('button.edit') }}
+ </a>
</div>
@endcan
- @can('create', Consumable::class)
+ @can('checkout', $consumable)
+ @if ($consumable->numRemaining() > 0)
+ <div class="col-md-12">
+ <a href="{{ route('consumables.checkout.show', $consumable->id) }}" style="margin-bottom:5px;" class="btn btn-sm btn-block bg-maroon btn-social hidden-print">
+ <x-icon type="checkout" />
+ {{ trans('general.checkout') }}
+ </a>
+ </div>
+ @else
+ <div class="col-md-12">
+ <button style="margin-bottom:10px;" class="btn btn-block bg-maroon btn-sm btn-social hidden-print disabled">
+ <x-icon type="checkout" />
+ {{ trans('general.checkout') }}
+ </button>
+ </div>
+ @endif
+ @endif
+
+
+ @can('create', Consumable::class)
<div class="col-md-12">
- <a href="{{ route('consumables.clone.create', $consumable->id) }}" style="margin-bottom:5px;" class="btn btn-sm btn-block btn-primary hidden-print">{{ trans('button.var.clone', ['item_type' => trans('general.consumable')]) }}</a>
+ <a href="{{ route('consumables.clone.create', $consumable->id) }}" style="margin-bottom:5px;" class="btn btn-sm btn-block btn-info btn-social hidden-print">
+ <x-icon type="clone" />
+ {{ trans('button.var.clone', ['item_type' => trans('general.consumable')]) }}
+ </a>
</div>
@endcan
- @can('checkout', $consumable)
- @if ($consumable->numRemaining() > 0)
- <div class="col-md-12">
- <a href="{{ route('consumables.checkout.show', $consumable->id) }}" style="margin-bottom:5px;" class="btn btn-sm btn-block btn-primary hidden-print">
- {{ trans('general.checkout') }}
- </a>
- </div>
- @else
- <div class="col-md-12">
- <button style="margin-bottom:10px;" class="btn btn-block btn-primary btn-sm disabled">
- {{ trans('general.checkout') }}
- </button>
- </div>
- @endif
- @endif
@can('delete', $consumable)
<div class="col-md-12" style="padding-top: 10px; padding-bottom: 20px">
@if ($consumable->deleted_at=='')
- <button class="btn btn-sm btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $consumable->name]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }}
+ <button class="btn btn-sm btn-block btn-danger btn-social hidden-print delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $consumable->name]) }}" data-target="#dataConfirmModal">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
</button>
<span class="sr-only">{{ trans('general.delete') }}</span>
@endif
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 676adf415196..616fa96fbbb9 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -612,11 +612,11 @@ class="table table-striped snipe-table"
<div class="col-md-3">
@can('update', $license)
- <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-warning btn-social btn-block hidden-print" style="margin-bottom: 10px;">
+ <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-warning btn-sm btn-social btn-block hidden-print" style="margin-bottom: 10px;">
<x-icon type="edit" />
{{ trans('admin/licenses/general.edit') }}
</a>
- <a href="{{ route('clone/license', $license->id) }}" class="btn btn-info btn-block btn-social hidden-print" style="margin-bottom: 10px;">
+ <a href="{{ route('clone/license', $license->id) }}" class="btn btn-info btn-block btn-sm btn-social hidden-print" style="margin-bottom: 10px;">
<x-icon type="clone" />
{{ trans('admin/licenses/general.clone') }}</a>
@endcan
@@ -625,25 +625,25 @@ class="table table-striped snipe-table"
@if ($license->availCount()->count() > 0)
- <a href="{{ route('licenses.checkout', $license->id) }}" class="btn bg-maroon btn-social btn-block hidden-print" style="margin-bottom: 10px;">
+ <a href="{{ route('licenses.checkout', $license->id) }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 10px;">
<x-icon type="checkout" />
{{ trans('general.checkout') }}
</a>
- <a href="#" class="btn bg-maroon btn-social btn-block hidden-print" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+ <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
<x-icon type="checkout" />
{{ trans('admin/licenses/general.bulk.checkout_all.button') }}
</a>
@else
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
- <a href="#" class="btn bg-maroon btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+ <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
<x-icon type="checkout" />
{{ trans('general.checkout') }}
</a>
</span>
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
- <a href="#" class="btn bg-maroon btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+ <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
<x-icon type="checkout" />
{{ trans('admin/licenses/general.bulk.checkout_all.button') }}
</a>
@@ -652,23 +652,23 @@ class="table table-striped snipe-table"
@endcan
@can('checkin', $license)
-
+
@if (($license->seats - $license->availCount()->count()) <= 0 )
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
- <a href="#" class="btn btn-primary bg-purple btn-social btn-block hidden-print disabled" style="margin-bottom: 25px;">
+ <a href="#" class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 25px;">
<x-icon type="checkin" />
{{ trans('admin/licenses/general.bulk.checkin_all.button') }}
</a>
</span>
@elseif (! $license->reassignable)
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip_reassignable') }}">
- <a href="#" class="btn btn-primary bg-purple btn-social btn-block hidden-print disabled" style="margin-bottom: 25px;">
+ <a href="#" class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 25px;">
<x-icon type="checkin" />
{{ trans('admin/licenses/general.bulk.checkin_all.button') }}
</a>
</span>
@else
- <a href="#" class="btn btn-primary bg-purple btn-social btn-block hidden-print" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true" data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{ trans('general.delete') }}" onClick="return false;">
+ <a href="#" class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true" data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{ trans('general.delete') }}" onClick="return false;">
<x-icon type="checkin" />
{{ trans('admin/licenses/general.bulk.checkin_all.button') }}
</a>
@@ -678,13 +678,13 @@ class="table table-striped snipe-table"
@can('delete', $license)
@if ($license->availCount()->count() == $license->seats)
- <button class="btn btn-block btn-danger btn-social delete-license" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
+ <button class="btn btn-block btn-danger btn-sm btn-social delete-license" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
<x-icon type="delete" />
{{ trans('general.delete') }}
</button>
@else
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.delete_disabled') }}">
- <a href="#" class="btn btn-block btn-danger btn-social delete-license disabled">
+ <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-license disabled">
<x-icon type="delete" />
{{ trans('general.delete') }}
</a>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index e1f3953c5f64..7a9b827fe29e 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -182,7 +182,7 @@
@can('update', $user)
<div class="col-md-12">
- <a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
+ <a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
<x-icon type="edit" />
{{ trans('admin/users/general.edit') }}
</a>
@@ -753,7 +753,7 @@
{{Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost)}}
<a id="optional_info" class="text-primary">
- <x-icon type="caret-right" class="fa-2x" id="optional_info_icon" /></i>
+ <x-icon type="caret-right" id="optional_info_icon" /></i>
<strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
</a>
</div>
@@ -1056,7 +1056,7 @@ class="table table-striped snipe-table"
<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="{{ trans('general.delete') }} {{ $file->filename }}?">
- <x-icon type="deletet" class="fa-2x" />
+ <x-icon type="delete" />
<span class="sr-only">{{ trans('general.delete') }}</span>
</a>
</td>
@@ -1235,7 +1235,7 @@ class="table table-striped snipe-table"
});
- //binds to onchange event of your input field
+ // binds to onchange event of your input field
var uploadedFileSize = 0;
$('#fileupload').bind('change', function() {
uploadedFileSize = this.files[0].size;
@@ -1276,7 +1276,7 @@ class="table table-striped snipe-table"
$('.progress-bar-text').html('Finished!');
$('.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");
+ $('<tr><td>' + file.note + '</td><td>' + file.filename + '</td></tr>').prependTo("#files-table > tbody");
});
}
$('#progress').removeClass('active');
From 00bc9ac8065f4a960d508c4883ba01b77b1eb2b4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 18 Aug 2024 22:39:14 +0100
Subject: [PATCH 19/36] Fixed spacing
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/components/view.blade.php | 20 ++++++++++----------
resources/views/layouts/default.blade.php | 4 ++--
resources/views/licenses/view.blade.php | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index fe1eaa773071..287b0b23a878 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -284,22 +284,22 @@ class="table table-striped snipe-table"
</div>
@endif
+ @can('update', $component)
+ <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+ <a href="{{ route('components.edit', $component->id) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
+ <x-icon type="edit" />
+ {{ trans('admin/components/general.edit') }}
+ </a>
+ </div>
+ @endcan
+
@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">
+ <a href="{{ route('components.checkout.show', $component->id) }}" class="btn btn-sm bg-maroon btn-social btn-block hidden-print">
<x-icon type="checkout" />
{{ trans('admin/components/general.checkout') }}
</a>
-
</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
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 72d1249c311b..c227f9ed7f66 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1016,7 +1016,7 @@ function showHideEncValue(e) {
var hiddenElement = e.id+"-to-hide";
var audio = new Audio('{{ config('app.url') }}/sounds/lock.mp3');
if($(e).hasClass('fa-lock')) {
- @if ($user->enable_sounds)
+ @if ((isset($user)) && ($user->enable_sounds))
audio.play()
@endif
$(e).removeClass('fa-lock').addClass('fa-unlock');
@@ -1025,7 +1025,7 @@ function showHideEncValue(e) {
document.getElementById(hiddenElement).style.display = "none";
} else {
- @if ($user->enable_sounds)
+ @if ((isset($user)) && ($user->enable_sounds))
audio.play()
@endif
$(e).removeClass('fa-unlock').addClass('fa-lock');
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 616fa96fbbb9..6afbcffe4fd2 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -612,11 +612,11 @@ class="table table-striped snipe-table"
<div class="col-md-3">
@can('update', $license)
- <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-warning btn-sm btn-social btn-block hidden-print" style="margin-bottom: 10px;">
+ <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-warning btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
<x-icon type="edit" />
{{ trans('admin/licenses/general.edit') }}
</a>
- <a href="{{ route('clone/license', $license->id) }}" class="btn btn-info btn-block btn-sm btn-social hidden-print" style="margin-bottom: 10px;">
+ <a href="{{ route('clone/license', $license->id) }}" class="btn btn-info btn-block btn-sm btn-social hidden-print" style="margin-bottom: 5px;">
<x-icon type="clone" />
{{ trans('admin/licenses/general.clone') }}</a>
@endcan
@@ -625,25 +625,25 @@ class="table table-striped snipe-table"
@if ($license->availCount()->count() > 0)
- <a href="{{ route('licenses.checkout', $license->id) }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 10px;">
+ <a href="{{ route('licenses.checkout', $license->id) }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
<x-icon type="checkout" />
{{ trans('general.checkout') }}
</a>
- <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+ <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
<x-icon type="checkout" />
{{ trans('admin/licenses/general.bulk.checkout_all.button') }}
</a>
@else
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
- <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+ <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
<x-icon type="checkout" />
{{ trans('general.checkout') }}
</a>
</span>
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
- <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+ <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
<x-icon type="checkout" />
{{ trans('admin/licenses/general.bulk.checkout_all.button') }}
</a>
From 59725f203173f5eb9536d052d1356f8be2ca5df4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 11:57:40 +0100
Subject: [PATCH 20/36] Removed extra debugging in test
Signed-off-by: snipe <snipe@snipe.net>
---
tests/Unit/AssetTest.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/tests/Unit/AssetTest.php b/tests/Unit/AssetTest.php
index ef0da1a1b8a9..d0f3af623373 100644
--- a/tests/Unit/AssetTest.php
+++ b/tests/Unit/AssetTest.php
@@ -146,10 +146,8 @@ public function testAutoIncrementBIG()
$this->assertTrue($a->save());
$this->assertTrue($b->save());
- \Log::error("A asset tag is: " . $a->asset_tag);
$matches = [];
preg_match('/\d+/', $a->asset_tag, $matches);
- \Log::error("digits are: " . $matches[0]);
$this->assertEquals(Setting::getSettings()->next_auto_tag_base, $matches[0] + 1, "Next auto increment number should be the last normally-saved one plus one, but isn't");
}
From 0bc995b87f6dc5db5523ed099cafd6ea396c642a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 11:58:05 +0100
Subject: [PATCH 21/36] Updated more icons
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/account/view-assets.blade.php | 4 ++--
resources/views/locations/view.blade.php | 7 ++++---
resources/views/manufacturers/view.blade.php | 10 +++-------
resources/views/suppliers/view.blade.php | 2 +-
resources/views/users/view.blade.php | 2 +-
5 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index 40b5d1db991a..b973ad2bd0ab 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -42,7 +42,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>' : '' !!}
@@ -64,7 +64,7 @@
<li>
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <x-icon type="accessory" class="fa-2x" />
+ <x-icon type="accessories" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}
{!! ($user->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->accessories->count()).'</badge>' : '' !!}
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 45c5180d64c3..2eb7a01d87ed 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -34,7 +34,7 @@
<li>
<a href="#assets" 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('admin/locations/message.current_location') }}
@@ -47,7 +47,8 @@
<li>
<a href="#rtd_assets" 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('admin/hardware/form.default_location') }}
@@ -59,7 +60,7 @@
<li>
<a href="#assets_assigned" 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('admin/locations/message.assigned_assets') }}
diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php
index 4a1ed16b1b85..49e151e459c1 100644
--- a/resources/views/manufacturers/view.blade.php
+++ b/resources/views/manufacturers/view.blade.php
@@ -35,7 +35,6 @@
<li class="active">
<a href="#assets" data-toggle="tab">
-
<span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x"></i>
</span>
@@ -43,15 +42,13 @@
{{ trans('general.assets') }}
{!! ($manufacturer->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
</span>
-
</a>
</li>
<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') }}
@@ -64,20 +61,19 @@
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <x-icon type="accessory" class="fa-2x" />
+ <x-icon type="accessories" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.accessories') }}
{!! ($manufacturer->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->accessories->count()).'</badge>' : '' !!}
</span>
-
</a>
</li>
<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') }}
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index f9fdadd2969f..05a4757e799b 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -31,7 +31,7 @@
<a href="#assets" 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') }}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 7a9b827fe29e..80893846cb5d 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -50,7 +50,7 @@
<li>
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <x-icon type="accessory" class="fa-2x" />
+ <x-icon type="accessories" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}
{!! ($user->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->accessories->count()).'</badge>' : '' !!}
From b4b6f7a35f8060b5bec460d537816b72e8b0fd1b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 11:58:21 +0100
Subject: [PATCH 22/36] Added css-consumable to overrides for table headers
Signed-off-by: snipe <snipe@snipe.net>
---
public/css/build/app.css | 7 +++++++
public/css/build/overrides.css | 7 +++++++
public/css/dist/all.css | 14 ++++++++++++++
public/mix-manifest.json | 6 +++---
resources/assets/less/overrides.less | 7 +++++++
5 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/public/css/build/app.css b/public/css/build/app.css
index f70346905038..7f575c30ea68 100644
--- a/public/css/build/app.css
+++ b/public/css/build/app.css
@@ -1006,6 +1006,7 @@ th.css-consumable > .th-inner,
th.css-envelope > .th-inner,
th.css-users > .th-inner,
th.css-location > .th-inner,
+th.css-component > .th-inner,
th.css-accessory > .th-inner {
font-size: 0px;
line-height: 0.75 !important;
@@ -1021,6 +1022,7 @@ th.css-consumable > .th-inner::before,
th.css-envelope > .th-inner::before,
th.css-users > .th-inner::before,
th.css-location > .th-inner::before,
+th.css-component > .th-inner::before,
th.css-accessory > .th-inner::before {
display: inline-block;
font-size: 20px;
@@ -1074,6 +1076,11 @@ th.css-location > .th-inner::before {
font-size: 19px;
margin-bottom: 0px;
}
+th.css-component > .th-inner::before {
+ content: "\f0a0";
+ font-family: "Font Awesome 5 Free";
+ font-weight: 500;
+}
.small-box .inner {
padding-left: 15px;
padding-right: 15px;
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index d8169245b62e..8062628551e1 100644
--- a/public/css/build/overrides.css
+++ b/public/css/build/overrides.css
@@ -639,6 +639,7 @@ th.css-consumable > .th-inner,
th.css-envelope > .th-inner,
th.css-users > .th-inner,
th.css-location > .th-inner,
+th.css-component > .th-inner,
th.css-accessory > .th-inner {
font-size: 0px;
line-height: 0.75 !important;
@@ -654,6 +655,7 @@ th.css-consumable > .th-inner::before,
th.css-envelope > .th-inner::before,
th.css-users > .th-inner::before,
th.css-location > .th-inner::before,
+th.css-component > .th-inner::before,
th.css-accessory > .th-inner::before {
display: inline-block;
font-size: 20px;
@@ -707,6 +709,11 @@ th.css-location > .th-inner::before {
font-size: 19px;
margin-bottom: 0px;
}
+th.css-component > .th-inner::before {
+ content: "\f0a0";
+ font-family: "Font Awesome 5 Free";
+ font-weight: 500;
+}
.small-box .inner {
padding-left: 15px;
padding-right: 15px;
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 8957c009958b..9b24bf7bb849 100644
--- a/public/css/dist/all.css
+++ b/public/css/dist/all.css
@@ -21978,6 +21978,7 @@ th.css-consumable > .th-inner,
th.css-envelope > .th-inner,
th.css-users > .th-inner,
th.css-location > .th-inner,
+th.css-component > .th-inner,
th.css-accessory > .th-inner {
font-size: 0px;
line-height: 0.75 !important;
@@ -21993,6 +21994,7 @@ th.css-consumable > .th-inner::before,
th.css-envelope > .th-inner::before,
th.css-users > .th-inner::before,
th.css-location > .th-inner::before,
+th.css-component > .th-inner::before,
th.css-accessory > .th-inner::before {
display: inline-block;
font-size: 20px;
@@ -22046,6 +22048,11 @@ th.css-location > .th-inner::before {
font-size: 19px;
margin-bottom: 0px;
}
+th.css-component > .th-inner::before {
+ content: "\f0a0";
+ font-family: "Font Awesome 5 Free";
+ font-weight: 500;
+}
.small-box .inner {
padding-left: 15px;
padding-right: 15px;
@@ -23406,6 +23413,7 @@ th.css-consumable > .th-inner,
th.css-envelope > .th-inner,
th.css-users > .th-inner,
th.css-location > .th-inner,
+th.css-component > .th-inner,
th.css-accessory > .th-inner {
font-size: 0px;
line-height: 0.75 !important;
@@ -23421,6 +23429,7 @@ th.css-consumable > .th-inner::before,
th.css-envelope > .th-inner::before,
th.css-users > .th-inner::before,
th.css-location > .th-inner::before,
+th.css-component > .th-inner::before,
th.css-accessory > .th-inner::before {
display: inline-block;
font-size: 20px;
@@ -23474,6 +23483,11 @@ th.css-location > .th-inner::before {
font-size: 19px;
margin-bottom: 0px;
}
+th.css-component > .th-inner::before {
+ content: "\f0a0";
+ font-family: "Font Awesome 5 Free";
+ font-weight: 500;
+}
.small-box .inner {
padding-left: 15px;
padding-right: 15px;
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 547cbd7f5c2f..3ccb348cbbfc 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,8 +2,8 @@
"/js/build/app.js": "/js/build/app.js?id=5030f4cb69d0d0b87b7fe6ba1b9eece9",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9",
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4",
- "/css/build/overrides.css": "/css/build/overrides.css?id=e83697e14b9cd1478ea2bda8fb50f30c",
- "/css/build/app.css": "/css/build/app.css?id=ff82b7edca60f7276504bde91568f6d1",
+ "/css/build/overrides.css": "/css/build/overrides.css?id=cfbc06b0e0ebd9ee7294c4950dcc4933",
+ "/css/build/app.css": "/css/build/app.css?id=bcb566c8a13855e85053527728126d07",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7",
@@ -19,7 +19,7 @@
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
- "/css/dist/all.css": "/css/dist/all.css?id=053e0f8c49e8cf1b903c80c8f67639eb",
+ "/css/dist/all.css": "/css/dist/all.css?id=2e2e514b7e7fd63a0c6a882749ef2b13",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index a6a2347d418a..3358e556321b 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -718,6 +718,7 @@ th.css-consumable > .th-inner,
th.css-envelope > .th-inner,
th.css-users > .th-inner,
th.css-location > .th-inner,
+th.css-component > .th-inner,
th.css-accessory > .th-inner
{
font-size: 0px;
@@ -736,6 +737,7 @@ th.css-consumable > .th-inner::before,
th.css-envelope > .th-inner::before,
th.css-users > .th-inner::before,
th.css-location > .th-inner::before,
+th.css-component > .th-inner::before,
th.css-accessory > .th-inner::before
{
@@ -791,6 +793,11 @@ th.css-location > .th-inner::before {
content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-size: 19px; margin-bottom: 0px;
}
+th.css-component > .th-inner::before
+{
+ content: "\f0a0"; font-family: "Font Awesome 5 Free"; font-weight: 500;
+}
+
.small-box .inner {
padding-left: 15px;
From f82266fadec3524f4ee0304a18a1ec8a4ba642a5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 11:58:31 +0100
Subject: [PATCH 23/36] Cleaned up presenters
Signed-off-by: snipe <snipe@snipe.net>
---
app/Presenters/AssetPresenter.php | 2 +-
app/Presenters/CompanyPresenter.php | 18 ++++++++++++------
app/Presenters/LocationPresenter.php | 2 +-
app/Presenters/ManufacturerPresenter.php | 16 ++++++++--------
4 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index b86135f33b8d..e55cb00c2e26 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -579,6 +579,6 @@ public function viewUrl()
public function glyph()
{
- return '<i class="fas fa-barcode" aria-hidden="true"></i>';
+ return '<x-icon type="assets" />';
}
}
diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php
index 7603191fc15e..bcb77c7eba8f 100644
--- a/app/Presenters/CompanyPresenter.php
+++ b/app/Presenters/CompanyPresenter.php
@@ -65,40 +65,46 @@ public static function dataTableLayout()
'field' => 'users_count',
'searchable' => false,
'sortable' => true,
- 'title' => '<span class="hidden-xs"><i class="fas fa-users"></i></span><span class="hidden-md hidden-lg">'.trans('general.users').'</span></th>',
+ 'title' => trans('general.users'),
'visible' => true,
+ 'class' => 'css-users',
], [
'field' => 'assets_count',
'searchable' => false,
'sortable' => true,
- 'title' => '<span class="hidden-xs"><i class="fas fa-barcode" aria-hidden="true"></i></span><span class="hidden-md hidden-lg">'.trans('general.assets').'</span>',
+ 'title' => trans('general.assets'),
'visible' => true,
+ 'class' => 'css-barcode',
], [
'field' => 'licenses_count',
'searchable' => false,
'sortable' => true,
+ 'title' => trans('general.licenses'),
'visible' => true,
- 'title' => ' <span class="hidden-xs"><i class="far fa-save"></i></span><span class="hidden-md hidden-lg">'.trans('general.licenses').'</span>',
+ 'class' => 'css-license',
], [
'field' => 'accessories_count',
'searchable' => false,
'sortable' => true,
+ 'title' => trans('general.accessories'),
'visible' => true,
- 'title' => ' <span class="hidden-xs"><i class="far fa-keyboard"></i></span><span class="hidden-md hidden-lg">'.trans('general.accessories').'</span>',
+ 'class' => 'css-accessory',
], [
'field' => 'consumables_count',
'searchable' => false,
'sortable' => true,
+ 'title' => trans('general.consumables'),
'visible' => true,
- 'title' => ' <span class="hidden-xs"><i class="fas fa-tint"></i></span><span class="hidden-md hidden-lg">'.trans('general.consumables').'</span>',
+ 'class' => 'css-consumable',
], [
'field' => 'components_count',
'searchable' => false,
'sortable' => true,
+ 'title' => trans('general.components'),
'visible' => true,
- 'title' => ' <span class="hidden-xs"><i class="far fa-hdd"></i></span><span class="hidden-md hidden-lg">'.trans('general.components').'</span>',
+ 'class' => 'css-component',
], [
'field' => 'updated_at',
'searchable' => false,
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index 56d710ac969e..d6bbe0db11db 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -235,7 +235,7 @@ public function viewUrl()
public function glyph()
{
- return '<i class="fas fa-map-marker-alt" aria-hidden="true"></i>';
+ return '<x-icon type="locations" />';
}
public function fullName()
diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index 3e36cbcde030..07a22c9ea483 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -94,36 +94,36 @@ public static function dataTableLayout()
'searchable' => false,
'sortable' => true,
'switchable' => true,
- 'title' => ' <span class="hidden-md hidden-lg">Assets</span>'
- .'<span class="hidden-xs"><i class="fas fa-barcode fa-lg"></i></span>',
+ 'title' => trans('general.assets'),
'visible' => true,
+ 'class' => 'css-barcode',
],
[
'field' => 'licenses_count',
'searchable' => false,
'sortable' => true,
'switchable' => true,
- 'title' => ' <span class="hidden-md hidden-lg">Licenses</span>'
- .'<span class="hidden-xs"><i class="far fa-save fa-lg"></i></span>',
+ 'title' => trans('general.licenses'),
'visible' => true,
+ 'class' => 'css-license',
],
[
'field' => 'consumables_count',
'searchable' => false,
'sortable' => true,
'switchable' => true,
- 'title' => ' <span class="hidden-md hidden-lg">Consumables</span>'
- .'<span class="hidden-xs"><i class="fas fa-tint fa-lg"></i></span>',
+ 'title' => trans('general.consumables'),
'visible' => true,
+ 'class' => 'css-consumable',
],
[
'field' => 'accessories_count',
'searchable' => false,
'sortable' => true,
'switchable' => true,
- 'title' => ' <span class="hidden-md hidden-lg">Accessories</span>'
- .'<span class="hidden-xs"><i class="far fa-keyboard fa-lg"></i></span>',
+ 'title' => trans('general.accessories'),
'visible' => true,
+ 'class' => 'css-accessory',
],
[
'field' => 'created_at',
From eb8d43a8049cc470e605e7faec493fa7fef396a1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 12:32:44 +0100
Subject: [PATCH 24/36] Updated buttons on models
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/models/view.blade.php | 58 +++++++++++++++------------
1 file changed, 33 insertions(+), 25 deletions(-)
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index f9b9cf632e46..d38b63264ec2 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -41,9 +41,9 @@
<span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x"></i>
</span>
- <span class="hidden-xs hidden-sm">
- {{ trans('general.assets') }}
- {!! ($model->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($model->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
+ <span class="hidden-xs hidden-sm">
+ {{ trans('general.assets') }}
+ {!! ($model->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($model->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
</span>
</a>
</li>
@@ -332,39 +332,47 @@ class="table table-striped snipe-table"
</div>
@can('update', \App\Models\AssetModel::class)
<div class="col-md-12" style="padding-bottom: 5px;">
- <a href="{{ route('models.edit', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/models/table.edit') }}</a>
+ <a href="{{ route('models.edit', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
+ <x-icon type="edit" />
+ {{ trans('admin/models/table.edit') }}
+ </a>
</div>
@endcan
@can('create', \App\Models\AssetModel::class)
<div class="col-md-12" style="padding-bottom: 5px;">
- <a href="{{ route('models.clone.create', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/models/table.clone') }}</a>
+ <a href="{{ route('models.clone.create', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-info btn-social hidden-print">
+ <x-icon type="clone" />
+ {{ trans('admin/models/table.clone') }}
+ </a>
</div>
@endcan
@can('delete', \App\Models\AssetModel::class)
- @if ($model->assets_count > 0)
- <div class="col-md-12" style="padding-bottom: 5px;">
- <button class="btn btn-block btn-sm btn-primary hidden-print disabled" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">{{ trans('general.delete') }}</button>
- </div>
- @else
-
- @endif
-
-
- <div class="text-center col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
- @if ($model->deleted_at!='')
- <form method="POST" action="{{ route('models.restore.store', $model->id) }}">
- @csrf
- <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button>
- </form>
- @else
- <button class="btn btn-block btn-sm btn-danger delete-asset" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $model->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}">{{ trans('general.delete') }} </button>
- <span class="sr-only">{{ trans('general.delete') }}</span>
+ <div class="col-md-12" style="padding-top: 10px;">
+
+ @if ($model->deleted_at!='')
+ <form method="POST" action="{{ route('models.restore.store', $model->id) }}">
+ @csrf
+ <button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
+ <x-icon type="restore" />
+ {{ trans('button.restore') }}
+ </button>
+ </form>
+ @elseif ($model->assets()->count() > 0)
+ <button class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </button>
+ @else
+ <button class="btn btn-block btn-sm btn-danger btn-social delete-asset" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $model->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </button>
+ </div>
@endif
- </div>
-
@endcan
+
</div>
</div> <!-- /.row -->
From 229d8b9bf573f0a20ade55bdd1f90f8ea507b84a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 13:19:59 +0100
Subject: [PATCH 25/36] Added location restore
Signed-off-by: snipe <snipe@snipe.net>
---
app/Http/Controllers/LocationsController.php | 44 +++++-
.../lang/en-US/admin/locations/message.php | 5 +
resources/views/locations/view.blade.php | 130 ++++++++++++------
routes/web.php | 5 +
4 files changed, 144 insertions(+), 40 deletions(-)
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index c498f0992602..f32e6b8489d5 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Http\Requests\ImageUploadRequest;
+use App\Models\Actionlog;
use App\Models\Asset;
use App\Models\Location;
use App\Models\User;
@@ -193,7 +194,13 @@ public function destroy($locationId) : RedirectResponse
*/
public function show($id = null) : View | RedirectResponse
{
- $location = Location::find($id);
+ $location = Location::withCount('assignedAssets as assigned_assets_count')
+ ->withCount('assets as assets_count')
+ ->withCount('rtd_assets as rtd_assets_count')
+ ->withCount('children as children_count')
+ ->withCount('users as users_count')
+ ->withTrashed()
+ ->find($id);
if (isset($location->id)) {
return view('locations/view', compact('location'));
@@ -249,6 +256,41 @@ public function getClone($locationId = null) : View | RedirectResponse
}
+ /**
+ * Restore a given Asset Model (mark as un-deleted)
+ *
+ * @author [A. Gianotto] [<snipe@snipe.net>]
+ * @since [v1.0]
+ * @param int $id
+ */
+ public function postRestore($id) : RedirectResponse
+ {
+ $this->authorize('create', Location::class);
+
+ if ($location = Location::withTrashed()->find($id)) {
+
+ if ($location->deleted_at == '') {
+ return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.location')]));
+ }
+
+ if ($location->restore()) {
+ $logaction = new Actionlog();
+ $logaction->item_type = Location::class;
+ $logaction->item_id = $location->id;
+ $logaction->created_at = date('Y-m-d H:i:s');
+ $logaction->user_id = auth()->id();
+ $logaction->logaction('restore');
+
+ return redirect()->route('locations.index')->with('success', trans('admin/locations/message.restore.success'));
+ }
+
+ // Check validation
+ return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.location'), 'error' => $location->getErrors()->first()]));
+ }
+
+ return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
+
+ }
public function print_all_assigned($id) : View | RedirectResponse
{
if ($location = Location::where('id', $id)->first()) {
diff --git a/resources/lang/en-US/admin/locations/message.php b/resources/lang/en-US/admin/locations/message.php
index 6226c71ab61a..5ba6e5109c5d 100644
--- a/resources/lang/en-US/admin/locations/message.php
+++ b/resources/lang/en-US/admin/locations/message.php
@@ -20,6 +20,11 @@
'success' => 'Location updated successfully.'
),
+ 'restore' => array(
+ 'error' => 'Location was not restored, please try again',
+ 'success' => 'Location restored successfully.'
+ ),
+
'delete' => array(
'confirm' => 'Are you sure you wish to delete this location?',
'error' => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 2eb7a01d87ed..e59527e4d7bb 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -9,6 +9,10 @@
@parent
@stop
+@section('header_right')
+<a href="{{ route('locations.index') }}" class="btn btn-primary" style="margin-right: 10px;">
+ {{ trans('general.back') }}</a>
+@endsection
{{-- Page content --}}
@section('content')
@@ -382,65 +386,113 @@ class="table table-striped snipe-table"
<div class="col-md-3">
+ @can('update', $location)
<div class="col-md-12">
- <a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary pull-left">{{ trans('admin/locations/table.update') }} </a>
+ <a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social">
+ <x-icon type="edit" />
+ {{ trans('admin/locations/table.update') }}
+ </a>
</div>
+ @endcan
+
<div class="col-md-12" style="padding-top: 5px;">
- <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_assigned') }} </a>
+ <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
+ <x-icon type="print" />
+ {{ trans('admin/locations/table.print_assigned') }}
+ </a>
</div>
<div class="col-md-12" style="padding-top: 5px; padding-bottom: 20px;">
- <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_all_assigned') }} </a>
+ <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
+ <x-icon type="print" />
+ {{ trans('admin/locations/table.print_all_assigned') }}
+ </a>
</div>
+ @can('delete', $location)
+ <div class="col-md-12 hidden-print" style="padding-top: 10px;">
+
+ @if ($location->deleted_at=='')
+
+ @if ($location->isDeletable())
+ <button class="btn btn-sm btn-block btn-danger btn-social delete-location" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $location->name]) }}" data-target="#dataConfirmModal">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </button>
+ @else
+ <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </a>
+ @endif
+
+ @else
+ <form method="POST" action="{{ route('locations.restore', ['location' => $location->id]) }}">
+ @csrf
+ <button class="btn btn-sm btn-block btn-warning btn-social delete-asset">
+ <x-icon type="restore" />
+ {{ trans('general.restore') }}
+ </button>
+ </form>
+ @endif
+ </div>
+ @endcan
+
@if ($location->image!='')
- <div class="col-md-12 text-center" style="padding-bottom: 20px;">
- <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
- </div>
+ <div class="col-md-12 text-center" style="padding-bottom: 20px;">
+ <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
+ </div>
@endif
- <div class="col-md-12">
+
+ <div class="col-md-12">
<ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px;">
- @if ($location->address!='')
+ @if ($location->address!='')
<li>{{ $location->address }}</li>
- @endif
- @if ($location->address2!='')
- <li>{{ $location->address2 }}</li>
- @endif
- @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
- <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
- @endif
- @if ($location->manager)
- <li>{{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}</li>
- @endif
- @if ($location->parent)
- <li>{{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}</li>
- @endif
- @if ($location->ldap_ou)
- <li>{{ trans('admin/locations/table.ldap_ou') }}: {{ $location->ldap_ou }}</li>
- @endif
- </ul>
-
- @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
- <div class="col-md-12 text-center">
- <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
- </div>
@endif
+ @if ($location->address2!='')
+ <li>{{ $location->address2 }}</li>
+ @endif
+ @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
+ <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
+ @endif
+ @if ($location->manager)
+ <li>{{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}</li>
+ @endif
+ @if ($location->parent)
+ <li>{{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}</li>
+ @endif
+ @if ($location->ldap_ou)
+ <li>{{ trans('admin/locations/table.ldap_ou') }}: {{ $location->ldap_ou }}</li>
+ @endif
+ </ul>
- </div>
-
-
-
- </div>
+ @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
+ <div class="col-md-12 text-center">
+ <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
+ </div>
+ @endif
- </div>
+</div>
+</div>
</div>
+
@stop
@section('moar_scripts')
+
+ <script>
+ $('#dataConfirmModal').on('show.bs.modal', function (event) {
+ var content = $(event.relatedTarget).data('content');
+ var title = $(event.relatedTarget).data('title');
+ $(this).find(".modal-body").text(content);
+ $(this).find(".modal-header").text(title);
+ });
+ </script>
+
@include ('partials.bootstrap-table', [
- 'exportFile' => 'locations-export',
- 'search' => true
- ])
+'exportFile' => 'locations-export',
+'search' => true
+])
@stop
diff --git a/routes/web.php b/routes/web.php
index f2534c506228..f3ba8350f2e4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -66,6 +66,11 @@
[LocationsController::class, 'postBulkDeleteStore']
)->name('locations.bulkdelete.store');
+ Route::post(
+ '{location}/restore',
+ [LocationsController::class, 'postRestore']
+ )->name('locations.restore');
+
Route::get('{locationId}/clone',
[LocationsController::class, 'getClone']
From 8d52fa51b16a978ddfdadd49c321956277cdcbb2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 13:20:06 +0100
Subject: [PATCH 26/36] Fixed suppliers buttons
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/suppliers/view.blade.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 05a4757e799b..08e0910a44ba 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -44,7 +44,7 @@
<li>
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-keyboard fa-2x" aria-hidden="true"></i>
+ <x-icon type="accessories" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.accessories') }}
@@ -56,7 +56,7 @@
<li>
<a href="#licenses" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-save fa-2x" aria-hidden="true"></i>
+ <x-icon type="licenses" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.licenses') }}
@@ -68,7 +68,7 @@
<li>
<a href="#components" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-save fa-2x" aria-hidden="true"></i>
+ <x-icon type="components" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.components') }}
@@ -80,7 +80,7 @@
<li>
<a href="#consumables" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="far fa-save fa-2x" aria-hidden="true"></i>
+ <x-icon type="consumables" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.consumables') }}
@@ -92,7 +92,7 @@
<li>
<a href="#maintenances" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-wrench fa-2x"></i>
+ <x-icon type="maintenances" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
{{ trans('admin/asset_maintenances/general.asset_maintenances') }}
From 84f14a05bd09d0e85fcce5aa933e598893266a96 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 13:20:19 +0100
Subject: [PATCH 27/36] Fixed logging for asset model restore
Signed-off-by: snipe <snipe@snipe.net>
---
app/Http/Controllers/AssetModelsController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 4421829f489e..b6bb34738d70 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -233,7 +233,7 @@ public function getRestore($id) : RedirectResponse
if ($model->restore()) {
$logaction = new Actionlog();
- $logaction->item_type = User::class;
+ $logaction->item_type = AssetModel::class;
$logaction->item_id = $model->id;
$logaction->created_at = date('Y-m-d H:i:s');
$logaction->user_id = auth()->id();
From 479b2b4fd3e813d56301ec76e112b1997d31cd07 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 13:23:08 +0100
Subject: [PATCH 28/36] More icons
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/hardware/view.blade.php | 2 +-
resources/views/locations/view.blade.php | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 54ac703e7901..3b7524f456ed 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -532,7 +532,7 @@
<a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}
- <i class="fa fa-external-link" aria-hidden="true">
+ <x-icon type="external-link" />
<span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
</a>
</li>
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index e59527e4d7bb..b7b474599fda 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -77,7 +77,7 @@
<li>
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-keyboard fa-2x" aria-hidden="true"></i>
+ <x-icon type="accessories" class="fa-2x "/>
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.accessories') }}
@@ -89,7 +89,7 @@
<li>
<a href="#consumables" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-tint fa-2x" aria-hidden="true"></i>
+ <x-icon type="consumables" class="fa-2x "/>
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.consumables') }}
@@ -101,7 +101,7 @@
<li>
<a href="#components" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-hdd fa-2x" aria-hidden="true"></i>
+ <x-icon type="components" class="fa-2x "/>
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.components') }}
@@ -113,7 +113,7 @@
<li>
<a href="#history" data-toggle="tab">
<span class="hidden-lg hidden-md">
- <i class="fas fa-hdd fa-2x" aria-hidden="true"></i>
+ <x-icon type="history" class="fa-2x "/>
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.history') }}
From e048f0955f007b83ad023257b6b65830b22f0b72 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 13:27:21 +0100
Subject: [PATCH 29/36] More icons
Signed-off-by: snipe <snipe@snipe.net>
---
app/Presenters/UserPresenter.php | 2 +-
resources/views/hardware/view.blade.php | 8 +-------
resources/views/licenses/view.blade.php | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 7054676a9373..635eaa86aa3f 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -492,6 +492,6 @@ public function viewUrl()
public function glyph()
{
- return '<i class="fas fa-user" aria-hidden="true"></i>';
+ return '<x-icon type="user"/>';
}
}
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 3b7524f456ed..2da403834073 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -903,19 +903,13 @@
@else
{{ trans('general.na_no_purchase_date') }}
@endif
- @if ($asset->eol_explicit)
-
+ @if ($asset->eol_explicit =='1')
<span data-tooltip="true"
data-placement="top"
data-title="Explicit EOL"
title="Explicit EOL">
<x-icon type="warning" class="text-orange" />
</span>
-
- <i class="fas fa-exclamation-triangle text-orange"
-
- >
- </i>
@endif
</div>
</div>
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 6afbcffe4fd2..cab6a58be1ec 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -531,7 +531,7 @@ class="table table-striped snipe-table"
<td>
@if ($file->filename)
<a href="{{ route('show.licensefile', [$license->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>
From 6f024849e9949121ec9459383a1510d026daeea8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 13:39:24 +0100
Subject: [PATCH 30/36] Few more
Signed-off-by: snipe <snipe@snipe.net>
---
app/Presenters/DepreciationReportPresenter.php | 2 +-
resources/views/licenses/view.blade.php | 2 +-
resources/views/users/edit.blade.php | 4 ++--
resources/views/users/view.blade.php | 14 +++++---------
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/app/Presenters/DepreciationReportPresenter.php b/app/Presenters/DepreciationReportPresenter.php
index 50a8b73b541f..6905385615ad 100644
--- a/app/Presenters/DepreciationReportPresenter.php
+++ b/app/Presenters/DepreciationReportPresenter.php
@@ -394,6 +394,6 @@ public function viewUrl()
public function glyph()
{
- return '<i class="fas fa-barcode" aria-hidden="true"></i>';
+ return '<x-icon type="reports" class="text-orange" />';
}
}
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index cab6a58be1ec..c20ef87b2dd3 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -544,7 +544,7 @@ class="table table-striped snipe-table"
<td>{{ $file->created_at }}</td>
<td>
<a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
- <i class="fas fa-trash icon-white" aria-hidden="true"></i>
+ <x-icon type="delete" />
<span class="sr-only">{{ trans('general.delete') }}</span>
</a>
</td>
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index e3f691f15852..5f0246d02292 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -131,7 +131,7 @@ class="form-control"
@if (config('app.lock_passwords') && ($user->id))
<!-- disallow changing existing usernames on the demo -->
<div class="col-md-8 col-md-offset-3">
- <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+ <p class="text-warning"><x-icon type="lock" /> {{ trans('general.feature_disabled') }}</p>
</div>
@endif
@@ -215,7 +215,7 @@ class="form-control"
{{ trans('admin/users/general.activated_help_text') }}
</label>
- <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+ <p class="text-warning"><x-icon type="lock" /> {{ trans('general.feature_disabled') }}</p>
@elseif ($user->id === Auth::user()->id)
<!-- disallow the user from editing their own login status -->
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 80893846cb5d..8fbed865eec4 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -166,10 +166,10 @@
<div class="col-md-12 text-center">
-
+
@if (($user->isSuperUser()) || ($user->hasAccess('admin')))
- <i class="fas fa-crown fa-2x{{ ($user->isSuperUser()) ? ' text-danger' : ' text-orange'}}"></i>
- <div class="{{ ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}" style="font-weight: bold">{{ ($user->isSuperUser()) ? strtolower(trans('general.superuser')) : strtolower(trans('general.admin')) }}</div>
+ <x-icon type="superadmin" class="fa-2x {{ ($user->isSuperUser()) ? 'text-danger' : 'text-orange'}}" />
+ <div class="{{ ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}" style="font-weight: bold">{{ ($user->isSuperUser()) ? strtolower(trans('general.superuser')) : strtolower(trans('general.admin')) }}</div>
@endif
@@ -348,13 +348,9 @@
<div class="col-md-9">
@if ($user->isSuperUser())
- <label class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}">
- <x-icon type="superadmin" title="{{ trans('general.superuser') }}" />
- </label>
+ <span class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><x-icon type="superadmin" title="{{ trans('general.superuser') }}" /></span>
@elseif ($user->hasAccess('admin'))
- <label class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}">
- <x-icon type="superadmin" title="{{ trans('general.admin') }}" />
- </label>
+ <span class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><x-icon type="superadmin" title="{{ trans('general.admin') }}" /></span>
@endif
{{ $user->username }}
From d89c8682beb4c30bebebf1b28fdd84b18a612477 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 13:46:31 +0100
Subject: [PATCH 31/36] Reversed location button ordering
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/locations/view.blade.php | 71 ++++++++++++------------
1 file changed, 36 insertions(+), 35 deletions(-)
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index b7b474599fda..7c9d203b07f7 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -386,6 +386,41 @@ class="table table-striped snipe-table"
<div class="col-md-3">
+ @if ($location->image!='')
+ <div class="col-md-12 text-center" style="padding-bottom: 20px;">
+ <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
+ </div>
+ @endif
+
+ @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
+ <div class="col-md-12 text-center">
+ <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
+ </div>
+ @endif
+
+ <div class="col-md-12">
+ <ul class="list-unstyled" style="line-height: 20px; padding-bottom: 20px;">
+ @if ($location->address!='')
+ <li>{{ $location->address }}</li>
+ @endif
+ @if ($location->address2!='')
+ <li>{{ $location->address2 }}</li>
+ @endif
+ @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
+ <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
+ @endif
+ @if ($location->manager)
+ <li>{{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}</li>
+ @endif
+ @if ($location->parent)
+ <li>{{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}</li>
+ @endif
+ @if ($location->ldap_ou)
+ <li>{{ trans('admin/locations/table.ldap_ou') }}: {{ $location->ldap_ou }}</li>
+ @endif
+ </ul>
+ </div>
+
@can('update', $location)
<div class="col-md-12">
<a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social">
@@ -401,7 +436,7 @@ class="table table-striped snipe-table"
{{ trans('admin/locations/table.print_assigned') }}
</a>
</div>
- <div class="col-md-12" style="padding-top: 5px; padding-bottom: 20px;">
+ <div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
<x-icon type="print" />
{{ trans('admin/locations/table.print_all_assigned') }}
@@ -438,43 +473,9 @@ class="table table-striped snipe-table"
@endcan
- @if ($location->image!='')
- <div class="col-md-12 text-center" style="padding-bottom: 20px;">
- <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
- </div>
- @endif
-
- <div class="col-md-12">
- <ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px;">
- @if ($location->address!='')
- <li>{{ $location->address }}</li>
- @endif
- @if ($location->address2!='')
- <li>{{ $location->address2 }}</li>
- @endif
- @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
- <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
- @endif
- @if ($location->manager)
- <li>{{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}</li>
- @endif
- @if ($location->parent)
- <li>{{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}</li>
- @endif
- @if ($location->ldap_ou)
- <li>{{ trans('admin/locations/table.ldap_ou') }}: {{ $location->ldap_ou }}</li>
- @endif
- </ul>
-
- @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
- <div class="col-md-12 text-center">
- <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
- </div>
- @endif
</div>
</div>
-</div>
@stop
From 34cd4b624404cd12464ede49d2be58ba6a7a0f7e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 14:15:36 +0100
Subject: [PATCH 32/36] Added links to apple/google maps
Signed-off-by: snipe <snipe@snipe.net>
---
resources/lang/en-US/admin/locations/message.php | 1 +
resources/views/locations/view.blade.php | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/resources/lang/en-US/admin/locations/message.php b/resources/lang/en-US/admin/locations/message.php
index 5ba6e5109c5d..488ec9c6702e 100644
--- a/resources/lang/en-US/admin/locations/message.php
+++ b/resources/lang/en-US/admin/locations/message.php
@@ -8,6 +8,7 @@
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'assigned_assets' => 'Assigned Assets',
'current_location' => 'Current Location',
+ 'open_map' => 'Open in :map_provider_icon Maps',
'create' => array(
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 7c9d203b07f7..7b528332ff2b 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -418,6 +418,21 @@ class="table table-striped snipe-table"
@if ($location->ldap_ou)
<li>{{ trans('admin/locations/table.ldap_ou') }}: {{ $location->ldap_ou }}</li>
@endif
+
+ @if ((($location->address!='') && ($location->city!='')) || ($location->state!='') || ($location->country!=''))
+ <li>
+ <a href="https://maps.google.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">
+ {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google" aria-hidden="true"></i>']) !!}
+ <x-icon type="external-link"/>
+ </a>
+ </li>
+ <li>
+ <a href="https://maps.apple.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">
+ {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple" aria-hidden="true" style="font-size: 18px"></i>']) !!}
+ <x-icon type="external-link"/></a>
+ </li>
+ @endif
+
</ul>
</div>
From 08c3a25b39a8ff8465d5445bf30e575c6918c5a7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 14:16:57 +0100
Subject: [PATCH 33/36] Little more padding
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/locations/view.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 7b528332ff2b..a0d3b8c742f7 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -393,7 +393,7 @@ class="table table-striped snipe-table"
@endif
@if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
- <div class="col-md-12 text-center">
+ <div class="col-md-12 text-center" style="padding-bottom: 10px;">
<img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
</div>
@endif
From be5f3f38f802a5aaf290cb9d9151cf2725e10688 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 19 Aug 2024 14:48:12 +0100
Subject: [PATCH 34/36] Settings pages
Signed-off-by: snipe <snipe@snipe.net>
---
app/Helpers/IconHelper.php | 26 +++++++++++++++
.../views/livewire/oauth-clients.blade.php | 1 +
resources/views/settings/alerts.blade.php | 2 +-
resources/views/settings/asset_tags.blade.php | 4 +--
resources/views/settings/backups.blade.php | 10 ++++--
resources/views/settings/barcodes.blade.php | 3 +-
resources/views/settings/branding.blade.php | 3 +-
resources/views/settings/general.blade.php | 2 +-
resources/views/settings/google.blade.php | 3 +-
resources/views/settings/index.blade.php | 32 +++++++++----------
resources/views/settings/labels.blade.php | 4 +--
resources/views/settings/ldap.blade.php | 3 +-
resources/views/settings/purge-form.blade.php | 4 ++-
resources/views/settings/saml.blade.php | 3 +-
resources/views/settings/security.blade.php | 3 +-
15 files changed, 71 insertions(+), 32 deletions(-)
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 0c01de3f05a5..fec951791385 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -147,6 +147,32 @@ public static function icon($type) {
return 'fa-solid fa-print';
case 'checkin-and-delete':
return 'fa-solid fa-user-xmark';
+ case 'branding':
+ return 'fas fa-copyright';
+ case 'general-settings':
+ return 'fa-solid fa-list-check';
+ case 'groups':
+ return 'fa-solid fa-user-group';
+ case 'bell':
+ return 'fa-solid fa-bell';
+ case 'hashtag':
+ return 'fa-solid fa-hashtag';
+ case 'asset-tags':
+ return 'fas fa-list-ol';
+ case 'labels':
+ return 'fas fa-tags';
+ case 'ldap':
+ return 'fas fa-sitemap';
+ case 'google':
+ return 'fa-brands fa-google';
+ case 'saml':
+ return 'fas fa-sign-in-alt';
+ case 'backups':
+ return 'fas fa-file-archive';
+ case 'logins':
+ return 'fas fa-crosshairs';
+ case 'oauth':
+ return 'fas fa-user-secret';
}
}
diff --git a/resources/views/livewire/oauth-clients.blade.php b/resources/views/livewire/oauth-clients.blade.php
index 7caf5f6a2fe6..fdd3b800b683 100644
--- a/resources/views/livewire/oauth-clients.blade.php
+++ b/resources/views/livewire/oauth-clients.blade.php
@@ -3,6 +3,7 @@
<div class="box-header">
<h2 class="box-title">
+ <x-icon type="oauth"/>
{{ trans('admin/settings/general.oauth_clients') }}
</h2>
@if ($authorizationError)
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index 2798fe4bb4a0..edbf1be839c8 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -32,7 +32,7 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-bell"></i> {{ trans('admin/settings/general.alerts') }}
+ <x-icon type="bell"/> {{ trans('admin/settings/general.alerts') }}
</h2>
</div>
<div class="box-body">
diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php
index e1aa0a8ff5a7..020d97a7561a 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -32,8 +32,8 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-list-ol"></i> {{ trans('general.asset_tags') }}
- </h4>
+ <x-icon type="asset-tags"/> {{ trans('general.asset_tags') }}
+ </h2>
</div>
<div class="box-body">
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index 2a2ce81bd6de..4d33552b8faa 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -113,7 +113,7 @@ class="btn btn-warning btn-sm restore-asset {{ (config('app.lock_passwords')) ?
<div class="box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="far fa-file-archive" aria-hidden="true"></i>
+ <x-icon type="backups"/>
{{ trans('admin/settings/general.backups_upload') }}
</h2>
<div class="box-tools pull-right">
@@ -150,7 +150,10 @@ class="btn btn-warning btn-sm restore-asset {{ (config('app.lock_passwords')) ?
</label>
</div>
<div class="col-md-4 col-xs-4">
- <button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>{{ trans('button.upload') }} <span id="uploadIcon"></span></button>
+ <button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>
+ {{ trans('button.upload') }}
+ <span id="uploadIcon"></span>
+ </button>
</div>
<div class="col-md-12">
@@ -170,7 +173,8 @@ class="btn btn-warning btn-sm restore-asset {{ (config('app.lock_passwords')) ?
<div class="box box-warning">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i> {{ trans('admin/settings/general.backups_restoring') }}</h2>
+ <x-icon type="warning" class="text-orange"/> {{ trans('admin/settings/general.backups_restoring') }}
+ </h2>
<div class="box-tools pull-right">
</div>
</div><!-- /.box-header -->
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php
index 41e0319c1fb4..970f1d4f9964 100644
--- a/resources/views/settings/barcodes.blade.php
+++ b/resources/views/settings/barcodes.blade.php
@@ -32,7 +32,8 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-barcode" aria-hidden="true"></i> {{ trans('admin/settings/general.barcodes') }}
+ <x-icon type="assets"/>
+ {{ trans('admin/settings/general.barcodes') }}
</h2>
</div>
<div class="box-body">
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 89204a99003d..c586917ef534 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -32,7 +32,8 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-copyright"></i> {{ trans('admin/settings/general.brand') }}
+ <x-icon type="branding"/>
+ {{ trans('admin/settings/general.brand') }}
</h2>
</div>
<div class="box-body">
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 4066250799bd..c800b26ac9d3 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -29,7 +29,7 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-wrench" aria-hidden="true"></i>
+ <x-icon type="general-settings"/>
{{ trans('admin/settings/general.general_settings') }}
</h2>
</div>
diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php
index c4119b99a87d..83e88b936f13 100644
--- a/resources/views/settings/google.blade.php
+++ b/resources/views/settings/google.blade.php
@@ -27,7 +27,8 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fa-brands fa-google"></i> {{ trans('admin/settings/general.google_login') }}
+ <x-icon type="google"/>
+ {{ trans('admin/settings/general.google_login') }}
</h2>
</div>
<div class="box-body">
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index ac7095814b0d..5a4c91c4469b 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -61,7 +61,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.branding.index') }}" class="settings_button">
- <i class="fas fa-copyright fa-4x" aria-hidden="true"></i>
+ <x-icon type="branding" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.brand') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.brand_keywords') }}</span>
@@ -78,7 +78,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.general.index') }}" class="settings_button">
- <i class="fas fa-wrench fa-4x" aria-hidden="true"></i>
+ <x-icon type="general-settings" class="fa-4x"/>
<br><br>
<span class="name"> {{ trans('admin/settings/general.general_settings') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.general_settings_keywords') }}</span>
@@ -95,7 +95,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.security.index') }}" class="settings_button">
- <i class="fas fa-lock fa-4x" aria-hidden="true"></i>
+ <x-icon type="locked" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.security') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.security_keywords') }}</span>
@@ -111,7 +111,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('groups.index') }}" class="settings_button">
- <i class="fas fa-user-friends fa-4x" aria-hidden="true"></i>
+ <x-icon type="groups" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('general.groups') }}</span>
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.groups_keywords') }}</span>
@@ -128,7 +128,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.localization.index') }}" class="settings_button">
- <i class="fas fa-globe-americas fa-4x" aria-hidden="true"></i>
+ <x-icon type="globe-us" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.localization') }}</span>
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.localization_keywords') }}</span>
@@ -146,7 +146,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.alerts.index') }}" class="settings_button">
- <i class="fas fa-bell fa-4x" aria-hidden="true"></i>
+ <x-icon type="bell" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.notifications') }}</span>
@@ -162,7 +162,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.slack.index') }}" class="settings_button">
- <i class="fa-solid fa-hashtag fa-4x" aria-hidden="true"></i>
+ <x-icon type="hashtag" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.integrations') }}</span>
</a>
@@ -177,7 +177,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.asset_tags.index') }}" class="settings_button">
- <i class="fas fa-list-ol fa-4x" aria-hidden="true"></i>
+ <x-icon type="asset-tags" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('general.asset_tags') }}</span>
</a>
@@ -192,7 +192,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.barcodes.index') }}" class="settings_button">
- <i class="fas fa-barcode fa-4x" aria-hidden="true"></i>
+ <x-icon type="assets" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.barcodes') }}</span>
</a>
@@ -207,7 +207,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.labels.index') }}" class="settings_button">
- <i class="fas fa-tags fa-4x" aria-hidden="true"></i>
+ <x-icon type="labels" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.labels') }}</span>
</a>
@@ -223,7 +223,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.ldap.index') }}" class="settings_button">
- <i class="fas fa-sitemap fa-4x" aria-hidden="true"></i>
+ <x-icon type="ldap" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.ldap') }}</span>
</a>
@@ -238,7 +238,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.google.index') }}" class="settings_button">
- <i class="fa-brands fa-google fa-4x" aria-hidden="true"></i>
+ <x-icon type="google" class="fa-4x"/>
<br><br>
<span class="name">Google</span>
</a>
@@ -253,7 +253,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.saml.index') }}" class="settings_button">
- <i class="fas fa-sign-in-alt fa-4x" aria-hidden="true"></i>
+ <x-icon type="saml" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.saml') }}</span>
</a>
@@ -268,7 +268,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.backups.index') }}" class="settings_button">
- <i class="fas fa-file-archive fa-4x" aria-hidden="true"></i>
+ <x-icon type="backups" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.backups') }}</span>
</a>
@@ -284,7 +284,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.logins.index') }}" class="settings_button">
- <i class="fas fa-crosshairs fa-4x" aria-hidden="true"></i>
+ <x-icon type="logins" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.login') }}</span>
</a>
@@ -299,7 +299,7 @@
<div class="box-body text-center">
<h5>
<a href="{{ route('settings.oauth.index') }}" class="settings_button">
- <i class="fas fa-user-secret fa-4x" aria-hidden="true"></i>
+ <x-icon type="oauth" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.oauth') }}</span>
</a>
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 0aae313ecef1..33640edbf28a 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -27,11 +27,11 @@
<div class="row">
<div class="col-sm-10 col-sm-offset-1 col-md-10">
-
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-tags"></i> {{ trans('admin/settings/general.labels') }}
+ <x-icon type="labels"/>
+ {{ trans('admin/settings/general.labels') }}
</h2>
</div>
<div class="box-body">
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 08e704806ec8..0c9faf8c2e4a 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -60,7 +60,8 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-sitemap"></i> {{ trans('admin/settings/general.ldap_ad') }}
+ <x-icon type="ldap"/>
+ {{ trans('admin/settings/general.ldap_ad') }}
</h4>
</div>
<div class="box-body">
diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php
index d0667c0a57f2..86ad28fc5068 100644
--- a/resources/views/settings/purge-form.blade.php
+++ b/resources/views/settings/purge-form.blade.php
@@ -18,7 +18,9 @@
<div class="col-md-8 col-md-offset-2">
<div class="box box-solid box-danger">
<div class="box-header with-border">
- <h2 class="box-title"><i class="fas fa-exclamation-triangle"></i> {{ trans('admin/settings/general.purge') }}</h2>
+ <h2 class="box-title">
+ <x-icon type="warning"/>
+ {{ trans('admin/settings/general.purge') }}</h2>
</div>
{{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
<!-- CSRF Token -->
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 93826dc49a5d..9349023fc814 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -38,7 +38,8 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-sign-in-alt"></i> {{ trans('admin/settings/general.saml') }}
+ <x-icon type="saml"/>
+ {{ trans('admin/settings/general.saml') }}
</h2>
</div>
<div class="box-body">
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index 9e114c2ba9ec..1b04f7d58af8 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -27,7 +27,8 @@
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
- <i class="fas fa-lock" aria-hidden="true"></i> {{ trans('admin/settings/general.security') }}
+ <x-icon type="locked"/>
+ {{ trans('admin/settings/general.security') }}
</h2>
</div>
<div class="box-body">
From 5d9f988df3110286d342aa2a4f069abb437a2f69 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 20 Aug 2024 10:01:49 +0100
Subject: [PATCH 35/36] Added fw class to topnav icons
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/layouts/default.blade.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index c227f9ed7f66..1572bfda1e2a 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -145,7 +145,7 @@
@can('index', \App\Models\Asset::class)
<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') }}">
- <x-icon type="assets" />
+ <x-icon type="assets" class="fa-fw" />
<span class="sr-only">{{ trans('general.assets') }}</span>
</a>
</li>
@@ -153,7 +153,7 @@
@can('view', \App\Models\License::class)
<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') }}">
- <x-icon type="licenses" />
+ <x-icon type="licenses" class="fa-fw" />
<span class="sr-only">{{ trans('general.licenses') }}</span>
</a>
</li>
@@ -161,7 +161,7 @@
@can('index', \App\Models\Accessory::class)
<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') }}">
- <x-icon type="accessories" />
+ <x-icon type="accessories" class="fa-fw" />
<span class="sr-only">{{ trans('general.accessories') }}</span>
</a>
</li>
@@ -169,7 +169,7 @@
@can('index', \App\Models\Consumable::class)
<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') }}">
- <x-icon type="consumables" />
+ <x-icon type="consumables" class="fa-fw" />
<span class="sr-only">{{ trans('general.consumables') }}</span>
</a>
</li>
@@ -177,7 +177,7 @@
@can('view', \App\Models\Component::class)
<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') }}">
- <x-icon type="components" />
+ <x-icon type="components" class="fa-fw" />
<span class="sr-only">{{ trans('general.components') }}</span>
</a>
</li>
From f6319e11e7103231ffb9c34093560e319c1d0859 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 20 Aug 2024 10:11:27 +0100
Subject: [PATCH 36/36] Added fa-fw to sidebar elements
Signed-off-by: snipe <snipe@snipe.net>
---
resources/views/layouts/default.blade.php | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 1572bfda1e2a..b303362ade81 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -440,7 +440,7 @@
<a href="#">
<x-icon type="assets" class="fa-fw" />
<span>{{ trans('general.assets') }}</span>
- <x-icon type="angle-left" class="pull-right"/>
+ <x-icon type="angle-left" class="pull-right fa-fw"/>
</a>
<ul class="treeview-menu">
<li>
@@ -587,7 +587,7 @@
@can('view', \App\Models\License::class)
<li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
<a href="{{ route('licenses.index') }}">
- <x-icon type="licenses" />
+ <x-icon type="licenses" class="fa-fw"/>
<span>{{ trans('general.licenses') }}</span>
</a>
</li>
@@ -619,7 +619,7 @@
@can('view', \App\Models\PredefinedKit::class)
<li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
<a href="{{ route('kits.index') }}">
- <x-icon type="kits" />
+ <x-icon type="kits" class="fa-fw" />
<span>{{ trans('general.kits') }}</span>
</a>
</li>
@@ -628,7 +628,7 @@
@can('view', \App\Models\User::class)
<li{!! (Request::is('users*') ? ' class="active"' : '') !!}>
<a href="{{ route('users.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=6" : ''}}>
- <x-icon type="users" />
+ <x-icon type="users" class="fa-fw" />
<span>{{ trans('general.people') }}</span>
</a>
</li>
@@ -636,7 +636,7 @@
@can('import')
<li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
<a href="{{ route('imports.index') }}">
- <x-icon type="import" />
+ <x-icon type="import" class="fa-fw" />
<span>{{ trans('general.import') }}</span>
</a>
</li>
@@ -647,7 +647,7 @@
<a href="#" id="settings">
<x-icon type="settings" />
<span>{{ trans('general.settings') }}</span>
- <x-icon type="angle-left" class="pull-right"/>
+ <x-icon type="angle-left" class="fa-fw"/>
</a>
<ul class="treeview-menu">
@@ -737,7 +737,7 @@
@can('reports.view')
<li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
<a href="#" class="dropdown-toggle">
- <x-icon type="reports" />
+ <x-icon type="reports" class="fa-fw" />
<span>{{ trans('general.reports') }}</span>
<x-icon type="angle-left" class="pull-right"/>
</a>
@@ -789,7 +789,7 @@
@can('viewRequestable', \App\Models\Asset::class)
<li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>
<a href="{{ route('requestable-assets') }}">
- <x-icon type="requestable" />
+ <x-icon type="requestable" class="fa-fw" />
<span>{{ trans('general.requestable_items') }}</span>
</a>
</li>