diff --git a/src/resources/assets/css/common.css b/src/resources/assets/css/common.css
index 7c6b25d53d..4e39c6ee1b 100644
--- a/src/resources/assets/css/common.css
+++ b/src/resources/assets/css/common.css
@@ -65,7 +65,7 @@ form .select2.select2-container {
position: relative;
}
-#crudTable_processing.dataTables_processing.card {
+#crudTable_processing.dt-processing.card {
all: unset;
position: absolute;
background: rgba(255, 255, 255, 0.9);
@@ -77,7 +77,11 @@ form .select2.select2-container {
border-radius: 5px;
}
-#crudTable_processing.dataTables_processing.card > img {
+table.fixedHeader-floating, table.fixedHeader-locked {
+ background-color: white;
+}
+
+#crudTable_processing.dt-processing.card > img {
margin: 0;
position: absolute;
top: 50%;
@@ -85,7 +89,7 @@ form .select2.select2-container {
transform: translate(-50%, -50%);
}
-#crudTable_processing.dataTables_processing.card > div {
+#crudTable_processing.dt-processing.card > div {
display: none !important;
}
@@ -175,6 +179,19 @@ form .select2.select2-container {
border: 0;
}
+#crudTable_wrapper > div.table-footer > div:nth-child(1) > div.dt-length {
+ display: flex;
+ gap: .50rem;
+}
+
+#crudTable_wrapper > div.table-footer > div:nth-child(1) > div.dt-length select {
+ width: 4rem;
+}
+
+#crudTable_wrapper > div.table-footer > div:nth-child(1) > div.dt-length > label{
+ white-space: nowrap;
+}
+
/*/Table - List View/*/
.navbar-filters {
min-height: 25px;
diff --git a/src/resources/views/crud/inc/datatables_logic.blade.php b/src/resources/views/crud/inc/datatables_logic.blade.php
index 7e4ce13504..cd49bce7b6 100644
--- a/src/resources/views/crud/inc/datatables_logic.blade.php
+++ b/src/resources/views/crud/inc/datatables_logic.blade.php
@@ -6,15 +6,20 @@
@endphp
{{-- DATA TABLES SCRIPT --}}
- @basset('https://cdn.datatables.net/1.13.1/js/jquery.dataTables.min.js')
- @basset('https://cdn.datatables.net/1.13.1/js/dataTables.bootstrap5.min.js')
- @basset('https://cdn.datatables.net/responsive/2.4.0/js/dataTables.responsive.min.js')
- @basset('https://cdn.datatables.net/responsive/2.4.0/css/responsive.dataTables.min.css')
- @basset('https://cdn.datatables.net/fixedheader/3.3.1/js/dataTables.fixedHeader.min.js')
- @basset('https://cdn.datatables.net/fixedheader/3.3.1/css/fixedHeader.dataTables.min.css')
-
- @basset(base_path('vendor/backpack/crud/src/resources/assets/img/spinner.svg'), false)
-
+@push('after_scripts')
+ @basset("https://cdn.datatables.net/2.1.8/js/dataTables.min.js")
+ @basset("https://cdn.datatables.net/2.1.8/js/dataTables.bootstrap5.min.js")
+ @basset("https://cdn.datatables.net/responsive/3.0.3/js/dataTables.responsive.min.js")
+ @basset('https://cdn.datatables.net/fixedheader/4.0.1/js/dataTables.fixedHeader.min.js')
+ @basset(base_path('vendor/backpack/crud/src/resources/assets/img/spinner.svg'), false)
+@endpush
+
+@push('before_styles')
+ @basset('https://cdn.datatables.net/2.1.8/css/dataTables.bootstrap5.min.css')
+ @basset("https://cdn.datatables.net/responsive/3.0.3/css/responsive.dataTables.min.css")
+ @basset('https://cdn.datatables.net/fixedheader/4.0.1/css/fixedHeader.dataTables.min.css')
+@endpush
+@push('after_scripts')
-
+
@include('crud::inc.details_row_logic')
+@endpush
\ No newline at end of file
diff --git a/src/resources/views/crud/inc/export_buttons.blade.php b/src/resources/views/crud/inc/export_buttons.blade.php
index 8c8bd9a154..e731323964 100644
--- a/src/resources/views/crud/inc/export_buttons.blade.php
+++ b/src/resources/views/crud/inc/export_buttons.blade.php
@@ -1,13 +1,17 @@
@if ($crud->exportButtons())
- @basset('https://cdn.datatables.net/buttons/2.3.3/css/buttons.bootstrap5.min.css')
- @basset('https://cdn.datatables.net/buttons/2.3.3/js/dataTables.buttons.min.js')
- @basset('https://cdn.datatables.net/buttons/2.3.3/js/buttons.bootstrap5.min.js')
- @basset('https://cdnjs.cloudflare.com/ajax/libs/jszip/2.5.0/jszip.min.js')
- @basset('https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.18/pdfmake.min.js')
- @basset('https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.18/vfs_fonts.js')
- @basset('https://cdn.datatables.net/buttons/2.3.2/js/buttons.html5.min.js')
- @basset('https://cdn.datatables.net/buttons/2.3.2/js/buttons.print.min.js')
- @basset('https://cdn.datatables.net/buttons/2.3.2/js/buttons.colVis.min.js')
+ @push('after_scripts')
+ @basset('https://cdn.datatables.net/buttons/3.2.0/js/dataTables.buttons.min.js')
+ @basset('https://cdn.datatables.net/buttons/3.2.0/js/buttons.bootstrap5.min.js')
+ @basset('https://cdnjs.cloudflare.com/ajax/libs/jszip/2.5.0/jszip.min.js')
+ @basset('https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.18/pdfmake.min.js')
+ @basset('https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.18/vfs_fonts.js')
+ @basset('https://cdn.datatables.net/buttons/3.2.0/js/buttons.html5.min.js')
+ @basset('https://cdn.datatables.net/buttons/3.2.0/js/buttons.print.min.js')
+ @basset('https://cdn.datatables.net/buttons/3.2.0/js/buttons.colVis.min.js')
+ @endpush
+ @push('after_styles')
+ @basset('https://cdn.datatables.net/buttons/3.2.0/css/buttons.bootstrap5.min.css')
+ @endpush