Update datatables (#2852)

pi-hole · Nov 23, 2023 · e4ac12c · e4ac12c
2 parents 54dba57 + 55782d3
commit e4ac12c
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 278 deletions.
diff --git a/scripts/pi-hole/js/network.js b/scripts/pi-hole/js/network.js
@@ -203,7 +203,7 @@ $(function () {
     order: [[6, "desc"]],
     columns: [
       { data: "id", visible: false },
-      { data: "ip", type: "ip-address", width: "25%" },
+      { data: "ips[].ip", type: "ip-address", width: "25%" },
       { data: "hwaddr", width: "10%" },
       { data: "interface", width: "4%" },
       {

diff --git a/scripts/pi-hole/lua/header.lp b/scripts/pi-hole/lua/header.lp
@@ -98,7 +98,7 @@ if startsWith(scriptname, 'groups') then
     <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap-toggle.min.css')?>">
 <? end ?>
 <? if is_authenticated then ?>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables-pihole.min.css')?>">
     <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables_extensions.min.css')?>">
     <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/daterangepicker.min.css')?>">
 <? end ?>

diff --git a/scripts/vendor/datatables.buttons.min.js b/scripts/vendor/datatables.buttons.min.js
diff --git a/scripts/vendor/datatables.min.js b/scripts/vendor/datatables.min.js
diff --git a/style/pi-hole.css b/style/pi-hole.css
@@ -1008,6 +1008,8 @@ body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child:checked +
 /* Datatables Select - bgcolor */
 :root {
   --datatable-bgcolor: #e0e8ee;
+  --dt-row-selected: var(--datatable-bgcolor);
+  --dt-row-selected-text: currentColor;
 }
 
 div.dt-buttons {

diff --git a/style/vendor/datatables-pihole.min.css b/style/vendor/datatables-pihole.min.css
diff --git a/style/vendor/datatables.min.css b/style/vendor/datatables.min.css