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

More links

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-08-18 20:30:53 +01:00
parent 7ace9324b4
commit a77dcad336
10 changed files with 96 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Helpers/IconHelper.php
View file

@ -56,7 +56,7 @@ class IconHelper
case 'admin-settings': case 'admin-settings':
return 'fa fa-cogs'; return 'fa fa-cogs';
case 'settings': case 'settings':
return 'fa fa-sign-out'; return 'fa fa-cog';
case 'angle-left': case 'angle-left':
return 'fa fa-angle-left'; return 'fa fa-angle-left';
case 'warning': case 'warning':
@ -90,7 +90,7 @@ class IconHelper
case 'alerts': case 'alerts':
return 'far fa-flag'; return 'far fa-flag';
case 'password': case 'password':
return 'fa fa-key'; return 'fa-solid fa-key';
case 'api-key': case 'api-key':
return 'fa-solid fa-user-secret'; return 'fa-solid fa-user-secret';
case 'nav-toggle': case 'nav-toggle':
@ -129,7 +129,12 @@ class IconHelper
return 'fas fa-wrench'; return 'fas fa-wrench';
case 'seats': case 'seats':
return 'far fa-list-alt'; 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';
} }
} }

41
resources/views/accessories/view.blade.php
View file

@ -34,7 +34,8 @@
<li> <li>
<a href="#history" data-toggle="tab"> <a href="#history" data-toggle="tab">
<span class="hidden-lg hidden-md"> <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> <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
</a> </a>
</li> </li>
@ -43,11 +44,12 @@
@can('accessories.files', $accessory) @can('accessories.files', $accessory)
<li> <li>
<a href="#files" data-toggle="tab"> <a href="#files" data-toggle="tab">
<span class="hidden-lg hidden-md"> <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') }} <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>' : '' !!} {!! ($accessory->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($accessory->uploads->count()).'</badge>' : '' !!}
</span> </span>
</a> </a>
</li> </li>
@endcan @endcan
@ -55,7 +57,13 @@
@can('update', $accessory) @can('update', $accessory)
<li class="pull-right"> <li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal"> <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> </a>
</li> </li>
@endcan @endcan
@ -186,6 +194,7 @@
@foreach ($accessory->uploads as $file) @foreach ($accessory->uploads as $file)
<tr> <tr>
<td> <td>
<x-icon type="paperclip" class="fa-2x" />
<i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i> <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
<span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span> <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
@ -217,7 +226,7 @@
</a> </a>
<a href="{{ route('show.accessoryfile', [$accessory->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank"> <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> </a>
@endif @endif
@ -322,31 +331,41 @@
<div class="col-md-3 pull-right"> <div class="col-md-3 pull-right">
@can('checkout', \App\Models\Accessory::class) @can('checkout', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;"> <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> </div>
@endcan @endcan
@can('update', \App\Models\Accessory::class) @can('update', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;"> <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> </div>
@endcan @endcan
@can('create', \App\Models\Accessory::class) @can('create', \App\Models\Accessory::class)
<div class="text-center" style="padding-top:5px;"> <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> </div>
@endcan @endcan
@can('delete', $accessory) @can('delete', $accessory)
@if ($accessory->checkouts_count == 0) @if ($accessory->checkouts_count == 0)
<div class="text-center" style="padding-top:5px;"> <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') }} {{ trans('general.delete') }}
</button> </button>
</div> </div>
@else @else
<div class="text-center" style="padding-top:5px;"> <div class="text-center" style="padding-top:5px;">
<span data-tooltip="true" title=" {{ trans('admin/accessories/general.delete_disabled') }}"> <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') }} {{ trans('general.delete') }}
</a> </a>
</span> </span>

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

@ -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([ @props([
'type' => '', 'type' => '',
'class' => '', 'class' => false,
'style' => '', 'style' => false,
'id' => '', 'id' => false,
'title' => false,
]) ])
<i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ $attributes->merge(['style' => $style]) }} {{ $attributes->merge(['id' => $id]) }} aria-hidden="true"></i> <i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ isset($style) ? $attributes->merge(['style' => $style]): '' }} {{ isset($title) ? $attributes->merge(['title' => $title]): '' }} aria-hidden="true"></i>

2
resources/views/consumables/view.blade.php
View file

@ -487,7 +487,7 @@
</a> </a>
<a href="{{ route('show.consumablefile', [$consumable->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank"> <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> </a>
@endif @endif
</td> </td>

51
resources/views/hardware/view.blade.php
View file

