diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js index 3d958833..d73eb4fc 100644 --- a/scripts/pi-hole/js/groups-adlists.js +++ b/scripts/pi-hole/js/groups-adlists.js @@ -33,44 +33,63 @@ $(function () { function format(data) { // Generate human-friendly status string var statusText = "Unknown"; + var PrintNumbers = true; if (data.status !== null) { switch (parseInt(data.status, 10)) { + case 0: + if(data.enabled === 0) { + statusText = 'List is disabled and not checked'; + } else { + statusText = 'List was not downloaded so far'; + } + PrintNumbers = false; + break; case 1: - statusText = "List download was successful (OK)"; + statusText = 'List download was successful (OK)'; break; case 2: - statusText = "List unchanged upstream, Pi-hole used a local copy (OK)"; + statusText = 'List unchanged upstream, Pi-hole used a local copy (OK)'; break; case 3: - statusText = "List unavailable, Pi-hole used a local copy"; + statusText = 'List unavailable, Pi-hole used a local copy (check list)'; break; case 4: statusText = - "List unavailable, there is no local copy of this list available on your Pi-hole"; + 'List unavailable, there is no local copy of this list available on your Pi-hole (replace list)'; + PrintNumbers = false; break; default: - statusText = "Unknown (" + parseInt(data.status, 10) + ")"; + statusText = 'Unknown (' + parseInt(data.status, 10) + ')'; break; } } // Compile extra info for displaying return ( - '' + - "
Health status of this list:" + + '' + + '
Health status of this list:' + statusText + - "
This list was added to Pi-hole on  " + + '
This list was added to Pi-hole  ' + + utils.datetimeRelative(data.date_added) + + " (" + utils.datetime(data.date_added, false) + - "
Database entry was last modified on  " + + ')
Database entry was last modified  ' + + utils.datetimeRelative(data.date_modified) + + " (" + utils.datetime(data.date_modified, false) + - "
The list contents were last updated on  " + - (data.date_updated !== null ? utils.datetime(data.date_updated, false) : "N/A") + - "
Number of valid domains on this list:  " + - (data.number !== null ? data.number : "N/A") + - "
Number of invalid domains on this list:  " + - (data.invalid_domains !== null ? data.invalid_domains : "N/A") + - "
Database ID of this list:" + + ')
The list contents were last updated  ' + + (data.date_updated !== null + ? utils.datetimeRelative(data.date_updated) + + " (" + + utils.datetime(data.date_updated) + + ")" + : "N/A") + + '
Number of valid domains on this list:  ' + + (data.number !== null && PrintNumbers === true ? data.number : "N/A") + + '
Number of invalid domains on this list:  ' + + (data.invalid_domains !== null && PrintNumbers === true ? data.invalid_domains : "N/A") + + '
Database ID of this list:' + data.id + "
" ); diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js index cdc4bead..73e38258 100644 --- a/scripts/pi-hole/js/utils.js +++ b/scripts/pi-hole/js/utils.js @@ -124,7 +124,11 @@ function showAlert(type, icon, title, message) { 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); + return moment.unix(Math.floor(date)).format(format).trim(); +} + +function datetimeRelative(date) { + return moment.unix(Math.floor(date)).fromNow(); } function disableAll() { @@ -331,6 +335,7 @@ window.utils = (function () { padNumber: padNumber, showAlert: showAlert, datetime: datetime, + datetimeRelative: datetimeRelative, disableAll: disableAll, enableAll: enableAll, validateIPv4CIDR: validateIPv4CIDR, diff --git a/style/pi-hole.css b/style/pi-hole.css index d60da7fb..df4b95d7 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -354,3 +354,7 @@ td.details-control { cursor: pointer; } + +.dataTables-child td { + padding: 2px 5px; +}