diff --git a/assets/css/app.css b/assets/css/app.css index fdbdd74e..b063ac71 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -691,6 +691,10 @@ table.dataTable { margin-top: 0 !important; } +div.dataTables_wrapper div.dataTables_info { + white-space: normal; +} + /******************************* Parts datatable styling diff --git a/assets/js/app.js b/assets/js/app.js index 1a64e6a1..28b5b51a 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -62,6 +62,9 @@ require( 'datatables.net-buttons/js/buttons.print.js' ); require( 'datatables.net-fixedheader-bs4' ); require( 'datatables.net-select-bs4' ); require('datatables.net-colreorder-bs4'); +require('datatables.net-colreorder-bs4'); +require('datatables.net-responsive-bs4'); +require('datatables.net-responsive-bs4/css/responsive.bootstrap4.css'); require('bootstrap-select'); require('jquery-form'); require('corejs-typeahead/dist/typeahead.bundle.min'); diff --git a/assets/ts_src/ajax_ui.ts b/assets/ts_src/ajax_ui.ts index ef29879a..99a5d3c8 100644 --- a/assets/ts_src/ajax_ui.ts +++ b/assets/ts_src/ajax_ui.ts @@ -518,6 +518,7 @@ class AjaxUI { var promise = $('#part_list').initDataTables(settings, { colReorder: true, + responsive: true, "fixedHeader": { header: $(window).width() >= 768, //Only enable fixedHeaders on devices with big screen. Fixes scrolling issues on smartphones. headerOffset: $("#navbar").height()}, "buttons": [ { diff --git a/config/packages/datatables.yaml b/config/packages/datatables.yaml index 67521423..18fbb18d 100644 --- a/config/packages/datatables.yaml +++ b/config/packages/datatables.yaml @@ -5,7 +5,7 @@ datatables: # Set options, as documented at https://datatables.net/reference/option/ options: - lengthMenu : [10, 25, 50, 100, 250, 500, 1000, 2500] + lengthMenu : [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]] pageLength: 50 #dom: "<'row' <'col-sm-12' tr>><'row' <'col-sm-6'l><'col-sm-6 text-right'pif>>" dom: " <'row'<'col mb-2 input-group' B l> <'col mb-2' <'pull-right' p>>> diff --git a/package.json b/package.json index 71c62ede..6ac99b78 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "datatables.net-buttons-bs4": "^1.5.4", "datatables.net-colreorder-bs4": "^1.5.1", "datatables.net-fixedheader-bs4": "^3.1.5", + "datatables.net-responsive-bs4": "^2.2.3", "datatables.net-select-bs4": "^1.2.7", "dompurify": "^2.0.6", "exports-loader": "^0.7.0", diff --git a/templates/Parts/lists/_info_card.html.twig b/templates/Parts/lists/_info_card.html.twig index fc111c54..14f93c7b 100644 --- a/templates/Parts/lists/_info_card.html.twig +++ b/templates/Parts/lists/_info_card.html.twig @@ -11,7 +11,7 @@
-
+ -
+
-
+
- - {{ entity.name }} + + {{ entity.name }}
- - + + {% if entity.parent %} {{ entity.parent.fullPath }} {% else %} @@ -41,7 +41,7 @@
-
+
{% trans %}entity.edit.btn{% endtrans %} @@ -60,12 +60,12 @@
- - {{ entity.children | length }} + + {{ entity.children | length }}
- - {{ entity.parts | length }} + + {{ entity.parts | length }}
diff --git a/yarn.lock b/yarn.lock index 419d53d0..2a9c6397 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2271,6 +2271,23 @@ datatables.net-fixedheader@3.1.6: datatables.net "^1.10.15" jquery ">=1.7" +datatables.net-responsive-bs4@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.2.3.tgz#639de17c1d31210ebf2b3c25f1c774c13f729e94" + integrity sha512-SQaWI0uLuPcaiBBin9zX+MuQfTSIkK1bYxbXqUV6NLkHCVa6PMQK7Rvftj0ywG4R7uOtjbzY8nSVqxEKvQI0Vg== + dependencies: + datatables.net-bs4 "^1.10.15" + datatables.net-responsive "2.2.3" + jquery ">=1.7" + +datatables.net-responsive@2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/datatables.net-responsive/-/datatables.net-responsive-2.2.3.tgz#50a2b1b4955b16b32f573a3f00f473b0bfbee913" + integrity sha512-8D6VtZcyuH3FG0Hn5A4LPZQEOX3+HrRFM7HjpmsQc/nQDBbdeBLkJX4Sh/o1nzFTSneuT1Wh/lYZHVPpjcN+Sw== + dependencies: + datatables.net "^1.10.15" + jquery ">=1.7" + datatables.net-select-bs4@^1.2.7: version "1.3.1" resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.3.1.tgz#1c39c7fd5bfb66b5c8402611c2c64fc47e3cfca4"