From 7735af1a6e9ab5ca285f084f88de5a9c07f230ae Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 29 Jul 2025 15:27:06 +0200 Subject: [PATCH] Bug 38185: Reintroduce .top.pager, .table_entries and .table_controls --- .../intranet-tmpl/prog/css/src/_tables.scss | 13 +++++++----- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 20 ++++++++++++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index 03a4a7edfff..96843bd0b42 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -689,17 +689,17 @@ div { .dt-info { margin-top: .5em; +} - & + .pager { - border-top: 1px solid $table-border-color; - margin-top: .3em; - } +.dt-layout: { + margin: 0; } -.dt-length, .dt-paging, .dt-search { +.pager { display: flex; flex-wrap: wrap; font-size: 90%; + width: 100%; &.top { padding-top: 1em; @@ -722,6 +722,9 @@ div { border: 0; padding: 0; } + + border-top: 1px solid $table-border-color; + margin-top: .3em; } .toptabs { diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index 57b410b6711..492cc40c5f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -48,9 +48,15 @@ var dataTablesDefaults = { top2Start: ["info"], top2End: null, - top: ["pageLength", "paging", "search", "buttons"], - topStart: null, - topEnd: null, + //top: [{div: {className: "top pager", features: ["pageLength", "paging"]}}, "search", "buttons"], + topStart: { + className: "table_entries", + features: ["pageLength", "paging"], + }, + topEnd: { + className: "table_controls", + features: ["search", "buttons"], + }, bottomStart: ["info", "paging"], bottomEnd: null, @@ -90,6 +96,14 @@ var dataTablesDefaults = { state && state.search && toggledClearFilter(state.search.search, tableId); + + // FIXME This it certainly a very bad idea... + const $topStart = $(".table_entries"); + const $topEnd = $(".table_controls"); + + const $wrapper = $('
'); + $topStart.before($wrapper); + $wrapper.append($topStart).append($topEnd); }, }; DataTable.defaults.column.orderSequence = ["asc", "desc"]; -- 2.34.1