Skip to content

A free open source IT asset/license management system

Moved files table header into component

snipe0223304ec78b
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 900cf8df23..b199a2ef2c 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -68,10 +68,6 @@
<!-- start files tab pane -->
@can('accessories.files', $accessory)
<x-tabs.pane name="files">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files object_type="accessories" :object="$accessory"/>
</x-tabs.pane>
@endcan
diff --git a/resources/views/blade/table/files.blade.php b/resources/views/blade/table/files.blade.php
index a363be8541..9e3654c8b4 100644
--- a/resources/views/blade/table/files.blade.php
+++ b/resources/views/blade/table/files.blade.php
@@ -2,34 +2,33 @@
@props([
'object',
'object_type' => '',
+ 'table_header' => trans('general.files'),
])
-<!-- begin non-ajaxed file listing table -->
- <table
- data-columns="{{ \App\Presenters\UploadedFilesPresenter::dataTableLayout() }}"
- data-cookie-id-table="{{ $object_type }}-FileUploadsTable"
- data-id-table="{{ $object_type }}-FileUploadsTable"
- id="{{ $object_type }}-FileUploadsTable"
- data-side-pagination="server"
- data-pagination="true"
- data-sort-order="desc"
- data-sort-name="created_at"
- data-show-custom-view="true"
- data-custom-view="customViewFormatter"
- data-show-advanced-search="false"
- data-show-custom-view-button="true"
- data-url="{{ route('api.files.index', ['object_type' => $object_type, 'id' => $object->id]) }}"
- class="table table-striped snipe-table"
- data-export-options='{
- "fileName": "export-uploads-{{ str_slug($object->name) }}-{{ date('Y-m-d') }}",
- "ignoreColumn": ["image","delete","download","icon"]
- }'>
- </table>
+<x-slot:table_header>
+ {{ $table_header }}
+</x-slot:table_header>
- <x-gallery-card />
+<table
+ data-columns="{{ \App\Presenters\UploadedFilesPresenter::dataTableLayout() }}"
+ data-cookie-id-table="{{ $object_type }}-FileUploadsTable"
+ data-id-table="{{ $object_type }}-FileUploadsTable"
+ id="{{ $object_type }}-FileUploadsTable"
+ data-side-pagination="server"
+ data-pagination="true"
+ data-sort-order="desc"
+ data-sort-name="created_at"
+ data-show-custom-view="true"
+ data-custom-view="customViewFormatter"
+ data-show-advanced-search="false"
+ data-show-custom-view-button="true"
+ data-url="{{ route('api.files.index', ['object_type' => $object_type, 'id' => $object->id]) }}"
+ class="table table-striped snipe-table"
+ data-export-options='{
+ "fileName": "export-uploads-{{ str_slug($object->name) }}-{{ date('Y-m-d') }}",
+ "ignoreColumn": ["image","delete","download","icon"]
+ }'>
+</table>
-
-
-
-<!-- end non-ajaxed file listing table -->
\ No newline at end of file
+<x-gallery-card/>
diff --git a/resources/views/blade/tabs/model-tab.blade.php b/resources/views/blade/tabs/model-tab.blade.php
new file mode 100644
index 0000000000..20226f9374
--- /dev/null
+++ b/resources/views/blade/tabs/model-tab.blade.php
@@ -0,0 +1,11 @@
+@props([
+ 'count' => null,
+])
+
+<x-tabs.nav-item
+ name="models"
+ icon_type="models"
+ label="{{ trans('general.asset_models') }}"
+ count="{{ $count }}"
+ tooltip="{{ trans('general.asset_models') }}"
+/>
diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php
index 9a24e4b404..09cbe68b37 100644
--- a/resources/views/categories/view.blade.php
+++ b/resources/views/categories/view.blade.php
@@ -19,73 +19,18 @@
<x-tabs>
<x-slot:tabnav>
@if ($category->category_type=='asset')
- @can('view', \App\Models\Asset::class)
-
- <x-tabs.nav-item
- name="assets"
- icon_type="asset"
- label="{{ trans('general.assets') }}"
- count="{{ $category->showableAssets()->count() }}"
- />
- @endcan
-
- @can('view', \App\Models\AssetModel::class)
-
- <x-tabs.nav-item
- name="models"
- icon_type="models"
- label="{{ trans('general.asset_models') }}"
- count="{{ $category->models->count() }}"
- />
- @endcan
-
+ <x-tabs.asset-tab count="{{ $category->showableAssets()->count() }}"/>
+ <x-tabs.model-tab count="{{ $category->models->count() }}"/>
@elseif ($category->category_type=='accessory')
-
- @can('view', \App\Models\Accessory::class)
- <x-tabs.nav-item
- name="accessories"
- icon_type="accessory"
- label="{{ trans('general.accessories') }}"
- count="{{ $category->accessories()->count() }}"
- />
- @endcan
-
+ <x-tabs.accessory-tab count="{{ $category->accessories->count() }}"/>
@elseif ($category->category_type=='license')
- @can('view', \App\Models\License::class)
-
- <x-tabs.nav-item
- name="licenses"
- icon_type="license"
- label="{{ trans('general.licenses') }}"
- />
- @endcan
-
+ <x-tabs.license-tab count="{{ $category->licenses->count() }}"/>
@elseif ($category->category_type=='consumable')
-
- @can('view', \App\Models\Consumable::class)
- <x-tabs.nav-item
- name="consumables"
- icon_type="consumable"
- label="{{ trans('general.consumables') }}"
- count="{{ $category->consumables()->count() }}"
- />
- @endcan
-
+ <x-tabs.consumable-tab count="{{ $category->consumables->count() }}"/>
@elseif ($category->category_type=='component')
-
- @can('view', \App\Models\Component::class)
- <x-tabs.nav-item
- name="components"
- icon_type="component"
- label="{{ trans('general.components') }}"
- count="{{ $category->components()->count() }}"
- />
- @endcan
+ <x-tabs.component-tab count="{{ $category->components->count() }}"/>
@endif
-
-
-
</x-slot:tabnav>
<x-slot:tabpanes>
@@ -97,6 +42,7 @@
<x-table.assets :route="route('api.assets.index', ['category_id' => $category->id, 'itemtype' => 'assets'])"/>
</x-tabs.pane>
@endcan
+
@can('view', \App\Models\AssetModel::class)
<x-tabs.pane name="models">
<x-table.models :route="route('api.models.index', ['status' => e(request('status')), 'category_id' => $category->id])"/>
@@ -152,9 +98,9 @@
</x-box.info-panel>
</x-box>
</x-page-column>
-</x-container>
+ </x-container>
@endsection
@section('moar_scripts')
-@include ('partials.bootstrap-table')
+ @include ('partials.bootstrap-table')
@stop
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 36468476d8..3b1d866106 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -49,12 +49,7 @@
</x-tabs.pane>
<x-tabs.pane name="files">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files object_type="components" :object="$snipe_component"/>
-
</x-tabs.pane>
<!-- start history tab pane -->
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index d02b026d85..525b85ef2d 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -50,10 +50,6 @@
</x-tabs.pane>
<x-tabs.pane name="files">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files object_type="consumables" :object="$consumable"/>
</x-tabs.pane>
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 7d9d175df7..644a653671 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -106,12 +106,7 @@
<!-- start files tab pane -->
@can('licenses.files', $license)
<x-tabs.pane name="files">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files object_type="licenses" :object="$license" />
-
</x-tabs.pane>
@endcan
<!-- end files tab pane -->
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 948fad59df..988d29ee6a 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -190,12 +190,7 @@
<!-- start files tab pane -->
<x-tabs.pane name="files">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files object_type="locations" :object="$location"/>
-
</x-tabs.pane>
<!-- end files tab pane -->
diff --git a/resources/views/maintenances/view.blade.php b/resources/views/maintenances/view.blade.php
index 63db22e860..b62820087d 100644
--- a/resources/views/maintenances/view.blade.php
+++ b/resources/views/maintenances/view.blade.php
@@ -21,12 +21,7 @@ use Carbon\Carbon;
<x-tabs>
<x-slot:tabnav>
- <x-tabs.nav-item
- name="details"
- icon_type="info-circle"
- label="{{ trans('general.details') }}"
- />
-
+ <x-tabs.details-tab/>
<x-tabs.files-tab count="{{ $maintenance->uploads()->count() }}" />
@can('update', $maintenance)
@@ -36,10 +31,9 @@ use Carbon\Carbon;
</x-slot:tabnav>
<x-slot:tabpanes>
- <x-tabs.pane name="details" class="in active">
-
+ <x-tabs.pane name="details">
- <div class="tab-pane active" id="info">
+ <div class="tab-pane active" id="info">
<div class="row-new-striped">
<div class="row">
@@ -175,12 +169,7 @@ use Carbon\Carbon;
</x-tabs.pane>
<x-tabs.pane name="files">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files object_type="maintenances" :object="$maintenance"/>
-
</x-tabs.pane>
</x-slot:tabpanes>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 68d0cbc47d..91aa8dc7c7 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -42,10 +42,6 @@
</x-tabs.pane>
<x-tabs.pane name="files">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files :object="$model" object_type="models" />
</x-tabs.pane>
</x-slot:tabpanes>
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 3d4d630a89..8454348528 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -90,12 +90,7 @@
<!-- start files tab pane -->
<x-tabs.pane name="files" class="{{ $supplier->uploads->count() == 0 ? 'hidden-print' : '' }}">
- <x-slot:table_header>
- {{ trans('general.files') }}
- </x-slot:table_header>
-
<x-table.files object_type="suppliers" :object="$supplier"/>
-
</x-tabs.pane>
<!-- end files tab pane -->