mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-09 23:24:06 -08:00
Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
parent
bffba02511
commit
0c09f2b2c0
|
|
@ -107,6 +107,17 @@ class IconHelper
|
|||
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';
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>' : '' !!}
|
||||
|
|
|
|||
|
|
@ -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) }}">
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<i {{ $attributes->merge(['class' => Icon::icon($type).' '.$class]) }} {{ $attributes->merge(['style' => $style]) }} aria-hidden="true"></i>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
<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>
|
||||
|
|
|
|||
|
|
@ -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')}}
|
||||
|
|
|
|||
|
|
@ -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')}}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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') }}
|
||||
|
|
|
|||
|
|
@ -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') }}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
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',
|
||||
|
|
|
|||
|
|
@ -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'))
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@
|
|||
|
||||
<!-- 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>
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@
|
|||
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue