diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index de2960fd6f..11770f9f57 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -72,7 +72,6 @@
-
-
-
-
+
+
-
-
-
+
+
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']) }}"> -
-
-
-
+ +
+
diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 4cb96d13ef..81012405b7 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -15,7 +15,6 @@
-
- -
diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index 4190a9126f..72f71bf808 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -49,47 +49,45 @@
-
- +
- - - - - - - - - - - + + + + + + + + + + + - @foreach(\App\Models\CustomField::get() as $field) - @if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) - - @endif - @endforeach - - - -
{{ trans('general.image') }}{{ trans('general.asset_tag') }}{{ trans('admin/hardware/table.asset_model') }}{{ trans('admin/models/table.modelnumber') }}{{ trans('admin/hardware/form.name') }}{{ trans('admin/hardware/table.serial') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/table.status') }}{{ trans('admin/hardware/form.expected_checkin') }}
{{ trans('general.image') }}{{ trans('general.asset_tag') }}{{ trans('admin/hardware/table.asset_model') }}{{ trans('admin/models/table.modelnumber') }}{{ trans('admin/hardware/form.name') }}{{ trans('admin/hardware/table.serial') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/table.status') }}{{ trans('admin/hardware/form.expected_checkin') }}{{ $field->name }}{{ trans('table.actions') }}
-
-
+ @foreach(\App\Models\CustomField::get() as $field) + @if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) + {{ $field->name }} + @endif + @endforeach + {{ trans('table.actions') }} + + +
+ @endif @if ($models->count() > 0) @@ -97,7 +95,6 @@
-
+
- diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php index be11551d4c..8673c9e32f 100644 --- a/resources/views/categories/view.blade.php +++ b/resources/views/categories/view.blade.php @@ -52,7 +52,7 @@
-
+ @if ($category->category_type=='asset') @include('partials.asset-bulk-actions') @endif @@ -121,7 +121,6 @@ data-url="{{ route('api.'.$category_type_route.'.index',['category_id'=> $category->id]) }}">
-
diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php index fe3347e81f..2f0f316e10 100644 --- a/resources/views/companies/view.blade.php +++ b/resources/views/companies/view.blade.php @@ -86,7 +86,6 @@
-
@include('partials.asset-bulk-actions')
-
-
-
-
-
-
-
-
-
+
-
- name) }}-users-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }'> -
-
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php index 401a91dec8..67ddfaada0 100644 --- a/resources/views/components/view.blade.php +++ b/resources/views/components/view.blade.php @@ -102,7 +102,7 @@
-
+
-
-
-
-
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 05bdb00898..c9c51ba967 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -459,8 +459,6 @@
-
- id }}-history", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' - data-url="{{ route('api.activity.index', ['item_id' => $consumable->id, 'item_type' => 'consumable']) }}" data-cookie-id-table="consumableHistory" data-cookie="true">
-
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index ac8c9345cc..d9058346e3 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -226,7 +226,6 @@
-
- - - -
{{ trans('general.viewall') }} @@ -309,7 +304,6 @@
-
-
{{ trans('general.viewall') }} @@ -378,7 +371,7 @@
-
+
-
{{ trans('general.viewall') }} @@ -441,7 +433,7 @@
-
+
-
+
{{ trans('general.viewall') }} diff --git a/resources/views/departments/view.blade.php b/resources/views/departments/view.blade.php index d4d64d2880..e5e881f227 100644 --- a/resources/views/departments/view.blade.php +++ b/resources/views/departments/view.blade.php @@ -21,26 +21,22 @@
-
+ -
- - -
-
+
diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php index 59df3010dd..bc4a8d000f 100644 --- a/resources/views/depreciations/view.blade.php +++ b/resources/views/depreciations/view.blade.php @@ -30,6 +30,7 @@ @@ -82,7 +80,6 @@ 'id_button' => 'overdueAssetEditButton'])
-
-
diff --git a/resources/views/hardware/checkin-due.blade.php b/resources/views/hardware/checkin-due.blade.php index 74ebdceb41..36f34ce34b 100644 --- a/resources/views/hardware/checkin-due.blade.php +++ b/resources/views/hardware/checkin-due.blade.php @@ -44,31 +44,28 @@ 'id_button' => 'dueAssetEditButton'])
-
+ data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" + data-show-columns-search="true" + data-cookie-id-table="dueAssetcheckinListing" + data-id-table="dueAssetcheckinListing" + data-side-pagination="server" + data-show-footer="true" + data-sort-order="asc" + data-sort-name="name" + data-toolbar="#dueAssetEditToolbar" + data-bulk-button-id="#dueAssetEditButton" + data-bulk-form-id="#dueAssetEditForm" + id="#dueAssetcheckinListing" + class="table table-striped snipe-table" + data-url="{{ route('api.assets.list-upcoming', ['action' => 'checkins', 'upcoming_status' => 'due']) }}" + data-export-options='{ + "fileName": "export-assets-due-checkin-{{ date('Y-m-d') }}", + "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] + }'>
-
@@ -81,30 +78,27 @@ 'id_button' => 'overdueAssetEditButton'])
-
-
- -
-
-
+
+ +
+
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index a96efc3db3..59ffc3ddda 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -20,9 +20,7 @@
-
- diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 7766b2abc1..adb97ab5c4 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1262,30 +1262,24 @@ @include('partials.asset-bulk-actions') -
-
- + data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" + data-show-columns-search="true" + data-cookie-id-table="assetsTable" + data-id-table="assetsTable" + data-side-pagination="server" + data-sort-order="asc" + data-toolbar="#assetsBulkEditToolbar" + data-bulk-button-id="#bulkAssetEditButton" + data-bulk-form-id="#assetsBulkForm" + id="assetsListingTable" + class="table table-striped snipe-table" + data-url="{{route('api.assets.index',['assigned_to' => $asset->id, 'assigned_type' => 'App\Models\Asset']) }}" + data-export-options='{ + "fileName": "export-assets-{{ str_slug($asset->name) }}-assets-{{ date('Y-m-d') }}", + "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] + }'>
-
- -
@@ -1293,9 +1287,6 @@
- -
-

