diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt index c14e3e728e..69973c1a56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt @@ -192,7 +192,7 @@ $("#rulestabs a:first").tab("show"); } $(".overduerulest").dataTable($.extend(true, {}, dataTablesDefaults, { - "aoColumnDefs": [ + "columnDefs": [ { "targets": [ "NoSort" ], "orderable": false, "searchable": false }, ], "dom": '<"top pager"f>rt<"clear">', diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss index 4758df975e..c77c6d82cb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss @@ -649,7 +649,7 @@ table { .table_controls { display: flex; - .dataTables_filter { + .dt-input { label { input { margin-bottom: 5px; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc index 2c16b8c6aa..254ab8c7f8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc @@ -7,7 +7,6 @@ -[% Asset.css("lib/jquery/responsive.dataTables.min.css") | $raw %] [% IF ( Koha.Preference('OpacMetaDescription') ) %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index 3839893eb4..b410297fb0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -137,7 +137,7 @@ "responsive": { "details": { "type": 'column',"target": -1 } }, - "aoColumnDefs": [ + "columnDefs": [ { "className": 'dtr-control', "orderable": false, "targets": -1 }, ], }, columns_settings ); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt index 806bd93292..c10a11ff7b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt @@ -89,7 +89,7 @@ "responsive": { "details": { "type": 'column',"target": -1 } }, - "aoColumnDefs": [ + "cColumnDefs": [ { "className": 'dtr-control', "orderable": false, "targets": -1 }, ], }, columns_settings ); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 217af7a6ed..b762a2087b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1746,7 +1746,7 @@ KohaTable("#holdingst", { dom: '<"clearfix">t', - "aoColumnDefs": [ + "columnDefs": [ { "className": "dtr-control", "orderable": false, "targets": -1 } ], "bKohaColumnsUseNames": true, @@ -1758,7 +1758,7 @@ KohaTable("#otherholdingst", { dom: '<"clearfix">t', - "aoColumnDefs": [ + "columnDefs": [ { "className": "dtr-control", "orderable": false, "targets": -1 } ], "bKohaColumnsUseNames": true, @@ -1778,7 +1778,7 @@ "responsive": { "details": { "type": 'column', "target": -1 } }, - "aoColumnDefs": [ + "columnDefs": [ { "className": "dtr-control", "orderable": false, "targets": -1 } ], }, serial_column_settings); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index c6d445a193..c5aa37e3ae 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -245,7 +245,7 @@ "responsive": { "details": {"type": 'column',"target": -1} }, - "aoColumnDefs": [ + "columnDefs": [ { "className": "dtr-control","orderable": false,"targets": [-1] }, { "visible": false, "targets": [0]}, { "orderable": false, "targets": [1]} diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt index 445854d0cf..902637b0d1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt @@ -140,9 +140,9 @@ "responsive": { "details": { "type": 'column', "target": -1 } }, - "aoColumnDefs": [ - { "aTargets": [ "nosort" ],"bSortable": false,"bSearchable": false }, - { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, + "columnDefs": [ + { "targets": [ "nosort" ],"sortable": false,"searchable": false }, + { "type": "anti-the", "targets" : [ "anti-the" ] }, { "className": "dtr-control", "orderable": false, "targets": -1 } ] })); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index e435f249fb..db5da3c99f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt @@ -298,7 +298,7 @@ var table = KohaTable(".historyt", { "order": [[ 1, "desc" ]], "dom": '<"top"<"table_entries"><"table_controls"fB>>t', - "aoColumnDefs": [ + "columnDefs": [ { "targets": [ 0 ], "sortable": false, "searchable": false }, { "className": 'dtr-control', "orderable": false, "targets": -1 } ], diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index e414156495..dfb5e0522b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -18,7 +18,6 @@ [% ELSE %] [% END %] -[% Asset.css("lib/jquery/responsive.dataTables.min.css") | $raw %] [% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %] [% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %] [% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/lib/jquery/responsive.dataTables.min.css b/koha-tmpl/opac-tmpl/bootstrap/lib/jquery/responsive.dataTables.min.css deleted file mode 100644 index 8e6448abd9..0000000000 --- a/koha-tmpl/opac-tmpl/bootstrap/lib/jquery/responsive.dataTables.min.css +++ /dev/null @@ -1 +0,0 @@ -table.dataTable.dtr-inline.collapsed>tbody>tr>td.child,table.dataTable.dtr-inline.collapsed>tbody>tr>th.child,table.dataTable.dtr-inline.collapsed>tbody>tr>td.dataTables_empty{cursor:default !important}table.dataTable.dtr-inline.collapsed>tbody>tr>td.child:before,table.dataTable.dtr-inline.collapsed>tbody>tr>th.child:before,table.dataTable.dtr-inline.collapsed>tbody>tr>td.dataTables_empty:before{display:none !important}table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control,table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control{position:relative;padding-left:30px;cursor:pointer}table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before,table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before{top:50%;left:5px;height:1em;width:1em;margin-top:-9px;display:block;position:absolute;color:white;border:.15em solid white;border-radius:1em;box-shadow:0 0 .2em #444;box-sizing:content-box;text-align:center;text-indent:0 !important;font-family:"Courier New",Courier,monospace;line-height:1em;content:"+";background-color:#31b131}table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td.dtr-control:before,table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th.dtr-control:before{content:"-";background-color:#d33333}table.dataTable.dtr-inline.collapsed.compact>tbody>tr>td.dtr-control,table.dataTable.dtr-inline.collapsed.compact>tbody>tr>th.dtr-control{padding-left:27px}table.dataTable.dtr-inline.collapsed.compact>tbody>tr>td.dtr-control:before,table.dataTable.dtr-inline.collapsed.compact>tbody>tr>th.dtr-control:before{left:4px;height:14px;width:14px;border-radius:14px;line-height:14px;text-indent:3px}table.dataTable.dtr-column>tbody>tr>td.dtr-control,table.dataTable.dtr-column>tbody>tr>th.dtr-control,table.dataTable.dtr-column>tbody>tr>td.control,table.dataTable.dtr-column>tbody>tr>th.control{position:relative;cursor:pointer}table.dataTable.dtr-column>tbody>tr>td.dtr-control:before,table.dataTable.dtr-column>tbody>tr>th.dtr-control:before,table.dataTable.dtr-column>tbody>tr>td.control:before,table.dataTable.dtr-column>tbody>tr>th.control:before{top:50%;left:50%;height:.8em;width:.8em;margin-top:-0.5em;margin-left:-0.5em;display:block;position:absolute;color:white;border:.15em solid white;border-radius:1em;box-shadow:0 0 .2em #444;box-sizing:content-box;text-align:center;text-indent:0 !important;font-family:"Courier New",Courier,monospace;line-height:1em;content:"+";background-color:#31b131}table.dataTable.dtr-column>tbody>tr.parent td.dtr-control:before,table.dataTable.dtr-column>tbody>tr.parent th.dtr-control:before,table.dataTable.dtr-column>tbody>tr.parent td.control:before,table.dataTable.dtr-column>tbody>tr.parent th.control:before{content:"-";background-color:#d33333}table.dataTable>tbody>tr.child{padding:.5em 1em}table.dataTable>tbody>tr.child:hover{background:transparent !important}table.dataTable>tbody>tr.child ul.dtr-details{display:inline-block;list-style-type:none;margin:0;padding:0}table.dataTable>tbody>tr.child ul.dtr-details>li{border-bottom:1px solid #efefef;padding:.5em 0}table.dataTable>tbody>tr.child ul.dtr-details>li:first-child{padding-top:0}table.dataTable>tbody>tr.child ul.dtr-details>li:last-child{border-bottom:none}table.dataTable>tbody>tr.child span.dtr-title{display:inline-block;min-width:75px;font-weight:bold}div.dtr-modal{position:fixed;box-sizing:border-box;top:0;left:0;height:100%;width:100%;z-index:100;padding:10em 1em}div.dtr-modal div.dtr-modal-display{position:absolute;top:0;left:0;bottom:0;right:0;width:50%;height:50%;overflow:auto;margin:auto;z-index:102;overflow:auto;background-color:#f5f5f7;border:1px solid black;border-radius:.5em;box-shadow:0 12px 30px rgba(0, 0, 0, 0.6)}div.dtr-modal div.dtr-modal-content{position:relative;padding:1em}div.dtr-modal div.dtr-modal-close{position:absolute;top:6px;right:6px;width:22px;height:22px;border:1px solid #eaeaea;background-color:#f9f9f9;text-align:center;border-radius:3px;cursor:pointer;z-index:12}div.dtr-modal div.dtr-modal-close:hover{background-color:#eaeaea}div.dtr-modal div.dtr-modal-background{position:fixed;top:0;left:0;right:0;bottom:0;z-index:101;background:rgba(0, 0, 0, 0.6)}@media screen and (max-width: 767px){div.dtr-modal div.dtr-modal-display{width:95%}}