A free open source IT asset/license management system
Update views with new button blades
snipe2ebb3ecb9616
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.phpindex 1ee7dcb10f..56d13b1a9b 100644--- a/app/Helpers/IconHelper.php+++ b/app/Helpers/IconHelper.php@@ -12,6 +12,7 @@ class IconHelpercase 'checkin':return 'fa-solid fa-rotate-right';case 'edit':+ case 'update':return 'fas fa-pencil-alt';case 'clone':return 'far fa-clone';diff --git a/app/Presenters/UploadedFilesPresenter.php b/app/Presenters/UploadedFilesPresenter.phpindex 9a2d548cbc..97fa9d4dec 100644--- a/app/Presenters/UploadedFilesPresenter.php+++ b/app/Presenters/UploadedFilesPresenter.php@@ -59,6 +59,8 @@ class UploadedFilesPresenter extends Presenter'title' => trans('general.download'),'visible' => true,'formatter' => 'fileDownloadButtonsFormatter',+ 'printIgnore' => true,+ 'class' => 'hidden-print',],['field' => 'note',@@ -93,6 +95,7 @@ class UploadedFilesPresenter extends Presenter'visible' => true,'formatter' => 'deleteUploadFormatter','printIgnore' => true,+ 'class' => 'hidden-print',],];diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.phpindex d76b63bb7b..462efbac83 100644--- a/resources/views/accessories/view.blade.php+++ b/resources/views/accessories/view.blade.php@@ -90,14 +90,12 @@<x-page-column class="col-md-3"><x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$accessory" img_path="{{ app('accessories_upload_url') }}">-- <x-slot:before_list>- <x-button.wide-checkout :item="$accessory" :route="route('accessories.checkout.show', $accessory->id)" />- <x-button.wide-edit :item="$accessory" :route="route('accessories.edit', $accessory->id)" />- <x-button.wide-clone :item="$accessory" :route="route('clone/accessories', $accessory->id)" />- <x-button.wide-delete :item="$accessory" />-- </x-slot:before_list>+ <x-slot:buttons>+ <x-button.checkout permission="checkout" :item="$accessory" :route="route('accessories.checkout.show', $accessory->id)" />+ <x-button.edit :item="$accessory" :route="route('accessories.edit', $accessory->id)" />+ <x-button.clone :item="$accessory" :route="route('clone/accessories', $accessory->id)" />+ <x-button.delete :item="$accessory" />+ </x-slot:buttons></x-box.info-panel></x-box>diff --git a/resources/views/blade/box/info-panel.blade.php b/resources/views/blade/box/info-panel.blade.phpindex df88669702..85512ebf8a 100644--- a/resources/views/blade/box/info-panel.blade.php+++ b/resources/views/blade/box/info-panel.blade.php@@ -6,13 +6,16 @@<!-- start side info-box --><div class="box-header with-border" style="padding-top: 0;">- <h3 class="box-title side-box-header" style="line-height: 20px">- {{ $infoPanelObj->display_name }}- </h3>-</div>-<div class="box-body box-profile side-box expanded">+ @if (isset($buttons))+ <div class="row" style="padding-left: 10px">+ {{ $buttons }}+ </div>+ @endif++</div>+<div class="box-body box-profile">@if (($infoPanelObj->image) && ($img_path))<a href="{{ Storage::disk('public')->url($img_path.e($infoPanelObj->image)) }}" data-toggle="lightbox" data-type="image">@@ -356,12 +359,12 @@@if ((($infoPanelObj->address!='') && ($infoPanelObj->city!='')) || ($infoPanelObj->state!='') || ($infoPanelObj->country!=''))<x-info-element><a class="btn btn-sm btn-theme" href="https://maps.google.com/?q={{ urlencode($infoPanelObj->address.','. $infoPanelObj->city.','.$infoPanelObj->state.','.$infoPanelObj->country.','.$infoPanelObj->zip) }}" target="_blank">- {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google" aria-hidden="true"></i>']) !!}+ {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google hidden-print" aria-hidden="true"></i>']) !!}<x-icon type="external-link"/></a><a class="btn btn-sm btn-theme" href="https://maps.apple.com/?q={{ urlencode($infoPanelObj->address.','. $infoPanelObj->city.','.$infoPanelObj->state.','.$infoPanelObj->country.','.$infoPanelObj->zip) }}" target="_blank">- {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple" aria-hidden="true"></i>']) !!}+ {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple hidden-print" aria-hidden="true"></i>']) !!}<x-icon type="external-link"/></a></x-info-element>diff --git a/resources/views/blade/button/checkout.blade.php b/resources/views/blade/button/checkout.blade.phpnew file mode 100644index 0000000000..a1c69470de--- /dev/null+++ b/resources/views/blade/button/checkout.blade.php@@ -0,0 +1,19 @@+@props([+ 'item' => null,+ 'permission' => null,+ 'route',+ 'wide' => false,+])++@can('checkout', $item)+ @if ((method_exists($item, 'numRemaining')) && ($item->numRemaining() > 0))+ <a href="{{ $route }}" class="btn btn-sm bg-maroon hidden-print" data-tooltip="true" data-placement="top" data-title="{{ trans('general.checkout') }}">+ <x-icon type="checkout" class="fa-fw" />++ @if ($wide=='true')+ {{ trans('general.checkout') }}+ @endif+ </a>+ @endif++@endcandiff --git a/resources/views/blade/button/clone.blade.php b/resources/views/blade/button/clone.blade.phpnew file mode 100644index 0000000000..1e59ab964f--- /dev/null+++ b/resources/views/blade/button/clone.blade.php@@ -0,0 +1,16 @@+@props([+ 'item' => null,+ 'route' => null,+ 'wide' => false,+])++@can('create', $item)+ <!-- start clone button component -->+ <a href="{{ $route }}" class="btn btn-sm btn-info hidden-print{{ ($wide=='true') ?? ' btn-block btn-social' }}">+ <x-icon type="clone" class="fa-fw" />+ @if ($wide=='true')+ {{ trans('general.clone') }}+ @endif+ <!-- end clone button component -->+</a>+@endcan\ No newline at end of filediff --git a/resources/views/blade/button/delete.blade.php b/resources/views/blade/button/delete.blade.phpnew file mode 100644index 0000000000..7d37e38f6a--- /dev/null+++ b/resources/views/blade/button/delete.blade.php@@ -0,0 +1,24 @@+@props([+ 'item' => null,+ 'route' => null,+ 'count' => null,+ 'type' => 'item',+ 'wide' => false,+])++@can('delete', $item)+ <!-- start delete button component -->+ @if ((method_exists($item, 'isDeletable')) && ($item->deleted_at==''))+ @if (!$item->isDeletable())+ <button class="btn btn-sm btn-danger hidden-print disabled {{ ($wide=='true') ?? ' btn-block btn-social' }}" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">+ <x-icon type="delete" class="fa-fw" />+ </button>+ @else+ <button class="btn btn-sm btn-danger delete-asset{{ ($wide=='true') ?? ' btn-block btn-social' }}" 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" class="fa-fw" />+ </button>+ @endif+ @endif+ <!-- end delete button component -->+@endif+diff --git a/resources/views/blade/button/edit.blade.php b/resources/views/blade/button/edit.blade.phpnew file mode 100644index 0000000000..7bebfb588e--- /dev/null+++ b/resources/views/blade/button/edit.blade.php@@ -0,0 +1,21 @@+@props([+ 'item' => null,+ 'route' => null,+ 'wide' => false,+])++@can('update', $item)+<!-- start update button component -->+@if ($item->deleted_at=='')+<a href="{{ ($item->deleted_at == '') ? $route: '#' }}" class="btn btn-sm btn-warning hidden-print {{ ($wide=='true') ?? ' btn-block btn-social' }}{{ ($item->deleted_at!='') ? ' disabled' : '' }}">+ <x-icon type="edit" class="fa-fw" />++ @if ($wide=='true')+ {{ trans('general.update') }}+ @endif+++</a>+@endif+<!-- end update button component -->+@endcan\ No newline at end of filediff --git a/resources/views/blade/button/index.blade.php b/resources/views/blade/button/index.blade.phpindex e69de29bb2..66baeeed2e 100644--- a/resources/views/blade/button/index.blade.php+++ b/resources/views/blade/button/index.blade.php@@ -0,0 +1,11 @@+@props([+ 'item' => null,+ 'permission' => null,+ 'route',+])++@can($permission, $item)+ <a href="{{ $route }}" {{ $attributes->merge(['class' => 'btn btn-sm hidden-print']) }} data-tooltip="true" data-placement="top" data-title="{{ trans('general.'.$permission) }}">+ <x-icon type="{{ $permission }}" />+ </a>+@endcandiff --git a/resources/views/blade/button/wide-restore.blade.php b/resources/views/blade/button/restore.blade.phpsimilarity index 100%rename from resources/views/blade/button/wide-restore.blade.phprename to resources/views/blade/button/restore.blade.phpdiff --git a/resources/views/blade/button/wide-clone.blade.php b/resources/views/blade/button/wide-clone.blade.phpdeleted file mode 100644index 694bde91d5..0000000000--- a/resources/views/blade/button/wide-clone.blade.php+++ /dev/null@@ -1,13 +0,0 @@-@props([- 'item' => null,- 'route' => null,-])--@can('create', $item)- <!-- start clone button component -->- <a href="{{ $route }}" class="btn btn-block btn-sm btn-info btn-social hidden-print">- <x-icon type="clone" />- {{ trans('general.clone') }}- <!-- end clone button component -->-</a>-@endcan\ No newline at end of filediff --git a/resources/views/blade/button/wide-delete.blade.php b/resources/views/blade/button/wide-delete.blade.phpdeleted file mode 100644index 656ceba82f..0000000000--- a/resources/views/blade/button/wide-delete.blade.php+++ /dev/null@@ -1,25 +0,0 @@-@props([- 'item' => null,- 'route' => null,- 'count' => null,- 'type' => 'item',-])--@can('delete', $item)- <!-- start delete button component -->- @if ((method_exists($item, 'isDeletable')) && ($item->deleted_at==''))- @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- <!-- end delete button component -->-@endif-diff --git a/resources/views/blade/button/wide-edit.blade.php b/resources/views/blade/button/wide-edit.blade.phpdeleted file mode 100644index 76634f8c69..0000000000--- a/resources/views/blade/button/wide-edit.blade.php+++ /dev/null@@ -1,15 +0,0 @@-@props([- 'item' => null,- 'route' => null,-])--@can('update', $item)-<!-- start update button component -->-@if ($item->deleted_at=='')-<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>-@endif-<!-- end update button component -->-@endcan\ No newline at end of filediff --git a/resources/views/blade/table/accessories.blade.php b/resources/views/blade/table/accessories.blade.phpindex 615a496630..e18c2654c2 100644--- a/resources/views/blade/table/accessories.blade.php+++ b/resources/views/blade/table/accessories.blade.php@@ -10,7 +10,8 @@<x-slot:content><x-tableshow_column_search="true"- fixed_right_number="3"+ fixed_right_number="2"+ fixed_number="1"show_advanced_search="true"buttons="accessoryButtons"api_url="{{ $route }}"diff --git a/resources/views/blade/table/bulk-actions.blade.php b/resources/views/blade/table/bulk-actions.blade.phpindex 5b7a82d5fd..b9ec020c08 100644--- a/resources/views/blade/table/bulk-actions.blade.php+++ b/resources/views/blade/table/bulk-actions.blade.php@@ -4,7 +4,7 @@])@aware(['name'])-<div id="{{ Illuminate\Support\Str::camel($name) }}Form" style="min-width:400px">+<div id="{{ Illuminate\Support\Str::camel($name) }}Form" style="min-width:400px" class="hidden-print"><formmethod="POST"action="{{ $action_route }}"diff --git a/resources/views/blade/table/bulk-assets.blade.php b/resources/views/blade/table/bulk-assets.blade.phpindex b89ec4ad04..ce83614e8c 100644--- a/resources/views/blade/table/bulk-assets.blade.php+++ b/resources/views/blade/table/bulk-assets.blade.php@@ -9,15 +9,15 @@>@csrf- <div style="width:100% !important;">+ <div style="width:100% !important;" class="hidden-print">{{-- The sort and order will only be used if the cookie is actually empty (like on first-use) --}}<input name="sort" type="hidden" value="assets.id"><input name="order" type="hidden" value="asc">- <label for="bulk_actions">+ <label><span class="sr-only">{{ trans('button.bulk_actions') }}</span>- </label>+<select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 350px !important;">@if ((isset($status)) && ($status == 'Deleted'))@can('delete', \App\Models\Asset::class)@@ -45,5 +45,6 @@</select><button class="btn btn-theme" id="{{ Illuminate\Support\Str::camel($name) }}Button" disabled>{{ trans('button.go') }}</button>+ </label></div></form>diff --git a/resources/views/blade/table/bulk-models.blade.php b/resources/views/blade/table/bulk-models.blade.phpindex 4b4e52fe39..bbdcb782f0 100644--- a/resources/views/blade/table/bulk-models.blade.php+++ b/resources/views/blade/table/bulk-models.blade.php@@ -11,7 +11,7 @@@csrf@if (request('status')!='deleted')@can('view', \App\Models\AssetModel::class)- <div style="width:100% !important;">+ <div style="width:100% !important;" class="hidden-print"><label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label><select name="bulk_actions" class="form-control select2" style="width: 200px;" aria-label="bulk_actions">@can('delete', \App\Models\AssetModel::class)diff --git a/resources/views/blade/table/bulk-users.blade.php b/resources/views/blade/table/bulk-users.blade.phpindex 6d7f668b0b..8001248520 100644--- a/resources/views/blade/table/bulk-users.blade.php+++ b/resources/views/blade/table/bulk-users.blade.php@@ -9,7 +9,7 @@>@csrf- <div style="width:100% !important;">+ <div style="width:100% !important;" class="hidden-print">{{-- The sort and order will only be used if the cookie is actually empty (like on first-use) --}}<input name="sort" type="hidden" value="users.id"><input name="order" type="hidden" value="asc">diff --git a/resources/views/blade/table/licenses.blade.php b/resources/views/blade/table/licenses.blade.phpindex fc37165360..8a7e212d8b 100644--- a/resources/views/blade/table/licenses.blade.php+++ b/resources/views/blade/table/licenses.blade.php@@ -14,6 +14,8 @@show_column_search="true"show_advanced_search="true"buttons="licenseButtons"+ fixed_right_number="2"+ fixed_number="1"api_url="{{ $route }}":presenter="\App\Presenters\LicensePresenter::dataTableLayout()"export_filename="export-{{ str_slug($name) }}-licenses-{{ date('Y-m-d') }}"diff --git a/resources/views/blade/table/locations.blade.php b/resources/views/blade/table/locations.blade.phpnew file mode 100644index 0000000000..78f1dba4a9--- /dev/null+++ b/resources/views/blade/table/locations.blade.php@@ -0,0 +1,28 @@+@props([+ 'route' => null,+ 'name' => 'default',+])++<!-- start locations tab pane -->+@can('view', \App\Models\Location::class)++ <x-slot:header>+ {{ trans('general.locations') }}+ </x-slot:header>++ @include('partials.locations-bulk-actions')++ <x-slot:content>+ <x-table+ show_column_search="true"+ show_advanced_search="true"+ fixed_right_number="2"+ buttons="locationButtons"+ api_url="{{ $route }}"+ :presenter="\App\Presenters\LocationPresenter::dataTableLayout()"+ export_filename="export-{{ str_slug($name) }}-locations-{{ date('Y-m-d') }}"+ />+ </x-slot:content>++@endcan+<!-- end assets tab pane -->\ No newline at end of filediff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.phpindex 83b7377b50..fce683c97c 100644--- a/resources/views/categories/view.blade.php+++ b/resources/views/categories/view.blade.php@@ -225,12 +225,11 @@<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$category" img_path="{{ app('categories_upload_url') }}">- <x-slot:before_list>+ <x-slot:buttons>+ <x-button.edit :item="$category" :route="route('categories.edit', $category->id)" />+ <x-button.delete :item="$category" />+ </x-slot:buttons>- <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></x-box></x-page-column>diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.phpindex d5754236de..67736af590 100644--- a/resources/views/companies/view.blade.php+++ b/resources/views/companies/view.blade.php@@ -232,8 +232,8 @@<x-slot:before_list>- <x-button.wide-edit :item="$company" :route="route('companies.edit', $company->id)" />- <x-button.wide-delete :item="$company" />+ <x-button.edit :item="$company" :route="route('companies.edit', $company->id)" />+ <x-button.delete :item="$company" /></x-slot:before_list>diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.phpindex 86b0b3bc9c..c12978fc6d 100644--- a/resources/views/components/view.blade.php+++ b/resources/views/components/view.blade.php@@ -79,14 +79,12 @@<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$snipe_component" img_path="{{ app('components_upload_url') }}">- <x-slot:before_list>-- <x-button.wide-checkout :item="$snipe_component" :route="route('components.checkout.show', $snipe_component->id)" />- <x-button.wide-edit :item="$snipe_component" :route="route('components.edit', $snipe_component->id)" />- <x-button.wide-clone :item="$snipe_component" :route="route('components.clone.create', $snipe_component->id)" />- <x-button.wide-delete :item="$snipe_component" />-- </x-slot:before_list>+ <x-slot:buttons>+ <x-button.checkout :item="$snipe_component" :route="route('components.checkout.show', $snipe_component->id)" />+ <x-button.edit :item="$snipe_component" :route="route('components.edit', $snipe_component->id)" />+ <x-button.clone :item="$snipe_component" :route="route('components.clone.create', $snipe_component->id)" />+ <x-button.delete :item="$snipe_component" />+ </x-slot:buttons></x-box.info-panel></x-box>diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.phpindex 71a2e096a0..497423a129 100644--- a/resources/views/consumables/view.blade.php+++ b/resources/views/consumables/view.blade.php@@ -83,14 +83,12 @@<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$consumable" img_path="{{ app('consumables_upload_url') }}">- <x-slot:before_list>-- <x-button.wide-checkout :item="$consumable" :route="route('consumables.checkout.show', $consumable->id)" />- <x-button.wide-edit :item="$consumable" :route="route('consumables.edit', $consumable->id)" />- <x-button.wide-clone :item="$consumable" :route="route('consumables.clone.create', $consumable->id)" />- <x-button.wide-delete :item="$consumable" />-- </x-slot:before_list>+ <x-slot:buttons>+ <x-button.checkout :item="$consumable" :route="route('consumables.checkout.show', $consumable->id)" />+ <x-button.edit :item="$consumable" :route="route('consumables.edit', $consumable->id)" />+ <x-button.clone :item="$consumable" :route="route('consumables.clone.create', $consumable->id)" />+ <x-button.delete :item="$consumable" />+ </x-slot:buttons></x-box.info-panel></x-box>diff --git a/resources/views/departments/view.blade.php b/resources/views/departments/view.blade.phpindex 48fcb4460a..e06553551c 100644--- a/resources/views/departments/view.blade.php+++ b/resources/views/departments/view.blade.php@@ -40,12 +40,10 @@<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$department" img_path="{{ app('users_upload_url') }}">- <x-slot:before_list>-- <x-button.wide-edit :item="$department" :route="route('departments.edit', $department->id)" />- <x-button.wide-delete :item="$department" />-- </x-slot:before_list>+ <x-slot:buttons>+ <x-button.edit :item="$department" :route="route('departments.edit', $department->id)" />+ <x-button.delete :item="$department" />+ </x-slot:buttons></x-box.info-panel></x-box>diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.phpindex 95adac8cd1..49e0d53607 100644--- a/resources/views/depreciations/view.blade.php+++ b/resources/views/depreciations/view.blade.php@@ -130,12 +130,11 @@<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$depreciation">- <x-slot:before_list>+ <x-slot:buttons>+ <x-button.edit :item="$depreciation" :route="route('depreciations.edit', $depreciation->id)" />+ <x-button.delete :item="$depreciation" />+ </x-slot:buttons>- <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></x-box>diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.phpindex 1974986e84..37697e129b 100644--- a/resources/views/layouts/default.blade.php+++ b/resources/views/layouts/default.blade.php@@ -41,6 +41,7 @@<style>+:root {color-scheme: light dark;--btn-theme-hover-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};@@ -949,6 +950,51 @@.bootstrap-table .fixed-table-container .table tbody tr.selected td {background-color: light-dark(hsl(from var(--main-theme-color) h s calc(l + 40)),hsl(from var(--main-theme-color) h s calc(l - 40))) !important;}++ @media print {++ body,+ div.content-wrapper,+ section.content,+ .webui,+ .main-panel,+ .nav-tabs-custom,+ .box,+ .box-body,+ .list-group,+ .list-group-unbordered,+ .list-group-item,+ .row,+ .tab-content+ {+ background: white !important;+ color: black !important;+ }+ .fixed-table-toolbar,+ .fixed-table-pagination,+ #assetsToolBar,+ .fixed-table-pagination+ {+ display: none !important;+ }+ .tab-pane.hidden-print {+ display: none !important;+ visibility: hidden !important;+ }++ h2, h3, h4 {+ color: black !important;+ }++ .col-sm-9,+ .main-panel+ {+ float: left;+ width: 100% !important;+ }++ }+</style>{{-- Custom CSS --}}@@ -2154,27 +2200,54 @@}}- $(function () {- // Handle the info-panel- $("#expand-info-panel-button").click(function () {- $('.side-box').parent('div').parent('div').parent('div').hide();- $(window).on('load', function() {- $('.side-box').parent('div').parent('div').parent('div').show();- });+ function checkInfoSidePanel() {+ var side_panel_state = localStorage.getItem("side_panel_state");- if($('.side-box').hasClass('expanded')) {- $('.main-panel').removeClass('col-md-9').addClass('col-md-12');- $('.side-box').removeClass('expanded');- $("#expand-info-panel-button").addClass('fa-square-caret-left').removeClass('fa-square-caret-right');- } else {- $('.side-box').parent('div').parent('div').parent('div').fadeToggle("fast")- $('.side-box').addClass('expanded');- $('.main-panel').removeClass('col-md-12').addClass('col-md-9');- $("#expand-info-panel-button").addClass('fa-square-caret-right').removeClass('fa-square-caret-left');- }+ // Open side info panel+ if (side_panel_state == 'collapsed') {+ collapseInfoSidePanel();++ // Collapse side info panel+ } else {+ expandInfoSidePanel();+ }++ }++ function toggleInfoSidePanel() {+ var side_panel_state = localStorage.getItem("side_panel_state");++ if (side_panel_state == 'expanded') {+ localStorage.setItem("side_panel_state", 'collapsed');+ } else {+ localStorage.setItem("side_panel_state", 'expanded');+ }++ checkInfoSidePanel();+ }++ function collapseInfoSidePanel() {+ $('.side-box').removeClass('expanded').hide();+ $('.main-panel').removeClass('col-md-9').addClass('col-md-12');+ $("#expand-info-panel-button").addClass('fa-square-caret-left').removeClass('fa-square-caret-right');+ }++ function expandInfoSidePanel() {+ $('.side-box').fadeIn("fast").addClass('expanded');+ $('.main-panel').removeClass('col-md-12').addClass('col-md-9');+ $("#expand-info-panel-button").addClass('fa-square-caret-right').removeClass('fa-square-caret-left');+ }+++ $(document).ready(function () {+ checkInfoSidePanel();++ // Handle the info-panel+ $("#expand-info-panel-button").click(function () {+ toggleInfoSidePanel();});diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.phpindex b1c8928632..cbcc2ef477 100755--- a/resources/views/locations/index.blade.php+++ b/resources/views/locations/index.blade.php@@ -11,7 +11,7 @@<x-container><x-box>@include('partials.locations-bulk-actions')-+<tabledata-columns="{{ \App\Presenters\LocationPresenter::dataTableLayout() }}"data-cookie-id-table="locationTable"diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.phpindex b5bb15ca0c..109bc33922 100644--- a/resources/views/locations/view.blade.php+++ b/resources/views/locations/view.blade.php@@ -387,29 +387,12 @@<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$location" img_path="{{ app('locations_upload_url') }}">- <x-slot:before_list>-- <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>- @endif-- <x-button.wide-delete :item="$location" />--- </x-slot:before_list>-+ <x-slot:buttons>+ <x-button.edit :item="$location" :route="route('locations.edit', $location->id)" />+ <x-button.clone :item="$location" :route="route('clone/location', $location->id)" />+ <x-button.delete :item="$location" />+ <x-button.restore :item="$location" :route="route('locations.restore', ['location' => $location->id])" />+ </x-slot:buttons>@if ($location->ldap_ou)<x-info-element icon_type="ldap">diff --git a/resources/views/maintenances/view.blade.php b/resources/views/maintenances/view.blade.phpindex 0f277fea93..94e8960051 100644--- a/resources/views/maintenances/view.blade.php+++ b/resources/views/maintenances/view.blade.php@@ -193,12 +193,10 @@ use Carbon\Carbon;<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$maintenance" img_path="{{ app('maintenances_upload_url') }}">- <x-slot:before_list>-- <x-button.wide-edit :item="$maintenance" :route="route('maintenances.edit', $maintenance->id)" />- <x-button.wide-delete :item="$maintenance" />-- </x-slot:before_list>+ <x-slot:buttons>+ <x-button.edit :item="$maintenance" :route="route('maintenances.edit', $maintenance->id)" />+ <x-button.delete :item="$maintenance" />+ </x-slot:buttons></x-box.info-panel></x-box>diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.phpindex 0d5af87128..8ec54b5489 100644--- a/resources/views/manufacturers/view.blade.php+++ b/resources/views/manufacturers/view.blade.php@@ -54,12 +54,10 @@<x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$manufacturer" img_path="{{ app('manufacturers_upload_url') }}">- <x-slot:before_list>-- <x-button.wide-edit :item="$manufacturer" :route="route('manufacturers.edit', $manufacturer->id)" />- <x-button.wide-delete :item="$manufacturer" />-- </x-slot:before_list>+ <x-slot:buttons>+ <x-button.edit :item="$manufacturer" :route="route('manufacturers.edit', $manufacturer->id)" />+ <x-button.delete :item="$manufacturer" />+ </x-slot:buttons></x-box.info-panel></x-box>diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.phpindex cacea4400a..b73d21c2db 100755--- a/resources/views/models/view.blade.php+++ b/resources/views/models/view.blade.php@@ -51,13 +51,11 @@<x-page-column class="col-md-3"><x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$model" img_path="{{ app('models_upload_url') }}">- <x-slot:before_list>-- <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>+ <x-slot:buttons>+ <x-button.edit :item="$model" :route="route('models.edit', $model->id)" />+ <x-button.clone :item="$model" :route="route('models.clone.create', $model->id)" />+ <x-button.delete :item="$model" />+ </x-slot:buttons></x-box.info-panel></x-box>diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.phpindex be2677b87b..121080286a 100644--- a/resources/views/partials/bootstrap-table.blade.php+++ b/resources/views/partials/bootstrap-table.blade.php@@ -1043,7 +1043,7 @@function hardwareAuditFormatter(value, row) {- return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a> ';+ return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="actions btn btn-sm btn-primary hidden-print" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a> ';}@@ -1072,15 +1072,15 @@}if ((row.available_actions) && (row.available_actions.clone === true)) {- actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="actions btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><x-icon type="clone" class="fa-fw" /><span class="sr-only">{{ trans('general.clone_item') }}</span></a> ';+ actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="actions btn btn-sm btn-info hidden-print" data-tooltip="true" title="{{ trans('general.clone_item') }}"><x-icon type="clone" class="fa-fw" /><span class="sr-only">{{ trans('general.clone_item') }}</span></a> ';}if ((row.available_actions) && (row.available_actions.audit === true)) {- actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" class="fa-fw" /><span class="sr-only">{{ trans('general.audit') }}</span></a> ';+ actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/audit" class="actions btn btn-sm btn-primary hidden-print" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" class="fa-fw" /><span class="sr-only">{{ trans('general.audit') }}</span></a> ';}if ((row.available_actions) && (row.available_actions.update === true)) {- actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="actions btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.update') }}"><x-icon type="edit" class="fa-fw" /><span class="sr-only">{{ trans('general.update') }}</span></a> ';+ actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="actions btn btn-sm btn-warning hidden-print" data-tooltip="true" title="{{ trans('general.update') }}"><x-icon type="edit" class="fa-fw" /><span class="sr-only">{{ trans('general.update') }}</span></a> ';} else {if ((row.available_actions) && (row.available_actions.update != true)) {actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_edited') }}"><a class="btn btn-warning btn-sm disabled" onClick="return false;"><x-icon type="edit" class="fa-fw" /></a></span> ';@@ -1100,7 +1100,7 @@actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '" '- + ' class="actions btn btn-danger btn-sm delete-asset" data-tooltip="true" '+ + ' class="actions btn btn-danger btn-sm delete-asset hidden-print" data-tooltip="true" '+ ' data-toggle="modal" data-icon="fa-trash"'+ ' data-content="{{ trans('general.sure_to_delete') }}: ' + name_for_box + '?" '+ ' data-title="{{ trans('general.delete') }}" onClick="return false;">'@@ -1108,7 +1108,7 @@} else {// Do not show the delete button on things that are already deletedif ((row.available_actions) && (row.available_actions.restore != true)) {- actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><x-icon type="delete" class="fa-fw" /><span class="sr-only">{{ trans('general.cannot_be_deleted') }}</span></a></span> ';+ actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled hidden-print" onClick="return false;"><x-icon type="delete" class="fa-fw" /><span class="sr-only">{{ trans('general.cannot_be_deleted') }}</span></a></span> ';}}diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.phpindex c2370bf075..0145e86d74 100644--- a/resources/views/statuslabels/view.blade.php+++ b/resources/views/statuslabels/view.blade.php@@ -41,12 +41,10 @@<x-box class="side-box expanded"><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-slot:buttons>+ <x-button.edit :item="$statuslabel" :route="route('statuslabels.edit', $statuslabel->id)" />+ <x-button.delete :item="$statuslabel" />+ </x-slot:buttons></x-box.info-panel>diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.phpindex 977ae089ec..e25ed51cc9 100755--- a/resources/views/suppliers/view.blade.php+++ b/resources/views/suppliers/view.blade.php@@ -55,23 +55,7 @@<!-- start assets tab pane -->@can('view', \App\Models\Asset::class)<x-tabs.pane name="assets" count="{{ $supplier->assets()->AssetsForShow()->count() }}">- <x-slot:header>- {{ trans('general.assets') }}- </x-slot:header>-- <x-slot:bulkactions>- <x-table.bulk-assets />- </x-slot:bulkactions>-- <x-table- show_column_search="true"- show_advanced_search="true"- buttons="assetButtons"- api_url="{{ route('api.assets.index', ['supplier_id' => $supplier->id, 'itemtype' => 'assets']) }}"- :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"- export_filename="export-{{ str_slug($supplier->name) }}-assets-{{ date('Y-m-d') }}"- />-+ <x-table.assets name="assets" :route="route('api.assets.index', ['supplier_id' => $supplier->id, 'itemtype' => 'assets'])" /></x-tabs.pane>@endcan<!-- end assets tab pane -->@@ -79,20 +63,7 @@<!-- start licenses tab pane -->@can('view', \App\Models\License::class)<x-tabs.pane name="licenses" class="{{ $supplier->licenses->count() == 0 ? 'hidden-print' : '' }}">- <x-slot:header>- {{ trans('general.licenses') }}- </x-slot:header>--- <x-table- show_advanced_search="true"- buttons="licenseButtons"- api_url="{{ route('api.licenses.index', ['supplier_id' => $supplier->id]) }}"- :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"- export_filename="export-{{ str_slug($supplier->name) }}-licenses-{{ date('Y-m-d') }}"- />--+ <x-table.licenses name="licenses" :route="route('api.licenses.index', ['supplier_id' => $supplier->id])" /></x-tabs.pane>@endcan<!-- end licenses tab pane -->@@ -100,19 +71,7 @@<!-- start accessories tab pane -->@can('view', \App\Models\Accessory::class)<x-tabs.pane name="accessories" class="{{ $supplier->accessories->count() == 0 ? 'hidden-print' : '' }}">- <x-slot:header>- {{ trans('general.accessories') }}- </x-slot:header>-- <x-table- show_column_search="true"- buttons="accessoryButtons"- api_url="{{ route('api.accessories.index', ['supplier_id' => $supplier->id]) }}"- :presenter="\App\Presenters\AccessoryPresenter::dataTableLayout()"- export_filename="export-{{ str_slug($supplier->name) }}-accessories-{{ date('Y-m-d') }}"- />--+ <x-table.accessories name="accessories" :route="route('api.accessories.index', ['supplier_id' => $supplier->id])" /></x-tabs.pane>@endcan<!-- end accessories tab pane -->@@ -178,7 +137,7 @@<!-- end consumables tab pane --><!-- start files tab pane -->- <x-tabs.pane name="files">+ <x-tabs.pane name="files" class="{{ $supplier->uploads->count() == 0 ? 'hidden-print' : '' }}"><x-slot:header>{{ trans('general.files') }}</x-slot:header>@@ -192,16 +151,14 @@</x-tabs></x-page-column>- <x-page-column class="col-md-3">+ <x-page-column class="col-md-3 hidden-print">- <x-box>+ <x-box class="side-box expanded"><x-box.info-panel :infoPanelObj="$supplier" img_path="{{ app('suppliers_upload_url') }}"><x-slot:buttons>- <x-button :item="$supplier" permission="edit" :route="route('suppliers.edit', $supplier->id)" class="btn-warning" />- <x-button :item="$supplier" permission="delete" :route="route('suppliers.edit', $supplier->id)" class="btn-danger" data-tooltip="true" data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}" />- <x-button :item="$supplier" permission="print" :route="route('suppliers.edit', $supplier->id)" class="btn-info" />-+ <x-button :item="$supplier" permission="update" :route="route('suppliers.edit', $supplier->id)" class="btn-warning" />+ <x-button.delete :item="$supplier" /></x-slot:buttons>