A free open source IT asset/license management system
Use new button blade components
snipe671601365cbc
diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.phpindex e5cd5b796a..e67bf9e5c2 100644--- a/resources/views/categories/view.blade.php+++ b/resources/views/categories/view.blade.php@@ -227,27 +227,8 @@<x-slot:before_list>- @can('update', $category)- <a href="{{ ($category->deleted_at=='') ? route('categories.edit', $category->id) : '#' }}" class="btn btn-block btn-sm btn-warning btn-social hidden-print{{ ($category->deleted_at!='') ? ' disabled' : '' }}">- <x-icon type="edit" />- {{ trans('general.update') }}- </a>- @endcan-- @can('delete', $category)-- @if (!$category->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.category')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $category->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.category')]) }}" onClick="return false;">- <x-icon type="delete" />- {{ trans('general.delete') }}- </button>- @endif- @endcan+ <x-button.wide-edit :item="$category" :route="route('categories.edit', $category->id)" />+ <x-button.wide-delete :item="$category" /></x-slot:before_list></x-box.info-panel>diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.phpindex 73e95a50d0..2a6567cb9c 100644--- a/resources/views/companies/view.blade.php+++ b/resources/views/companies/view.blade.php@@ -231,39 +231,9 @@<x-box.info-panel :infoPanelObj="$company" img_path="{{ app('companies_upload_url') }}"><x-slot:before_list>- @can('update', $company)- @if ($company->deleted_at=='')- <a href="{{ route('companies.edit', ['company' => $company->id]) }}" class="btn btn-block btn-sm btn-warning btn-social">- <x-icon type="edit" />- {{ trans('general.update') }}- </a>- @else- <a class="btn btn-block btn-sm btn-warning btn-social disabled">- <x-icon type="edit" />- {{ trans('general.update') }}- </a>- @endif- @endcan--- @can('delete', $company)-- @if ($company->deleted_at=='')- @if ($company->isDeletable())- <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $company->name]) }}" data-target="#dataConfirmModal">- <x-icon type="delete" /> {{ trans('general.delete') }}- </button>- @else- <div data-placement="top" data-tooltip="true" data-title="{{ trans('general.cannot_be_deleted') }}" style="padding-top: 5px; padding-bottom: 5px;">- <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true">- <x-icon type="delete" /> {{ trans('general.delete') }}- </a>- </div>- @endif-- @endif-- @endcan++ <x-button.wide-edit :item="$company" :route="route('companies.edit', $company->id)" />+ <x-button.wide-delete :item="$company" /></x-slot:before_list>diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.phpindex e087b28abe..a0d9d3d85e 100644--- a/resources/views/components/view.blade.php+++ b/resources/views/components/view.blade.php@@ -85,13 +85,9 @@<x-button.wide-checkout :item="$snipe_component" :route="route('components.checkout.show', $snipe_component->id)" />@endcan- @can('update', \App\Models\Component::class)- <x-button.wide-edit :item="$snipe_component" :route="route('components.edit', $snipe_component->id)" />- @endcan+ <x-button.wide-edit :item="$snipe_component" :route="route('components.edit', $snipe_component->id)" />+ <x-button.wide-delete :item="$snipe_component" />- @can('delete', \App\Models\Component::class)- <x-button.wide-delete :item="$snipe_component" :route="route('components.edit', $snipe_component->id)" />- @endcan</x-slot:before_list>diff --git a/resources/views/departments/view.blade.php b/resources/views/departments/view.blade.phpindex 9f6b89ca0f..90eb24f0c2 100644--- a/resources/views/departments/view.blade.php+++ b/resources/views/departments/view.blade.php@@ -42,27 +42,8 @@<x-slot:before_list>- @can('update', \App\Models\Department::class)- <a href="{{ ($department->deleted_at=='') ? route('departments.edit', $department->id) : '#' }}" class="btn btn-block btn-sm btn-warning btn-social hidden-print{{ ($department->deleted_at!='') ? ' disabled' : '' }}">- <x-icon type="edit" />- {{ trans('general.update') }}- </a>- @endcan-- @can('delete', \App\Models\Department::class)-- @if ($department->users()->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.department')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $department->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.department')]) }}" onClick="return false;">- <x-icon type="delete" />- {{ trans('general.delete') }}- </button>- @endif- @endcan+ <x-button.wide-edit :item="$department" :route="route('departments.edit', $department->id)" />+ <x-button.wide-delete :item="$department" /></x-slot:before_list>diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.phpindex 8ec5aec57b..2e8a9f0915 100644--- a/resources/views/depreciations/view.blade.php+++ b/resources/views/depreciations/view.blade.php@@ -132,38 +132,8 @@<x-slot:before_list>- @can('update', $depreciation)- @if ($depreciation->deleted_at=='')- <a href="{{ route('depreciations.edit', ['depreciation' => $depreciation->id]) }}" class="btn btn-block btn-sm btn-warning btn-social">- <x-icon type="edit" />- {{ trans('general.update') }}- </a>- @else- <a class="btn btn-block btn-sm btn-warning btn-social disabled">- <x-icon type="edit" />- {{ trans('general.update') }}- </a>- @endif- @endcan-- @can('delete', $depreciation)-- @if ($depreciation->deleted_at=='')- @if ($depreciation->isDeletable())- <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $depreciation->name]) }}" data-target="#dataConfirmModal">- <x-icon type="delete" /> {{ trans('general.delete') }}- </button>- @else- <div data-placement="top" data-tooltip="true" data-title="{{ trans('general.cannot_be_deleted') }}" style="padding-top: 5px; padding-bottom: 5px;">- <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true">- <x-icon type="delete" /> {{ trans('general.delete') }}- </a>- </div>- @endif-- @endif-- @endcan+ <x-button.wide-edit :item="$depreciation" :route="route('depreciations.edit', $depreciation->id)" />+ <x-button.wide-delete :item="$depreciation" /></x-slot:before_list></x-box.info-panel>diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.phpindex 44caae7b70..1f5fdf37db 100644--- a/resources/views/locations/view.blade.php+++ b/resources/views/locations/view.blade.php@@ -17,6 +17,17 @@{{-- Page content --}}@section('content')<x-container columns="2">++ @if ($location->deleted_at!='')+ <div class="col-md-12">+ <div class="callout callout-warning">+ <x-icon type="warning" />+ {{ trans('admin/locations/message.deleted_warning') }}+ </div>+ </div>+ @endif++<x-page-column class="col-md-9 main-panel"><x-tabs>@@ -377,58 +388,25 @@<x-box.info-panel :infoPanelObj="$location" img_path="{{ app('locations_upload_url') }}"><x-slot:before_list>- @can('update', $location)- @if ($location->deleted_at=='')- <a href="{{ route('locations.edit', ['location' => $location->id]) }}" class="btn btn-block btn-sm btn-warning btn-social">- <x-icon type="edit" />- {{ trans('admin/locations/table.update') }}- </a>- @else- <a class="btn btn-block btn-sm btn-warning btn-social disabled">- <x-icon type="edit" />- {{ trans('admin/locations/table.update') }}- </a>- @endif- @endcan++ <x-button.wide-edit :item="$location" :route="route('locations.edit', $location->id)" />+ <x-button.wide-restore :item="$location" :route="route('locations.restore', ['location' => $location->id])" />@if ($location->deleted_at=='')- <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">- <x-icon type="print" />- {{ trans('admin/locations/table.print_inventory') }}- </a>- <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">- <x-icon type="print" />- {{ trans('admin/locations/table.print_all_assigned') }}- </a>+ <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">+ <x-icon type="print" />+ {{ trans('admin/locations/table.print_inventory') }}+ </a>+ <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">+ <x-icon type="print" />+ {{ trans('admin/locations/table.print_all_assigned') }}+ </a>@endif- @can('delete', $location)-- @if ($location->deleted_at=='')- @if ($location->isDeletable())- <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $location->name]) }}" data-target="#dataConfirmModal">- <x-icon type="delete" /> {{ trans('general.delete') }}- </button>- @else- <div data-placement="top" data-tooltip="true" data-title="{{ trans('admin/locations/message.assoc_users') }}" style="padding-top: 5px; padding-bottom: 5px;">- <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true">- <x-icon type="delete" /> {{ trans('general.delete') }}- </a>- </div>- @endif-- @else- <form method="POST" action="{{ route('locations.restore', ['location' => $location->id]) }}">- @csrf- <button class="btn btn-sm btn-block btn-warning btn-social">- <x-icon type="restore" />- {{ trans('general.restore') }}- </button>- </form>- @endif- @endcan+ <x-button.wide-delete :item="$location" />+</x-slot:before_list>diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.phpindex 5e065e9133..b21151d768 100644--- a/resources/views/manufacturers/view.blade.php+++ b/resources/views/manufacturers/view.blade.php@@ -56,13 +56,8 @@<x-slot:before_list>- @can('update', \App\Models\Manufacturer::class)- <x-button.wide-edit :item="$manufacturer" :route="route('manufacturers.edit', $manufacturer->id)" />- @endcan-- @can('delete', \App\Models\Manufacturer::class)- <x-button.wide-delete :item="$manufacturer" />- @endcan+ <x-button.wide-edit :item="$manufacturer" :route="route('manufacturers.edit', $manufacturer->id)" />+ <x-button.wide-delete :item="$manufacturer" /></x-slot:before_list>diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.phpindex 24352f1a52..3a5051a537 100755--- a/resources/views/models/view.blade.php+++ b/resources/views/models/view.blade.php@@ -53,44 +53,9 @@<x-box.info-panel :infoPanelObj="$model" img_path="{{ app('models_upload_url') }}"><x-slot:before_list>- @can('update', \App\Models\AssetModel::class)- <a href="{{ ($model->deleted_at=='') ? route('models.edit', $model->id) : '#' }}" class="btn btn-block btn-sm btn-warning btn-social hidden-print{{ ($model->deleted_at!='') ? ' disabled' : '' }}">- <x-icon type="edit" />- {{ trans('admin/models/table.edit') }}- </a>-- @endcan-- @can('create', \App\Models\AssetModel::class)- <a href="{{ route('models.clone.create', $model->id) }}" class="btn btn-block btn-sm btn-warning btn-social hidden-print">- <x-icon type="clone" />- {{ trans('admin/models/table.clone') }}- </a>- @endcan-- @can('delete', \App\Models\AssetModel::class)-- @if ($model->deleted_at!='')- <form method="POST" action="{{ route('models.restore.store', $model->id) }}" style="padding-top: 5px">- @csrf- <button style="width: 100%;" class="btn btn-block btn-sm btn-warning btn-social hidden-print">- <x-icon type="restore" />- {{ trans('button.restore') }}- </button>- </form>-- @elseif ($model->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.asset_model')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $model->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" onClick="return false;">- <x-icon type="delete" />- {{ trans('general.delete') }}- </button>- @endif- @endcan+ <x-button.wide-edit :item="$model" :route="route('models.edit', $model->id)" />+ <x-button.wide-clone :item="$model" :route="route('models.clone.create', $model->id)" />+ <x-button.wide-delete :item="$model" /></x-slot:before_list>diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.phpindex 956ed63b4c..290228b99f 100644--- a/resources/views/statuslabels/view.blade.php+++ b/resources/views/statuslabels/view.blade.php@@ -5,32 +5,53 @@@parent@stop+@section('header_right')+ <i class="fa-regular fa-2x fa-square-caret-right pull-right" id="expand-info-panel-button" data-tooltip="true" title="{{ trans('button.show_hide_info') }}"></i>+@endsection+{{-- Page content --}}@section('content')- <x-container>- <x-box>- @include('partials.asset-bulk-actions')-- <table- data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"- data-cookie-id-table="assetsListingTable"- data-id-table="assetsListingTable"- data-side-pagination="server"- data-sort-order="asc"- data-toolbar="#assetsBulkEditToolbar"- data-bulk-button-id="#bulkAssetEditButton"- data-bulk-form-id="#assetsBulkForm"- id="assetsListingTable"- data-show-columns-search="true"- data-buttons="assetButtons"- class="table table-striped snipe-table"- data-url="{{route('api.assets.index', ['status_id' => $statuslabel->id]) }}"- data-export-options='{- "fileName": "export-assets-{{ str_slug($statuslabel->name) }}-assets-{{ date('Y-m-d') }}",- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]- }'>- </table>- </x-box>+ <x-container columns="2">+ <x-page-column class="col-md-9 main-panel">+ <x-box>+ @include('partials.asset-bulk-actions')++ <table+ data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"+ data-cookie-id-table="assetsListingTable"+ data-id-table="assetsListingTable"+ data-side-pagination="server"+ data-sort-order="asc"+ data-toolbar="#assetsBulkEditToolbar"+ data-bulk-button-id="#bulkAssetEditButton"+ data-bulk-form-id="#assetsBulkForm"+ id="assetsListingTable"+ data-show-columns-search="true"+ data-buttons="assetButtons"+ class="table table-striped snipe-table"+ data-url="{{route('api.assets.index', ['status_id' => $statuslabel->id]) }}"+ data-export-options='{+ "fileName": "export-assets-{{ str_slug($statuslabel->name) }}-assets-{{ date('Y-m-d') }}",+ "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]+ }'>+ </table>+ </x-box>+ </x-page-column>+ <x-page-column class="col-md-3">+ <x-box>+ <x-box.info-panel :infoPanelObj="$statuslabel">++ <x-slot:before_list>++ <x-button.wide-edit :item="$statuslabel" :route="route('statuslabels.edit', $statuslabel->id)" />+ <x-button.wide-delete :item="$statuslabel" />++ </x-slot:before_list>+++ </x-box.info-panel>+ </x-box>+ </x-page-column></x-container>@stopdiff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.phpindex 7835fcfddb..a1080ebe89 100755--- a/resources/views/suppliers/view.blade.php+++ b/resources/views/suppliers/view.blade.php@@ -203,27 +203,8 @@<x-slot:before_list>- @can('update', \App\Models\Supplier::class)- <a href="{{ ($supplier->deleted_at=='') ? route('suppliers.edit', $supplier->id) : '#' }}" class="btn btn-block btn-sm btn-warning btn-social hidden-print{{ ($supplier->deleted_at!='') ? ' disabled' : '' }}">- <x-icon type="edit" />- {{ trans('general.update') }}- </a>- @endcan-- @can('delete', \App\Models\Supplier::class)-- @if ($supplier->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.supplier')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $supplier->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.supplier')]) }}" onClick="return false;">- <x-icon type="delete" />- {{ trans('general.delete') }}- </button>- @endif- @endcan+ <x-button.wide-edit :item="$supplier" :route="route('suppliers.edit', $supplier->id)" />+ <x-button.wide-delete :item="$supplier" /></x-slot:before_list>