Skip to content

A free open source IT asset/license management system

More flexibility in blade components for labels vs icons vs icon types

snipef6f5e806e4f8
diff --git a/resources/lang/en-US/admin/licenses/form.php b/resources/lang/en-US/admin/licenses/form.php
index ce29167874..29a59f5e2e 100644
--- a/resources/lang/en-US/admin/licenses/form.php
+++ b/resources/lang/en-US/admin/licenses/form.php
@@ -16,7 +16,7 @@ return array(
'seats' => 'Seats',
'termination_date' => 'Termination Date',
'to_email' => 'Licensed to Email',
- 'to_name' => 'Licensed to Name',
+ 'to_name' => 'Licensed To',
'update' => 'Update License',
'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
);
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 11770f9f57..b310327f6c 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -14,350 +14,157 @@
{{-- Page content --}}
@section('content')
- {{-- Page content --}}
- <div class="row">
- <div class="col-md-9">
-
- <!-- Custom Tabs -->
- <div class="nav-tabs-custom">
- <ul class="nav nav-tabs hidden-print">
-
- <li class="active">
- <a href="#checkedout" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="info-circle" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
- </a>
- </li>
-
- <li>
- <a href="#history" data-toggle="tab">
- <span class="hidden-lg hidden-md">
- <x-icon type="history" class="fa-2x" />
- </span>
- <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
- </a>
- </li>
-
-
- @can('accessories.files', $accessory)
- <li>
- <a href="#files" data-toggle="tab">
- <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 ) ? '<span class="badge badge-secondary">'.number_format($accessory->uploads->count()).'</span>' : '' !!}
- </span>
- </a>
- </li>
- @endcan
+ <x-container columns="2">
+ <x-page-column class="col-md-9">
+
+ <x-tabs>
+ <x-slot:tabnav>
+
+ <x-tabs.nav-item
+ name="checkedout"
+ class="active"
+ icon_type="checkedout"
+ label="{{ trans('general.checked_out') }}"
+ count="{{ $accessory->checkouts_count }}"
+ />
+
+
+ <x-tabs.nav-item
+ name="history"
+ icon="fa-solid fa-clock-rotate-left fa-fw"
+ label="{{ trans('general.history') }}"
+ tooltip="{{ trans('general.history') }}"
+ />
+
+ <x-tabs.nav-item
+ name="files"
+ icon="fa-solid fa-file-contract fa-fw"
+ label="{{ trans('general.files') }}"
+ count="{{ $accessory->uploads()->count() }}"
+ />
+
@can('update', $accessory)
- <li class="pull-right">
- <a href="#" data-toggle="modal" data-target="#uploadFileModal">
- <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>
+ <x-tabs.nav-item-upload />
@endcan
- </ul>
-
- <div class="tab-content">
-
- <div class="tab-pane active" id="checkedout">
- <div class="row">
- <div class="col-md-12">
- <table
- data-columns="{{ \App\Presenters\AccessoryPresenter::assignedDataTableLayout() }}"
- data-cookie-id-table="checkoutsTable"
- data-id-table="checkoutsTable"
- data-side-pagination="server"
- data-sort-order="asc"
- id="checkoutsTable"
- class="table table-striped snipe-table"
- data-url="{{ route('api.accessories.checkedout', $accessory->id) }}"
- data-export-options='{
- "fileName": "export-accessories-{{ str_slug($accessory->name) }}-checkouts-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'>
- </table>
- </div><!--./col-md-12-->
- </div> <!-- ./row -->
- </div>
-
- <!-- history tab pane -->
- <div class="tab-pane fade" id="history">
- <div class="row">
- <div class="col-md-12">
- <table
- data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
- class="table table-striped snipe-table"
- data-cookie-id-table="AccessoryHistoryTable"
- data-id-table="AccessoryHistoryTable"
- id="AccessoryHistoryTable"
- data-side-pagination="server"
- data-sort-order="desc"
- data-export-options='{
- "fileName": "export-{{ str_slug($accessory->name) }}-history-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'
- data-url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}">
- </table>
- </div> <!-- /.col-md-12-->
- </div> <!-- /.row-->
- </div>
-
-
-
- @can('accessories.files', $accessory)
- <div class="tab-pane" id="files">
-
- <div class="row">
- <div class="col-md-12">
+
+ <x-slot:tabpanes>
+
+ <!-- start history tab pane -->
+ <x-tabs.pane name="checkedout" class="in active">
+ <x-slot:header>
+ {{ trans('general.checked_out') }}
+ </x-slot:header>
+ <x-slot:content>
+ <x-table
+ api_url="{{ route('api.accessories.checkedout', $accessory->id) }}"
+ :presenter="\App\Presenters\AccessoryPresenter::assignedDataTableLayout()"
+ export_filename="export-{{ str_slug($accessory->name) }}-assets-{{ date('Y-m-d') }}"
+ />
+ </x-slot:content>
+ </x-tabs.pane>
+ <!-- end history tab pane -->
+
+ <!-- start history tab pane -->
+ <x-tabs.pane name="history">
+ <x-slot:header>
+ {{ trans('general.history') }}
+ </x-slot:header>
+ <x-slot:content>
+ <x-table
+ name="accessoryHistory"
+ api_url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}"
+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
+ export_filename="export-accessory-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}"
+ />
+ </x-slot:content>
+ </x-tabs.pane>
+ <!-- end history tab pane -->
+
+ <!-- start files tab pane -->
+ @can('accessories.files', $accessory)
+ <x-tabs.pane name="files">
+ <x-slot:header>
+ {{ trans('general.files') }}
+ </x-slot:header>
+ <x-slot:content>
<x-filestable object_type="accessories" :object="$accessory" />
- </div>
- </div>
- </div> <!-- /.tab-pane -->
- @endcan
- </div>
- </div>
- </div>
-
-
-
-<!-- side address column -->
-
-<div class="col-md-3">
-
- @if ($accessory->image!='')
- <div class="row">
- <div class="col-md-12 text-center" style="padding-bottom: 15px;">
- <a href="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" data-toggle="lightbox" data-type="image">
- <img src="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" class="img-responsive img-thumbnail" alt="{{ $accessory->name }}"></a>
- </div>
- </div>
- @endif
-
- @if ($accessory->model_number)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>{{ trans('general.model_no')}}</strong>
- </div>
- <div class="col-md-9">
- {{ $accessory->model_number }}
- </div>
- </div>
- @endif
-
- @if ($accessory->company)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 15px;">
- <strong> {{ trans('general.company')}}</strong>
- </div>
- <div class="col-md-9">
- {!! $accessory->company->present()->formattedNameLink !!}
- </div>
- </div>
- @endif
-
- @if ($accessory->location)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>{{ trans('general.location')}}</strong>
- </div>
- <div class="col-md-9">
- {!! $accessory->location->present()->formattedNameLink !!}
- </div>
- </div>
- @endif
-
- @if ($accessory->category)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>{{ trans('general.category')}}</strong>
- </div>
- <div class="col-md-9">
- {!! $accessory->category->present()->formattedNameLink !!}
- </div>
- </div>
- @endif
-
- @if ($accessory->manufacturer)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>{{ trans('general.manufacturer')}}</strong>
- </div>
- <div class="col-md-9">
- {!! $accessory->manufacturer->present()->formattedNameLink !!}
- </div>
- </div>
- @endif
-
-
-
- @if ($accessory->notes)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>
- {{ trans('general.notes') }}
- </strong>
- </div>
- <div class="col-md-9" style="word-wrap: break-word;">
- {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
- </div>
- </div>
- @endif
-
- @if ($accessory->purchase_date)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>
- {{ trans('general.purchase_date') }}
- </strong>
- </div>
- <div class="col-md-9" style="word-wrap: break-word;">
- {{ \App\Helpers\Helper::getFormattedDateObject($accessory->purchase_date, 'date')['formatted']}}
- </div>
- </div>
- @endif
-
- @if ($accessory->purchase_cost)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>
- {{ trans('general.unit_cost') }}
- </strong>
- </div>
- <div class="col-md-9" style="word-wrap: break-word;">
- {{ Helper::formatCurrencyOutput($accessory->purchase_cost) }}
- </div>
- </div>
- @endif
- @if ($accessory->purchase_cost)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>
- {{ trans('general.total_cost') }}
- </strong>
- </div>
- <div class="col-md-9" style="word-wrap: break-word;">
- {{ Helper::formatCurrencyOutput($accessory->totalCostSum()) }}
- </div>
- </div>
- @endif
-
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>{{ trans('admin/accessories/general.remaining') }}</strong>
- </div>
- <div class="col-md-9">
- {{ $accessory->numRemaining() }}
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>{{ trans('general.checked_out') }}</strong>
- </div>
- <div class="col-md-9">
- {{ $accessory->checkouts_count }}
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>
- {{ trans('general.created_at') }}
- </strong>
- </div>
- <div class="col-md-9" style="word-wrap: break-word;">
- {{ \App\Helpers\Helper::getFormattedDateObject($accessory->created_at, 'datetime')['formatted']}}
- </div>
- </div>
-
- @if ($accessory->created_at!=$accessory->updated_at)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>
- {{ trans('general.updated_at') }}
- </strong>
- </div>
- <div class="col-md-9" style="word-wrap: break-word;">
- {{ \App\Helpers\Helper::getFormattedDateObject($accessory->updated_at, 'datetime')['formatted']}}
- </div>
- </div>
-
- @endif
-
- @if ($accessory->adminuser)
- <div class="row">
- <div class="col-md-3" style="padding-bottom: 10px;">
- <strong>
- {{ trans('general.created_by') }}
- </strong>
- </div>
- <div class="col-md-9" style="word-wrap: break-word;">
- <x-full-user-name :user="$accessory->adminuser" />
- </div>
- </div>
- @endif
-
-
-
- @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-sm btn-social btn-block hidden-print {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}">
- <x-icon type="checkout" />
- {{ trans('general.checkout') }}
- </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-sm 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 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" onClick="return false;">
- <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 btn-sm btn-social delete-asset disabled">
- <x-icon type="delete" />
- {{ trans('general.delete') }}
- </a>
- </span>
- </div>
- @endif
- @endcan
- </div>
-</div>
+ </x-slot:content>
+ </x-tabs.pane>
+ @endcan
+ <!-- end files tab pane -->
+
+
+
+ </x-slot:tabpanes>
+
+ </x-slot:tabnav>
+ </x-tabs>
+
+ </x-page-column>
+
+ <x-page-column class="col-md-3">
+ <x-box>
+ <x-box.info-panel :contact="$accessory" img_path="{{ app('accessories_upload_url') }}">
+
+ <x-slot:before_list>
+
+ @can('update', $accessory)
+ <a href="{{ route('accessories.edit', $accessory->id) }}" class="btn btn-warning btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
+ <x-icon type="edit" />
+ {{ trans('button.edit') }}
+ </a>
+ <a href="{{ route('clone/accessories', $accessory->id) }}" class="btn btn-info btn-block btn-sm btn-social hidden-print" style="margin-bottom: 5px;">
+ <x-icon type="clone" />
+ {{ trans('button.clone') }}</a>
+ @endcan
+
+ @can('checkout', $accessory)
+
+ @if (($accessory->numRemaining() > 0))
+
+ <a href="{{ route('accessories.checkout.show', $accessory->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>
+
+ @else
+ <span data-tooltip="true" title="{{ ($accessory->numRemaining() == 0) ? trans('admin/accessories/general.bulk.checkout_all.disabled_tooltip') : trans('admin/accessories/message.checkout.license_is_inactive') }}" 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') }}
+ </span>
+
+ @endif
+ @endcan
+
+
+
+ @can('delete', $accessory)
+
+ @if ($accessory->numRemaining() == 0)
+ <a class="btn btn-block btn-danger btn-sm btn-social delete-asset" data-icon="fa fa trash" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal" onClick="return false;">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </a>
+ @else
+ <span data-tooltip="true" title=" {{ trans('admin/accessories/general.delete_disabled') }}">
+ <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-asset disabled" onClick="return false;">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </a>
+ </span>
+ @endif
+ @endcan
+
+
+
+
+ </x-slot:before_list>
+ </x-box.info-panel>
+ </x-box>
+
+ </x-page-column>
+ </x-container>
diff --git a/resources/views/blade/box/info-panel.blade.php b/resources/views/blade/box/info-panel.blade.php
index ca3f1273be..f892da4803 100644
--- a/resources/views/blade/box/info-panel.blade.php
+++ b/resources/views/blade/box/info-panel.blade.php
@@ -28,52 +28,52 @@
<ul class="list-group list-group-unbordered">
+
{{ $slot }}
<x-info-element icon_type="notes">
{!! nl2br(Helper::parseEscapedMarkedownInline($contact->notes)) !!}
</x-info-element>
- @if ($contact->company)
- <x-info-element icon_type="company">
- @can('view', $contact->company)
- <a href="{{ route('companies.show', $contact->company) }}">
- {{ $contact->company->display_name }}
- </a>
- @else
- {{ $contact->company->display_name }}
- @endcan
- </x-info-element>
+ @if ($contact->license_name)
+ @can('viewKeys', $contact)
+ <x-info-element>
+ <x-copy-to-clipboard copy_what="license_key">
+ <code>{{ $contact->serial }}</code>
+ </x-copy-to-clipboard>
+ </x-info-element>
+ @else
+ ------------
+ @endcan
@endif
- @if ($contact->category)
- <x-info-element icon_type="category">
- @can('view', $contact->category)
- <a href="{{ route('categories.show', $contact->category) }}">
- {{ $contact->category->display_name }}
- </a>
- @else
- {{ $contact->category->display_name }}
- @endcan
+ @if ($contact->license_name)
+ <x-info-element icon_type="contact-card">
+ {{ trans('admin/licenses/form.to_name') }}
+ {{ $contact->license_name }}
</x-info-element>
@endif
- <x-info-element icon_type="contact-card">
- {{ $contact->contact }}
- </x-info-element>
+ @if ($contact->license_email)
+ <x-info-element icon_type="email">
+ {{ trans('admin/licenses/form.to_email') }}
+ <x-info-element.email>
+ {{ $contact->license_email }}
+ </x-info-element.email>
+ </x-info-element>
+ @endif
- @if ($contact->manager)
- <x-info-element icon_type="manager">
- @can('view', $contact->manager)
- <a href="{{ route('users.show', $contact->manager) }}">
- {{ $contact->manager->display_name }}
- </a>
- @else
- {{ $contact->manager->display_name }}
- @endcan
+ @if ($contact->termination_date)
+ <x-info-element icon_type="terminates">
+ {{ Helper::getFormattedDateObject($contact->termination_date, 'date', false) }}
</x-info-element>
@endif
+ @if ($contact->expiration_date)
+ <x-info-element icon_type="expiration">
+ {{ Helper::getFormattedDateObject($contact->expiration_date, 'date', false) }}
+ </x-info-element>
+ @endif
@if ($contact->model_number)
<x-info-element icon_type="number">
@@ -81,77 +81,155 @@
</x-info-element>
@endif
+ @if ($contact->order_number)
+ <x-info-element icon_type="order">
+ {{ $contact->order_number }}
+ </x-info-element>
+ @endif
+
+ @if ($contact->purchase_order)
+ <x-info-element icon_type="purchase_order">
+ {{ $contact->purchase_order }}
+ </x-info-element>
+ @endif
+
+ @if (function_exists('numRemaining'))
+ <x-info-element icon_type="available">
+ {{ $contact->numRemaining() }}
+ {{ trans('general.remaining') }}
+ </x-info-element>
+
+ <x-info-element icon_type="checkedout">
+ {{ $contact->checkouts_count }}
+ {{ trans('general.checked_out') }}
+ </x-info-element>
+ @endif
+
+
+ @if ($contact->company)
+ <x-info-element icon_type="company" icon_color="{{ $contact->company->tag_color }}">
+ {!! $contact->company->present()->nameUrl !!}
+ </x-info-element>
+ @endif
+
+ @if ($contact->category)
+ <x-info-element icon_type="category" icon_color="{{ $contact->category->tag_color }}">
+ {!! $contact->category->present()->nameUrl !!}
+ </x-info-element>
+ @endif
+
+ @if ($contact->location)
+ <x-info-element icon_type="location" icon_color="{{ $contact->location->tag_color }}">
+ {!! $contact->location->present()->nameUrl !!}
+ </x-info-element>
+ @endif
+
+
+ @if ($contact->manager)
+ <x-info-element icon_type="manager">
+ {!! $contact->manager->present()->nameUrl !!}
+ </x-info-element>
+ @endif
+
+
@if ($contact->fieldset)
<x-info-element icon_type="fieldset">
- @can('view', $contact->fieldset)
- <a href="{{ route('fieldsets.show', $contact->fieldset) }}">
- {{ $contact->fieldset->name }}
- </a>
- @else
- {{ $contact->fieldset->name }}
- @endcan
+ {!! $contact->fieldset->present()->nameUrl !!}
</x-info-element>
@endif
@if ($contact->manufacturer)
<x-info-element icon_type="manufacturer">
- @can('view', $contact->manufacturer)
- <a href="{{ route('manufacturers.show', $contact->manufacturer) }}">
- {{ $contact->manufacturer->name }}
- </a>
- @else
- {{ $contact->manufacturer->name }}
- @endcan
-
-
+ <strong>{{ trans('general.manufacturer') }}</strong>
</x-info-element>
- <x-info-element icon_type="contact-card">
- {{ $contact->manufacturer->contact }}
+ <x-info-element class="subitem">
+ {!! $contact->manufacturer->present()->formattedNameLink !!}
</x-info-element>
- <x-info-element icon_type="phone">
+ <x-info-element icon_type="phone" class="subitem">
<x-info-element.phone>
{{ $contact->manufacturer->support_phone }}
</x-info-element.phone>
</x-info-element>
- <x-info-element icon_type="email">
+ <x-info-element icon_type="email" class="subitem">
<x-info-element.email>
{{ $contact->manufacturer->support_email }}
</x-info-element.email>
</x-info-element>
- <x-info-element icon_type="external-link">
+ <x-info-element icon_type="external-link" class="subitem">
<x-info-element.url>
{{ $contact->manufacturer->url }}
</x-info-element.url>
</x-info-element>
- <x-info-element icon_type="external-link">
+ <x-info-element icon_type="external-link" class="subitem">
<x-info-element.url>
{{ $contact->manufacturer->support_url }}
</x-info-element.url>
</x-info-element>
+ @endif
+
+
+ @if ($contact->supplier)
+ <x-info-element icon_type="manufacturer">
+ <strong>{{ trans('general.supplier') }}</strong>
+ </x-info-element>
+
+ <x-info-element class="subitem">
+ {!! $contact->supplier->present()->formattedNameLink !!}
+ </x-info-element>
+
+ <x-info-element icon_type="contact-card" class="subitem">
+ {{ $contact->supplier->contact }}
+ </x-info-element>
+
+ @if ($contact->supplier->present()->displayAddress)
+ <x-info-element class="subitem">
+ {!! nl2br($contact->supplier->present()->displayAddress) !!}
+ </x-info-element>
+ @endif
+
+ <x-info-element icon_type="phone" class="subitem">
+ <x-info-element.phone>
+ {{ $contact->supplier->phone }}
+ {{ $contact->supplier->phone }}
+ </x-info-element.phone>
+ </x-info-element>
+
+ <x-info-element icon_type="email" class="subitem">
+ <x-info-element.email>
+ {{ $contact->supplier->email }}
+ </x-info-element.email>
+ </x-info-element>
+
+ <x-info-element icon_type="external-link" class="subitem">
+ <x-info-element.url>
+ {{ $contact->supplier->url }}
+ </x-info-element.url>
+ </x-info-element>
@endif
+
+
@if ($contact->parent)
<x-info-element icon_type="parent">
{{ $contact->parent->display_name }}
</x-info-element>
@endif
- @if ($contact->depreciation)
+ @if ($contact->depreciation && $contact->purchase_date)
<x-info-element icon_type="depreciation">
- @can('view', $contact->fieldset)
- <a href="{{ route('depreciations.show', $contact->depreciation) }}">{{ $contact->depreciation->display_name }}</a>
- @else
- {{ $contact->depreciation->display_name }}
- @endif
-
+ {!! $contact->depreciation->present()->nameUrl !!}
({{ $contact->depreciation->months.' '.trans('general.months')}})
</x-info-element>
+
+ <x-info-element icon_type="depreciation-calendar">
+ {{ Helper::getFormattedDateObject($contact->depreciated_date(), 'date', false) }}
+ </x-info-element>
@endif
@if ($contact->eol)
@@ -236,7 +314,50 @@
@endif
- @if ($contact->created_by)
+ @if ($contact->maintained)
+ @if ($contact->maintained == 1)
+ <x-info-element>
+ <x-icon type="checkmark" class="fa-fw text-success" />
+ {{ trans('admin/licenses/form.maintained') }}
+ </x-info-element>
+ @else
+ <x-info-element>
+ <x-icon type="x" class="fa-fw text-danger" />
+ {{ trans('admin/licenses/form.maintained') }}
+ </x-info-element>
+ @endif
+ @endif
+
+ @if ($contact->reassignable)
+ @if ($contact->reassignable == 1)
+ <x-info-element>
+ <x-icon type="checkmark" class="fa-fw text-success" />
+ {{ trans('admin/licenses/form.reassignable') }}
+ </x-info-element>
+ @else
+ <x-info-element>
+ <x-icon type="x" class="text-danger" />
+ {{ trans('admin/licenses/form.reassignable') }}
+ </x-info-element>
+ @endif
+ @endif
+
+ @if ($contact->requestable)
+ @if ($contact->requestable == 1)
+ <x-info-element>
+ <x-icon type="checkmark" class="fa-fw text-success" />
+ {{ trans('admin/hardware/general.requestable') }}
+ </x-info-element>
+ @else
+ <x-info-element>
+ <x-icon type="x" class="fa-fw text-danger" />
+ {{ trans('admin/hardware/general.requestable') }}
+ </x-info-element>
+ @endif
+ @endif
+
+
+ @if ($contact->adminuser)
<x-info-element>
<span class="text-muted">
<x-icon type="user" class="fa-fw" />
diff --git a/resources/views/blade/copy-to-clipboard.blade.php b/resources/views/blade/copy-to-clipboard.blade.php
index 5932f2f66f..517d2b8ce8 100644
--- a/resources/views/blade/copy-to-clipboard.blade.php
+++ b/resources/views/blade/copy-to-clipboard.blade.php
@@ -3,7 +3,7 @@
])
<!-- copy to clipboard -->
-<i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-{{ $copy_what }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+<i class="fa-regular fa-clipboard js-copy-link hidden-print fa-fw" data-clipboard-target=".js-copy-{{ $copy_what }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
<span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
</i>
diff --git a/resources/views/blade/info-element/index.blade.php b/resources/views/blade/info-element/index.blade.php
index ec9e27aded..dd004fe4f8 100644
--- a/resources/views/blade/info-element/index.blade.php
+++ b/resources/views/blade/info-element/index.blade.php
@@ -1,12 +1,14 @@
@props([
'icon' => null,
'icon_type' => null,
+ 'icon_color' => null,
])
@if (!$slot->isEmpty())
<li {{ $attributes->merge(['class' => 'list-group-item']) }}>
+
@if ($icon_type)
- <x-icon type="{{ $icon_type }}" class="fa-fw" />
+ <x-icon type="{{ $icon_type }}" class="fa-fw" style="{{ 'color: '.$icon_color.' !important' ?? '' }}" />
@elseif ($icon)
<i class="{{ $icon }}"></i>
@endif
diff --git a/resources/views/blade/tabs/nav-item.blade.php b/resources/views/blade/tabs/nav-item.blade.php
index 24d2f67e38..619310de64 100644
--- a/resources/views/blade/tabs/nav-item.blade.php
+++ b/resources/views/blade/tabs/nav-item.blade.php
@@ -5,30 +5,47 @@
'icon' => null,
'icon_style' => null,
'tooltip' => null,
+ 'icon_type' => null,
])
<!-- start tab nav item -->
<li {{ $attributes->merge(['class' => '']) }}>
<a href="#{{ $name ?? 'info' }}" data-toggle="tab" data-tooltip="true" title="{{ $tooltip ?? $label }}">
- @if ($icon)
+ @if ($icon_type || $icon)
- <span class="hidden-lg hidden-md">
- <i class="{{ $icon }}" style="font-size: 18px" aria-hidden="true"></i>
- </span>
+ @if ($icon)
+ <span class="hidden-lg hidden-md">
+ <i class="{{ $icon }}" style="font-size: 18px" aria-hidden="true"></i>
+ </span>
+
+ <span class="hidden-xs hidden-sm">
+ <i class="{{ $icon }}" style="font-size: 16px" aria-hidden="true"></i>
+ </span>
+
+ @elseif ($icon_type)
+
+ <span class="hidden-lg hidden-md">
+ <x-icon type="{{ $icon_type }}" class="fa-fw" style="font-size: 18px;" />
+ </span>
+
+ <span class="hidden-xs hidden-sm">
+ <x-icon type="{{ $icon_type }}" class="fa-fw" style="font-size: 16px;" />
+ </span>
- <span class="hidden-xs hidden-sm">
- <i class="{{ $icon }}" style="font-size: 16px" aria-hidden="true"></i>
- </span>
+
+
+ @endif
<span class="sr-only">
- {{ $label }}
- </span>
+ {{ $label }}
+ </span>
@elseif ($label)
{{ $label }}
@endif
+
@if ($count > 0)
<span class="badge">{{ number_format($count) }}</span>
@endif
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 53c725c17d..69fa5bc30d 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -676,6 +676,10 @@
background-color: #1e282c;
}
+ .list-group-item.subitem {
+ padding-left:20px !important;
+ }
+
.sidebar-menu>li.active > a,
.sidebar-menu>li:hover>a,
.treeview-menu>li> a
@@ -702,6 +706,10 @@
}
+ .list-group-item:first-child {
+ border-top: 0 !important;
+ }
+
.sidebar-menu > li > a:link,
.sidebar-menu > li > a:visited,
.treeview-menu>li> a
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 964e3cccd6..0875c39c65 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -14,38 +14,32 @@
<x-tabs>
<x-slot:tabnav>
- <x-tabs.nav-item
- name="info"
- class="active"
- icon="fas fa-info-circle"
- label="{{ trans('admin/users/general.info') }}"
- />
<x-tabs.nav-item
name="seats"
- icon="far fa-list-alt"
+ class="active"
+ icon_type="checkedout"
label="{{ trans('general.assigned') }}"
count="{{ $license->assignedCount()->count() }}"
/>
<x-tabs.nav-item
name="available"
- icon="far fa-list"
+ icon_type="available"
label="{{ trans('general.available') }}"
count="{{ $license->availCount()->count() }}"
/>
<x-tabs.nav-item
name="files"
- icon="fa-solid fa-file-contract fa-fw"
+ icon_type="files"
label="{{ trans('general.files') }}"
count="{{ $license->uploads()->count() }}"
/>
-
<x-tabs.nav-item
name="history"
- icon="fa-solid fa-clock-rotate-left fa-fw"
+ icon_type="history"
label="{{ trans('general.history') }}"
tooltip="{{ trans('general.history') }}"
/>
@@ -57,168 +51,18 @@
</x-slot:tabnav>
<x-slot:tabpanes>
- <!-- start info tab pane -->
- <x-tabs.pane name="info" class="in active">
-
- <x-slot:content>
-
- <div class="container row-new-striped">
-
- @if (!is_null($license->serial))
- <div class="row">
- <div class="col-md-3">
- <strong>{{ trans('admin/licenses/form.license_key') }}</strong>
- </div>
- <div class="col-md-9">
- @can('viewKeys', $license)
-
- <code>
- <x-copy-to-clipboard copy_what="license_key">
- {!! nl2br(e($license->serial)) !!}
- </x-copy-to-clipboard>
- </code>
- @else
- ------------
- @endcan
- </div>
- </div>
- @endif
-
-
- @if ($license->license_name!='')
- <div class="row">
- <div class="col-md-3">
- <strong>{{ trans('admin/licenses/form.to_name') }}</strong>
- </div>
- <div class="col-md-9">
- {{ $license->license_name }}
- </div>
- </div>
- @endif
-
- @if ($license->license_email!='')
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/licenses/form.to_email') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ $license->license_email }}
- </div>
- </div>
- @endif
-
-
-
- @if (isset($license->expiration_date))
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/licenses/form.expiration') }}
- </strong>
- </div>
- <div class="col-md-9">
- @if ($license->isExpired())
- <span class="text-danger">
- <x-icon type="warning" class="text-warning" />
- </span>
- @endif
- {{ Helper::getFormattedDateObject($license->expiration_date, 'date', false) }}
- </div>
- </div>
- @endif
-
- @if ($license->termination_date)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/licenses/form.termination_date') }}
- </strong>
- </div>
- <div class="col-md-9">
- @if ($license->isTerminated())
- <span class="text-danger">
- <x-icon type="warning" class="text-warning" />
- </span>
- @endif
-
- {{ Helper::getFormattedDateObject($license->termination_date, 'date', false) }}
- </div>
- </div>
- @endif
-
-
-
-
-
- @if ($license->purchase_order)
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/licenses/form.purchase_order') }}
- </strong>
- </div>
- <div class="col-md-9">
- {{ $license->purchase_order }}
- </div>
- </div>
- @endif
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/licenses/form.maintained') }}
- </strong>
- </div>
- <div class="col-md-9">
- {!! $license->maintained ? '<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') !!}
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-3">
- <strong>
- {{ trans('admin/licenses/form.reassignable') }}
- </strong>
- </div>
- <div class="col-md-9">
- {!! $license->reassignable ? '<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') !!}
- </div>
- </div>
-
-
-
-
-
- </div>
-
- </x-slot:content>
- </x-tabs.pane>
- <!-- end info tab pane -->
-
- <x-tabs.pane name="seats">
+
+ <x-tabs.pane name="seats" class="in active">
<x-slot:header>
{{ trans('general.assigned') }}
</x-slot:header>
<x-slot:content>
- <table
- data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayoutSeats() }}"
- data-cookie-id-table="seatsTable"
- data-id-table="seatsTable"
- id="seatsTable"
- data-search="false"
- data-side-pagination="server"
- data-sort-order="asc"
- data-sort-name="name"
- class="table table-striped snipe-table"
- data-url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'assigned']) }}"
- data-export-options='{
- "fileName": "export-seats-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'>
- </table>
+ <x-table
+ api_url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'assigned']) }}"
+ :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeats()"
+ export_filename="export-{{ str_slug($license->name) }}-assigned-{{ date('Y-m-d') }}"
+ />
</x-slot:content>
</x-tabs.pane>
@@ -229,22 +73,12 @@
{{ trans('general.available') }}
</x-slot:header>
<x-slot:content>
- <table
- data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayoutSeats() }}"
- data-cookie-id-table="availableSeatsTable"
- data-id-table="availableSeatsTable"
- id="availableSeatsTable"
- data-search="false"
- data-side-pagination="server"
- data-sort-order="asc"
- data-sort-name="name"
- class="table table-striped snipe-table"
- data-url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'available']) }}"
- data-export-options='{
- "fileName": "export-available-seats-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'>
- </table>
+
+ <x-table
+ api_url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'available']) }}"
+ :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeats()"
+ export_filename="export-{{ str_slug($license->name) }}-available-{{ date('Y-m-d') }}"
+ />
</x-slot:content>
</x-tabs.pane>
@@ -310,7 +144,7 @@
</a>
<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" />
+ <x-icon type="checkout-all" />
{{ trans('admin/licenses/general.bulk.checkout_all.button') }}
</a>
@@ -352,11 +186,11 @@
</a>
@else
<span data-tooltip="true" title=" {{ trans('admin/licenses/general.delete_disabled') }}">
- <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-asset disabled" onClick="return false;">
- <x-icon type="delete" />
- {{ trans('general.delete') }}
- </a>
- </span>
+ <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-asset disabled" onClick="return false;">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </a>
+ </span>
@endif
@endcan