{{ trans('general.accessories_assigned') }}

@@ -1315,7 +1306,6 @@ }'> -
diff --git a/resources/views/kits/edit.blade.php b/resources/views/kits/edit.blade.php index bfbad4d688..e5e251fd87 100644 --- a/resources/views/kits/edit.blade.php +++ b/resources/views/kits/edit.blade.php @@ -32,7 +32,7 @@
-
+
-
@@ -73,7 +72,7 @@ {{--
--}} {{--
--}} -{{--
--}} +{{-- --}} {{-- --}} {{-- --}} -{{--
--}} {{--
--}} {{--
--}} {{-- --}} @@ -111,7 +109,7 @@ {{-- --}} {{-- --}} {{--
--}} -{{--
--}} +{{-- --}} {{-- --}} {{-- --}} -{{--
--}} {{--
--}} {{-- --}} {{-- --}} @@ -149,7 +146,7 @@ {{-- --}} {{--
--}} -{{--
--}} +{{-- --}} {{-- --}} {{-- --}} -{{--
--}} {{--
--}} {{-- --}} {{-- --}} diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 4a34afb2c8..e63fd25c03 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -441,9 +441,6 @@
- -
-
- -
-
@@ -471,8 +465,6 @@
-
-
-
-
@@ -506,7 +496,7 @@
-
+
-
diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php index 537f6411b0..3054e311e3 100644 --- a/resources/views/manufacturers/view.blade.php +++ b/resources/views/manufacturers/view.blade.php @@ -101,7 +101,7 @@
@include('partials.asset-bulk-actions') -
+
-
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index ab1511e778..2d4df19a52 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -87,7 +87,7 @@ 'fullscreen', 'advancedSearch', ], - classes: 'table table-striped snipe-table table-no-bordered', + classes: 'table table-responsive table-striped snipe-table table-no-bordered', clickToSelect: data_with_default('click-to-select', true), cookie: true, cookieExpire: '2y', diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php index 3d10987f4b..1a378e0bbc 100644 --- a/resources/views/reports/asset.blade.php +++ b/resources/views/reports/asset.blade.php @@ -18,7 +18,6 @@
-
-
diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php index 7738c9e9f1..2080f380fb 100755 --- a/resources/views/reports/index.blade.php +++ b/resources/views/reports/index.blade.php @@ -18,7 +18,7 @@
-
+ @@ -85,7 +85,6 @@ @endforeach
-
@stop diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index dfee233e1b..ae52f6eee2 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -129,7 +129,7 @@

{{ trans('general.assets') }}

-
+ @include('partials.asset-bulk-actions')
- -

{{ trans('general.accessories') }}

-
-

{{ trans('general.licenses') }}

-
-

{{ trans('general.components') }}

-
+
-

{{ trans('general.consumables') }}

-
+
-

{{ trans('admin/maintenances/general.maintenances') }}

-
-
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index fe0734eb44..981ffe2697 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -835,8 +835,6 @@ @include('partials.asset-bulk-actions') -
-
-
- -
-
-
-
-
-
@@ -1046,9 +1036,6 @@
-
- -
- -
@@ -1096,7 +1081,6 @@ @include('partials.users-bulk-actions') -