diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js index 4f58b1c4..606820b3 100644 --- a/scripts/pi-hole/js/groups-adlists.js +++ b/scripts/pi-hole/js/groups-adlists.js @@ -55,9 +55,9 @@ function initTable() { $(row).attr("data-id", data.id); var tooltip = "Added: " + - utils.datetime(data.date_added) + + utils.datetime(data.date_added, false) + "\nLast modified: " + - utils.datetime(data.date_modified) + + utils.datetime(data.date_modified, false) + "\nDatabase ID: " + data.id; $("td:eq(0)", row).html( diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js index 70ff81ff..62b26d65 100644 --- a/scripts/pi-hole/js/groups-clients.js +++ b/scripts/pi-hole/js/groups-clients.js @@ -94,9 +94,9 @@ function initTable() { $(row).attr("data-id", data.id); var tooltip = "Added: " + - utils.datetime(data.date_added) + + utils.datetime(data.date_added, false) + "\nLast modified: " + - utils.datetime(data.date_modified) + + utils.datetime(data.date_modified, false) + "\nDatabase ID: " + data.id; var ipName = diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js index 5128ef14..911eaa01 100644 --- a/scripts/pi-hole/js/groups-domains.js +++ b/scripts/pi-hole/js/groups-domains.js @@ -85,9 +85,9 @@ function initTable() { $(row).attr("data-id", data.id); var tooltip = "Added: " + - utils.datetime(data.date_added) + + utils.datetime(data.date_added, false) + "\nLast modified: " + - utils.datetime(data.date_modified) + + utils.datetime(data.date_modified, false) + "\nDatabase ID: " + data.id; $("td:eq(0)", row).html( diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js index 9835c4c7..f59dd1b0 100644 --- a/scripts/pi-hole/js/groups.js +++ b/scripts/pi-hole/js/groups.js @@ -34,9 +34,9 @@ $(function () { $(row).attr("data-id", data.id); var tooltip = "Added: " + - utils.datetime(data.date_added) + + utils.datetime(data.date_added, false) + "\nLast modified: " + - utils.datetime(data.date_modified) + + utils.datetime(data.date_modified, false) + "\nDatabase ID: " + data.id; $("td:eq(0)", row).html( diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js index 4e5a4af6..ac8e08e6 100644 --- a/scripts/pi-hole/js/utils.js +++ b/scripts/pi-hole/js/utils.js @@ -104,8 +104,9 @@ function showAlert(type, icon, title, message) { } } -function datetime(date) { - return moment.unix(Math.floor(date)).format("Y-MM-DD []HH:mm:ss z"); +function datetime(date, html) { + var format = html === false ? "Y-MM-DD HH:mm:ss z" : "Y-MM-DD []HH:mm:ss z"; + return moment.unix(Math.floor(date)).format(format); } function disableAll() {