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

Fix failed git auto-merge.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-14 20:14:33 +02:00
parent 8a794bf9aa a3df25c845
commit 389f1d1ecd
8 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,8 @@ $(document).ready(function () {
rowCallback: function (row, data) {
var color,
mark,
maxiter,
index,
lastQuery = parseInt(data.lastQuery);
var network_recent = $(".network-recent").css("background-color");
var network_old = $(".network-old").css("background-color");
@@ -110,8 +112,9 @@ $(document).ready(function () {
$("td:eq(3)", row).html("<em>unknown</em>");
} else {
var names = [];
var maxiter = Math.min(data.name.length, MAXIPDISPLAY);
for (var index = 0; index < maxiter; index++) {
maxiter = Math.min(data.name.length, MAXIPDISPLAY);
index = 0;
for (index = 0; index < maxiter; index++) {
var name = data.name[index];
names.push('<a href="queries.php?client=' + name + '">' + name + "</a>");
}
@@ -121,19 +124,20 @@ $(document).ready(function () {
// have more to show here
names.push("...");
}
$("td:eq(3)", row).html(names.join("<br>"));
$("td:eq(3)", row).hover(function () {
this.title = data.name.join("\n");
});
}
// Set number of queries to localized string (add thousand separators)
$("td:eq(6)", row).html(data.numQueries.toLocaleString());
var ips = [];
var maxiter = Math.min(data.ip.length, MAXIPDISPLAY);
for (var index = 0; index < maxiter; index++) {
maxiter = Math.min(data.ip.length, MAXIPDISPLAY);
index = 0;
for (index = 0; index < maxiter; index++) {
var ip = data.ip[index];
ips.push('<a href="queries.php?client=' + ip + '">' + ip + "</a>");
}