@ -133,10 +133,15 @@
@can('update', \App\Models\Asset::class) @can('update', \App\Models\Asset::class)
<li class="pull-right hidden-print"> <li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal"> <a href="#" data-toggle="modal" data-target="#uploadFileModal">
<x-icon type="paperclip" /> <span class="hidden-lg hidden-xl hidden-md">
{{ trans('button.upload') }} <x-icon type="paperclip" class="fa-2x" />
</span>
<span class="hidden-xs hidden-sm">
<x-icon type="paperclip" />
{{ trans('button.upload') }}
</span>
</a> </a>
</li> </li>
@endcan @endcan
@ -271,7 +276,7 @@
@if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!='')) @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
<li> <li>
<i class="fas fa-phone" aria-hidden="true"></i> <x-icon type="phone" />
<a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a> <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
</li> </li>
@endif @endif
@ -493,10 +498,10 @@
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!='')) @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!=''))
<li> <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"> <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }} {{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}
<i class="fa fa-external-link" aria-hidden="true"></i> <x-icon type="external-link" />
</a> </a>
</li> </li>
@endif @endif
@ -506,25 +511,26 @@
<x-icon type="more-info" /> <x-icon type="more-info" />
<a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}" target="_blank"> <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }} {{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}
<i class="fa fa-external-link" aria-hidden="true"></i> <x-icon type="external-link" />
</a> </a>
</li> </li>
@endif @endif
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!='')) @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
<li> <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"> <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }} {{ $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> </a>
</li> </li>
@endif @endif
@if (($asset->model) && ($asset->model->manufacturer->support_phone)) @if (($asset->model) && ($asset->model->manufacturer->support_phone))
<li> <li>
<i class="fas fa-phone" aria-hidden="true"></i> <x-icon type="phone" />
<a href="tel:{{ $asset->model->manufacturer->support_phone }}"> <a href="tel:{{ $asset->model->manufacturer->support_phone }}">
{{ $asset->model->manufacturer->support_phone }} {{ $asset->model->manufacturer->support_phone }}
</a> </a>
@ -621,6 +627,7 @@
</div> </div>
<div class="col-md-9{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}"> <div class="col-md-9{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
@if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!='')) @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> <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 @endif
@ -792,7 +799,8 @@
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!='')) @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"> <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> </a>
@endif @endif
</div> </div>
@ -886,12 +894,17 @@
{{ trans('general.na_no_purchase_date') }} {{ trans('general.na_no_purchase_date') }}
@endif @endif
@if ($asset->eol_explicit) @if ($asset->eol_explicit)
<i class="fas fa-exclamation-triangle text-orange"
aria-hidden="true" <span data-tooltip="true"
data-tooltip="true" data-placement="top"
data-placement="top" data-title="Explicit EOL"
data-title="Explicit EOL" title="Explicit EOL">
title="Explicit EOL"> <x-icon type="warning" class="text-orange" />
</span>
<i class="fas fa-exclamation-triangle text-orange"
>
</i> </i>
@endif @endif
</div> </div>
@ -1385,7 +1398,7 @@
</a> </a>
<a href="{{ route('show/assetfile', [$asset->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank"> <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> </a>
@endif @endif
</td> </td>
@ -1487,7 +1500,7 @@
</a> </a>
<a href="{{ route('show/modelfile', [$asset->model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank"> <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> </a>
@endif @endif

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

@ -1014,16 +1014,25 @@ dir="{{ Helper::determineLanguageDirection() }}">
// Use element id to find the text element to hide / show // Use element id to find the text element to hide / show
var targetElement = e.id+"-to-show"; var targetElement = e.id+"-to-show";
var hiddenElement = e.id+"-to-hide"; var hiddenElement = e.id+"-to-hide";
var audio = new Audio('{{ config('app.url') }}/sounds/lock.mp3');
if($(e).hasClass('fa-lock')) { if($(e).hasClass('fa-lock')) {
@if ($user->enable_sounds)
audio.play()
@endif
$(e).removeClass('fa-lock').addClass('fa-unlock'); $(e).removeClass('fa-lock').addClass('fa-unlock');
// Show the encrypted custom value and hide the element with asterisks // Show the encrypted custom value and hide the element with asterisks
document.getElementById(targetElement).style.fontSize = "100%"; document.getElementById(targetElement).style.fontSize = "100%";
document.getElementById(hiddenElement).style.display = "none"; document.getElementById(hiddenElement).style.display = "none";
} else { } else {
@if ($user->enable_sounds)
audio.play()
@endif
$(e).removeClass('fa-unlock').addClass('fa-lock'); $(e).removeClass('fa-unlock').addClass('fa-lock');
// ClipboardJS can't copy display:none elements so use a trick to hide the value // ClipboardJS can't copy display:none elements so use a trick to hide the value
document.getElementById(targetElement).style.fontSize = "0px"; document.getElementById(targetElement).style.fontSize = "0px";
document.getElementById(hiddenElement).style.display = ""; document.getElementById(hiddenElement).style.display = "";
} }
} }

10
resources/views/licenses/view.blade.php
View file

@ -99,7 +99,7 @@
@endcan @endcan
@if ($license->manufacturer->url) @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 @endif
@if ($license->manufacturer->support_url) @if ($license->manufacturer->support_url)
@ -108,7 +108,7 @@
@endif @endif
@if ($license->manufacturer->support_phone) @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> <a href="tel:{{ $license->manufacturer->support_phone }}">{{ $license->manufacturer->support_phone }}</a>
@endif @endif
@ -193,11 +193,11 @@
@endcan @endcan
@if ($license->supplier->url) @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 @endif
@if ($license->supplier->phone) @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> <a href="tel:{{ $license->supplier->phone }}">{{ $license->supplier->phone }}</a>
@endif @endif
@ -536,7 +536,7 @@
</a> </a>
<a href="{{ route('show.licensefile', [$license->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank"> <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> </a>
@endif @endif

2
resources/views/models/view.blade.php
View file

@ -173,7 +173,7 @@
</a> </a>
<a href="{{ route('show/modelfile', [$model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank"> <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> </a>
@endif @endif

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

@ -32,7 +32,7 @@
<div class="panel box box-default"> <div class="panel box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h2 class="box-title"> <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> </h2>
</div> </div>
<div class="box-body"> <div class="box-body">

4
resources/views/users/view.blade.php
View file

@ -459,7 +459,7 @@
{{ trans('general.website') }} {{ trans('general.website') }}
</div> </div>
<div class="col-md-9"> <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>
</div> </div>
@endif @endif
@ -957,7 +957,7 @@
</a> </a>
<a href="{{ route('show/userfile', [$user->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank"> <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> </a>
@endif @endif
@endif @endif