Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-19 16:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into release/v4.3.2

Browse Source
This commit is contained in:
Adam Warner
2019-09-22 00:58:42 +01:00
committed by GitHub
parent 76d2488e9e 752cd38698
commit b7d3ddd2b0
16 changed files with 847 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/pi-hole/js/network.js
View File

@@ -8,6 +8,9 @@ var tableApi;
var APIstring = "api_db.php?network";
// How many IPs do we show at most per device?
var MAXIPDISPLAY = 3;
function refreshData() {
tableApi.ajax.url(APIstring).load();
}
@@ -113,12 +116,15 @@ $(document).ready(function() {
// Set number of queries to localized string (add thousand separators)
$("td:eq(6)", row).html(data["numQueries"].toLocaleString());
// Client -> jump to Query Log on click
$("td:eq(0)", row).click( function () { openInNewTab("/admin/queries.php?client="+this.innerHTML); } );
$("td:eq(0)", row).css("cursor","pointer");
$("td:eq(0)", row).hover(
function () { this.title="Click to show recent queries made by "+this.innerHTML; this.style.color="#72afd2"; },
function () { this.style.color=""; } );
var ips = data["ip"];
var shortips = ips;
if(ips.length > MAXIPDISPLAY)
{
shortips = ips.slice(0,MAXIPDISPLAY-1);
shortips.push("...");
}
$("td:eq(0)", row).html(shortips.join("<br>"));
$("td:eq(0)", row).hover(function () { this.title=ips.join("\n");});
// MAC + Vendor field if available
if(data["macVendor"] && data["macVendor"].length > 0)