Skip to content

A free open source IT asset/license management system

More refactoring of tabs, tab panes, and tables

snipe91aec08ce0f5
diff --git a/resources/views/blade/button/index.blade.php b/resources/views/blade/button/index.blade.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/resources/views/blade/button/wide-delete.blade.php b/resources/views/blade/button/wide-delete.blade.php
new file mode 100644
index 0000000000..ec81acfc48
--- /dev/null
+++ b/resources/views/blade/button/wide-delete.blade.php
@@ -0,0 +1,21 @@
+@props([
+ 'item' => null,
+ 'route' => null,
+ 'count' => null,
+ 'type' => null,
+])
+
+@if ($item)
+ @if (!$item->isDeletable())
+ <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.'.$type)]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $item->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general'.$type)]) }}" onClick="return false;">
+ <x-icon type="delete" />
+ {{ trans('general.delete') }}
+ </button>
+ @endif
+@endif
+
diff --git a/resources/views/blade/button/wide-edit.blade.php b/resources/views/blade/button/wide-edit.blade.php
new file mode 100644
index 0000000000..55504f310a
--- /dev/null
+++ b/resources/views/blade/button/wide-edit.blade.php
@@ -0,0 +1,9 @@
+@props([
+ 'item' => null,
+ 'route' => null,
+])
+
+<a href="{{ ($item->deleted_at == '') ? $route: '#' }}" class="btn btn-block btn-sm btn-warning btn-social hidden-print{{ ($item->deleted_at!='') ? ' disabled' : '' }}">
+ <x-icon type="edit" />
+ {{ trans('general.update') }}
+</a>
\ No newline at end of file
diff --git a/resources/views/blade/table/accessories.blade.php b/resources/views/blade/table/accessories.blade.php
new file mode 100644
index 0000000000..878700c3d1
--- /dev/null
+++ b/resources/views/blade/table/accessories.blade.php
@@ -0,0 +1,20 @@
+<!-- start accessories tab pane -->
+@can('view', \App\Models\Accessory::class)
+
+ <x-slot:header>
+ {{ trans('general.accessories') }}
+ </x-slot:header>
+
+ <x-slot:content>
+ <x-table
+ show_column_search="true"
+ show_advanced_search="true"
+ buttons="accessoryButtons"
+ api_url="{{ $route }}"
+ :presenter="\App\Presenters\AccessoryPresenter::dataTableLayout()"
+ export_filename="export-{{ str_slug($name) }}-accessories-{{ date('Y-m-d') }}"
+ />
+ </x-slot:content>
+
+@endcan
+<!-- end accessories tab pane -->
\ No newline at end of file
diff --git a/resources/views/blade/table/assets.blade.php b/resources/views/blade/table/assets.blade.php
new file mode 100644
index 0000000000..301a839f89
--- /dev/null
+++ b/resources/views/blade/table/assets.blade.php
@@ -0,0 +1,29 @@
+@props([
+ 'route' => null,
+ 'name' => 'default',
+])
+
+<!-- start assets tab pane -->
+@can('view', \App\Models\Asset::class)
+
+ <x-slot:header>
+ {{ trans('general.assets') }}
+ </x-slot:header>
+
+ <x-slot:bulkactions>
+ <x-table.bulk-assets />
+ </x-slot:bulkactions>
+
+ <x-slot:content>
+ <x-table
+ show_column_search="true"
+ show_advanced_search="true"
+ buttons="assetButtons"
+ api_url="{{ $route }}"
+ :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"
+ export_filename="export-{{ str_slug($name) }}-assets-{{ date('Y-m-d') }}"
+ />
+ </x-slot:content>
+
+@endcan
+<!-- end assets tab pane -->
\ No newline at end of file
diff --git a/resources/views/blade/table/components.blade.php b/resources/views/blade/table/components.blade.php
new file mode 100644
index 0000000000..ba542635b3
--- /dev/null
+++ b/resources/views/blade/table/components.blade.php
@@ -0,0 +1,23 @@
+@props([
+ 'route' => null,
+ 'name' => 'default',
+])
+
+<!-- start components tab pane -->
+@can('view', \App\Models\Component::class)
+ <x-slot:header>
+ {{ trans('general.components') }}
+ </x-slot:header>
+
+ <x-slot:content>
+ <x-table
+ show_column_search="true"
+ show_advanced_search="true"
+ buttons="componentButtons"
+ api_url="{{ $route }}"
+ :presenter="\App\Presenters\ComponentPresenter::dataTableLayout()"
+ export_filename="export-{{ str_slug($name) }}-components-{{ date('Y-m-d') }}"
+ />
+ </x-slot:content>
+@endcan
+<!-- end components tab pane -->
\ No newline at end of file
diff --git a/resources/views/blade/table/consumables.blade.php b/resources/views/blade/table/consumables.blade.php
new file mode 100644
index 0000000000..16b9244b93
--- /dev/null
+++ b/resources/views/blade/table/consumables.blade.php
@@ -0,0 +1,25 @@
+@props([
+ 'route' => null,
+ 'name' => 'default',
+])
+
+<!-- start consumables tab pane -->
+@can('view', \App\Models\Consumable::class)
+
+ <x-slot:header>
+ {{ trans('general.consumables') }}
+ </x-slot:header>
+
+ <x-slot:content>
+ <x-table
+ show_column_search="true"
+ show_advanced_search="true"
+ buttons="consumableButtons"
+ api_url="{{ $route }}"
+ :presenter="\App\Presenters\ConsumablePresenter::dataTableLayout()"
+ export_filename="export-{{ str_slug($name) }}-consumables-{{ date('Y-m-d') }}"
+ />
+ </x-slot:content>
+
+@endcan
+<!-- end consumables tab pane -->
\ No newline at end of file
diff --git a/resources/views/blade/table/licenses.blade.php b/resources/views/blade/table/licenses.blade.php
new file mode 100644
index 0000000000..fc37165360
--- /dev/null
+++ b/resources/views/blade/table/licenses.blade.php
@@ -0,0 +1,24 @@
+@props([
+ 'route' => null,
+ 'name' => 'default',
+])
+<!-- start licenses tab pane -->
+@can('view', \App\Models\License::class)
+
+ <x-slot:header>
+ {{ trans('general.licenses') }}
+ </x-slot:header>
+
+ <x-slot:content>
+ <x-table
+ show_column_search="true"
+ show_advanced_search="true"
+ buttons="licenseButtons"
+ api_url="{{ $route }}"
+ :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"
+ export_filename="export-{{ str_slug($name) }}-licenses-{{ date('Y-m-d') }}"
+ />
+ </x-slot:content>
+
+@endcan
+<!-- end licenses tab pane -->
\ No newline at end of file
diff --git a/resources/views/blade/tabs/accessory-tab.blade.php b/resources/views/blade/tabs/accessory-tab.blade.php
new file mode 100644
index 0000000000..930386f1a8
--- /dev/null
+++ b/resources/views/blade/tabs/accessory-tab.blade.php
@@ -0,0 +1,13 @@
+@props([
+ 'count' => null,
+])
+
+@can('view', \App\Models\Accessory::class)
+ <x-tabs.nav-item
+ name="accessories"
+ icon_type="accessory"
+ label="{{ trans('general.accessories') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.accessories') }}"
+ />
+@endcan
\ No newline at end of file
diff --git a/resources/views/blade/tabs/asset-tab.blade.php b/resources/views/blade/tabs/asset-tab.blade.php
new file mode 100644
index 0000000000..4cbcefe5d0
--- /dev/null
+++ b/resources/views/blade/tabs/asset-tab.blade.php
@@ -0,0 +1,14 @@
+@props([
+ 'count' => null,
+])
+
+@can('view', \App\Models\Asset::class)
+ <x-tabs.nav-item
+ name="assets"
+ class="active"
+ icon_type="assets"
+ label="{{ trans('general.assets') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.assets') }}"
+ />
+@endcan
\ No newline at end of file
diff --git a/resources/views/blade/tabs/component-tab.blade.php b/resources/views/blade/tabs/component-tab.blade.php
new file mode 100644
index 0000000000..f6c5bfad19
--- /dev/null
+++ b/resources/views/blade/tabs/component-tab.blade.php
@@ -0,0 +1,13 @@
+@props([
+ 'count' => null,
+])
+
+@can('view', \App\Models\Component::class)
+ <x-tabs.nav-item
+ name="components"
+ icon_type="component"
+ label="{{ trans('general.components') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.components') }}"
+ />
+@endcan
\ No newline at end of file
diff --git a/resources/views/blade/tabs/consumable-tab.blade.php b/resources/views/blade/tabs/consumable-tab.blade.php
new file mode 100644
index 0000000000..d6eb18b86e
--- /dev/null
+++ b/resources/views/blade/tabs/consumable-tab.blade.php
@@ -0,0 +1,13 @@
+@props([
+ 'count' => null,
+])
+
+@can('view', \App\Models\Consumable::class)
+ <x-tabs.nav-item
+ name="consumables"
+ icon_type="consumable"
+ label="{{ trans('general.consumables') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.consumables') }}"
+ />
+@endcan
\ No newline at end of file
diff --git a/resources/views/blade/tabs/files-tab.blade.php b/resources/views/blade/tabs/files-tab.blade.php
new file mode 100644
index 0000000000..c4ce3f286a
--- /dev/null
+++ b/resources/views/blade/tabs/files-tab.blade.php
@@ -0,0 +1,9 @@
+@props([
+ 'count' => null,
+])
+<x-tabs.nav-item
+ name="files"
+ icon_type="files"
+ label="{{ trans('general.files') }}"
+ count="{{ $count }}"
+/>
\ No newline at end of file
diff --git a/resources/views/blade/tabs/license-tab.blade.php b/resources/views/blade/tabs/license-tab.blade.php
new file mode 100644
index 0000000000..6b574f4845
--- /dev/null
+++ b/resources/views/blade/tabs/license-tab.blade.php
@@ -0,0 +1,13 @@
+@props([
+ 'count' => null,
+])
+
+@can('view', \App\Models\License::class)
+ <x-tabs.nav-item
+ name="licenses"
+ icon_type="licenses"
+ label="{{ trans('general.licenses') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.licenses') }}"
+ />
+@endcan
\ No newline at end of file
diff --git a/resources/views/blade/tabs/pane.blade.php b/resources/views/blade/tabs/pane.blade.php
index 4139080618..20e43420c2 100644
--- a/resources/views/blade/tabs/pane.blade.php
+++ b/resources/views/blade/tabs/pane.blade.php
@@ -17,6 +17,14 @@
</div>
@endif
- {{ $content }}
+ @if ((isset($content)) && (!$content->isEmpty()))
+ {{ $content }}
+ @endif
+
+ @if (($slot) && (!$slot->isEmpty()))
+ {{ $slot }}
+ @endif
+
+
</div>
<!-- /.tab-pane -->
\ No newline at end of file
diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php
index 3344ffb972..ccfc425564 100644
--- a/resources/views/manufacturers/view.blade.php
+++ b/resources/views/manufacturers/view.blade.php
@@ -18,56 +18,13 @@
<x-page-column class="col-md-9 main-panel">
<x-tabs>
<x-slot:tabnav>
- @can('view', \App\Models\Asset::class)
- <x-tabs.nav-item
- name="assets"
- class="active"
- icon="fas fa-barcode fa-fw"
- label="{{ trans('general.assets') }}"
- count="{{ $manufacturer->assets()->AssetsForShow()->count() }}"
- tooltip="{{ trans('general.assets') }}"
- />
- @endcan
-
- @can('view', \App\Models\License::class)
- <x-tabs.nav-item
- name="licenses"
- icon="far fa-save"
- label="{{ trans('general.licenses') }}"
- count="{{ $manufacturer->licenses->count() }}"
- tooltip="{{ trans('general.licenses') }}"
- />
- @endcan
-
- @can('view', \App\Models\Accessory::class)
- <x-tabs.nav-item
- name="accessories"
- icon="far fa-keyboard fa-fw"
- label="{{ trans('general.accessories') }}"
- count="{{ $manufacturer->accessories->count() }}"
- tooltip="{{ trans('general.accessories') }}"
- />
- @endcan
- @can('view', \App\Models\Consumable::class)
- <x-tabs.nav-item
- name="consumables"
- icon="fas fa-tint fa-fw"
- label="{{ trans('general.consumables') }}"
- count="{{ $manufacturer->consumables->count() }}"
- tooltip="{{ trans('general.consumables') }}"
- />
- @endcan
-
- @can('view', \App\Models\Component::class)
- <x-tabs.nav-item
- name="components"
- icon="fas fa-hdd fa-fw"
- label="{{ trans('general.components') }}"
- count="{{ $manufacturer->components->count() }}"
- tooltip="{{ trans('general.components') }}"
- />
- @endcan
+ <x-tabs.asset-tab count="{{ $manufacturer->assets()->AssetsForShow()->count() }}" />
+ <x-tabs.license-tab count="{{ $manufacturer->licenses->count() }}" />
+ <x-tabs.accessory-tab count="{{ $manufacturer->accessories->count() }}" />
+ <x-tabs.consumable-tab count="{{ $manufacturer->consumables->count() }}" />
+ <x-tabs.component-tab count="{{ $manufacturer->components->count() }}" />
+ <x-tabs.files-tab name="files" />
@can('update', $manufacturer)
<x-tabs.nav-item-upload />
@@ -76,114 +33,26 @@
</x-slot:tabnav>
<x-slot:tabpanes>
- <!-- start assets tab pane -->
- @can('view', \App\Models\Asset::class)
- <x-tabs.pane name="assets" class="in active">
- <x-slot:header>
- {{ trans('general.assets') }}
- </x-slot:header>
-
- <x-slot:bulkactions>
- <x-table.bulk-assets />
- </x-slot:bulkactions>
-
- <x-slot:content>
- <x-table
- show_column_search="true"
- show_advanced_search="true"
- buttons="assetButtons"
- api_url="{{ route('api.assets.index', ['manufacturer_id' => $manufacturer->id, 'itemtype' => 'assets']) }}"
- :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"
- export_filename="export-{{ str_slug($manufacturer->name) }}-assets-{{ date('Y-m-d') }}"
- />
- </x-slot:content>
- </x-tabs.pane>
- @endcan
- <!-- end assets tab pane -->
-
- <!-- start licenses tab pane -->
- @can('view', \App\Models\License::class)
- <x-tabs.pane name="licenses">
- <x-slot:header>
- {{ trans('general.licenses') }}
- </x-slot:header>
-
- <x-slot:content>
- <x-table
- show_column_search="true"
- show_advanced_search="true"
- buttons="licenseButtons"
- api_url="{{ route('api.licenses.index', ['manufacturer_id' => $manufacturer->id]) }}"
- :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"
- export_filename="export-{{ str_slug($manufacturer->name) }}-licenses-{{ date('Y-m-d') }}"
- />
- </x-slot:content>
- </x-tabs.pane>
- @endcan
- <!-- end licenses tab pane -->
-
- <!-- start accessories tab pane -->
- @can('view', \App\Models\Accessory::class)
- <x-tabs.pane name="accessories">
- <x-slot:header>
- {{ trans('general.accessories') }}
- </x-slot:header>
-
- <x-slot:content>
- <x-table
- show_column_search="true"
- show_advanced_search="true"
- buttons="accessoryButtons"
- api_url="{{ route('api.accessories.index', ['manufacturer_id' => $manufacturer->id]) }}"
- :presenter="\App\Presenters\AccessoryPresenter::dataTableLayout()"
- export_filename="export-{{ str_slug($manufacturer->name) }}-accessories-{{ date('Y-m-d') }}"
- />
- </x-slot:content>
- </x-tabs.pane>
- @endcan
- <!-- end accessories tab pane -->
-
- <!-- start consumables tab pane -->
- @can('view', \App\Models\Consumable::class)
- <x-tabs.pane name="consumables">
- <x-slot:header>
- {{ trans('general.consumables') }}
- </x-slot:header>
-
- <x-slot:content>
- <x-table
- show_column_search="true"
- show_advanced_search="true"
- buttons="consumableButtons"
- api_url="{{ route('api.consumables.index', ['manufacturer_id' => $manufacturer->id]) }}"
- :presenter="\App\Presenters\ConsumablePresenter::dataTableLayout()"
- export_filename="export-{{ str_slug($manufacturer->name) }}-consumables-{{ date('Y-m-d') }}"
- />
- </x-slot:content>
- </x-tabs.pane>
- @endcan
- <!-- end consumables tab pane -->
-
- <!-- start components tab pane -->
- @can('view', \App\Models\Component::class)
- <x-tabs.pane name="components">
- <x-slot:header>
- {{ trans('general.components') }}
- </x-slot:header>
-
- <x-slot:content>
- <x-table
- show_column_search="true"
- show_advanced_search="true"
- buttons="componentButtons"
- api_url="{{ route('api.components.index', ['manufacturer_id' => $manufacturer->id]) }}"
- :presenter="\App\Presenters\ComponentPresenter::dataTableLayout()"
- export_filename="export-{{ str_slug($manufacturer->name) }}-components-{{ date('Y-m-d') }}"
- />
- </x-slot:content>
- </x-tabs.pane>
- @endcan
- <!-- end components tab pane -->
+
+ <x-tabs.pane name="assets" class="in active">
+ <x-table.assets :route="route('api.assets.index', ['manufacturer_id' => $manufacturer->id, 'itemtype' => 'assets'])" />
+ </x-tabs.pane>
+
+ <x-tabs.pane name="licenses">
+ <x-table.licenses :name="$manufacturer->name" :route="route('api.licenses.index', ['manufacturer_id' => $manufacturer->id])" />
+ </x-tabs.pane>
+
+ <x-tabs.pane name="accessories">
+ <x-table.accessories :name="$manufacturer->name" :route="route('api.accessories.index', ['manufacturer_id' => $manufacturer->id])" />
+ </x-tabs.pane>
+
+ <x-tabs.pane name="consumables">
+ <x-table.consumables :name="$manufacturer->name" :route="route('api.consumables.index', ['manufacturer_id' => $manufacturer->id])" />
+ </x-tabs.pane>
+
+ <x-tabs.pane name="components">
+ <x-table.components :name="$manufacturer->name" :route="route('api.components.index', ['manufacturer_id' => $manufacturer->id])" />
+ </x-tabs.pane>
</x-slot:tabpanes>
</x-tabs>
@@ -196,26 +65,12 @@
<x-slot:before_list>
@can('update', \App\Models\Manufacturer::class)
- <a href="{{ ($manufacturer->deleted_at=='') ? route('manufacturers.edit', $manufacturer->id) : '#' }}" class="btn btn-block btn-sm btn-warning btn-social hidden-print{{ ($manufacturer->deleted_at!='') ? ' disabled' : '' }}">
- <x-icon type="edit" />
- {{ trans('general.update') }}
- </a>
+ <x-button.wide-edit :item="$manufacturer" :route="route('manufacturers.edit', $manufacturer->id)" />
@endcan
- @can('delete', \App\Models\Manufacturer::class)
-
- @if ($manufacturer->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.manufacturer')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $manufacturer->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.manufacturer')]) }}" onClick="return false;">
- <x-icon type="delete" />
- {{ trans('general.delete') }}
- </button>
- @endif
- @endcan
+ @can('delete', \App\Models\Manufacturer::class)
+ <x-button.wide-delete :item="$manufacturer" />
+ @endcan
</x-slot:before_list>
@@ -226,6 +81,7 @@
@stop
+
@section('moar_scripts')
@include ('partials.bootstrap-table', ['exportFile' => 'manufacturer' . $manufacturer->name . '-export', 'search' => false])
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 1d27da565c..24352f1a52 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -27,66 +27,23 @@
<x-page-column class="col-md-9 main-panel">
<x-tabs>
<x-slot:tabnav>
- @can('view', \App\Models\Asset::class)
- <x-tabs.nav-item
- name="assets"
- class="active"
- icon="fas fa-barcode fa-fw"
- label="{{ trans('general.assets') }}"
- count="{{ $model->assets()->AssetsForShow()->count() }}"
- />
- @endcan
-
- <x-tabs.nav-item
- name="files"
- icon="fa-solid fa-file-contract fa-fw"
- label="{{ trans('general.files') }}"
- count="{{ $model->uploads()->count() }}"
- />
+ <x-tabs.asset-tab count="{{ $model->assets()->AssetsForShow()->count() }}" />
+ <x-tabs.files-tab name="files" count="{{ $model->uploads()->count() }}" />
- @can('update', $model)
- <x-tabs.nav-item-upload />
- @endcan
+ @can('update', $model)
+ <x-tabs.nav-item-upload />
+ @endcan
</x-slot:tabnav>
<x-slot:tabpanes>
- <!-- start assets tab pane -->
- @can('view', \App\Models\Asset::class)
- <x-tabs.pane name="assets" class="in active">
- <x-slot:header>
- {{ trans('general.assets') }}
- </x-slot:header>
-
- <x-slot:bulkactions>
- <x-table.bulk-assets />
- </x-slot:bulkactions>
-
- <x-slot:content>
- <x-table
- show_column_search="true"
- show_advanced_search="true"
- buttons="assetButtons"
- api_url="{{ route('api.assets.index', ['model_id' => $model->id]) }}"
- :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"
- export_filename="export-{{ str_slug($model->name) }}-assets-{{ date('Y-m-d') }}"
- />
- </x-slot:content>
- </x-tabs.pane>
-
- <!-- start files tab pane -->
- <x-tabs.pane name="files">
- <x-slot:header>
- {{ trans('general.files') }}
- </x-slot:header>
- <x-slot:content>
- <x-filestable object_type="models" :object="$model" />
- </x-slot:content>
- </x-tabs.pane>
- <!-- end files tab pane -->
-
- @endcan
+ <x-tabs.pane name="assets" class="in active">
+ <x-table.assets :route="route('api.assets.index', ['model_id' => $model->id])" />
+ </x-tabs.pane>
+ <x-tabs.pane name="files">
+ <x-filestable :object="$model" object_type="models" />
+ </x-tabs.pane>
</x-slot:tabpanes>
</x-tabs>