From 9b352112c5c094f0fe3595a731ed9153a2ef7f31 Mon Sep 17 00:00:00 2001 From: Ramon Van Gorkom Date: Sun, 24 Dec 2023 16:04:33 +0100 Subject: [PATCH] luci-app-usteer: Added tooltip while hovering over connected client showing mac, IP(s), hostname in status page Signed-off-by: Ramon Van Gorkom (cherry picked from commit 0f794ac76c53b154694b8ee9be4772a501faa76f) --- .../resources/view/usteer/usteer.js | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js b/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js index ccca06203a..c92febcc0a 100644 --- a/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js +++ b/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js @@ -91,25 +91,46 @@ function collectWlanAPInfoEntries(connectioninfo_table_entries, wlanAPInfos) { } }; +function tootltip(mac, IP, hostname) { + var body= E([]); + body.appendChild(E('div', mac)); + if (typeof IP !== 'undefined') { + for (var IPaddr in IP['ipaddrs']) body.appendChild(E('div', IP['ipaddrs'][IPaddr])); + for (var IPaddr in IP['ip6addrs']) body.appendChild(E('div', IP['ip6addrs'][IPaddr]));; + } + if (hostname !== '') { + body.appendChild(E('div', '%h'.format(hostname))); + } + return body; +} function collectWlanAPInfos(compactconnectioninfo_table_entries, wlanAPInfos) { for (var wlan in wlanAPInfos) { - var hostl = ''; + var hostl = E([]); for (var mac in Clients) { if (typeof Clients[mac] !== 'undefined') if (typeof Clients[mac][wlan] !== 'undefined') - if (String(Clients[mac][wlan]['connected']).valueOf() == String('true').valueOf()) { + if (String(Clients[mac][wlan]['connected']).valueOf() === 'true') { var foundname = mac; + var IP = ''; + var hostname = ''; var macUp = mac.toUpperCase(); if (typeof Hosts[macUp] !== 'undefined') { - if ((String(Hosts[macUp]['ipaddrs'][0]).length > 0) && (typeof Hosts[macUp]['ipaddrs'][0] !== 'undefined')) { - foundname = Hosts[macUp]['ipaddrs'][0]; + if ((typeof Hosts[macUp]['ipaddrs'][0] !== 'undefined') && (String(Hosts[macUp]['ipaddrs'][0]).length > 0)) { + IP = Hosts[macUp]['ipaddrs'][0]; + foundname = IP; } - if ((String(Hosts[macUp]['name']).length > 0) && (typeof Hosts[macUp]['name'] !== 'undefined')) { - foundname = Hosts[macUp]['name']; + if ((typeof Hosts[macUp]['name'] !== 'undefined') && (String(Hosts[macUp]['name']).length > 0)) { + hostname = Hosts[macUp]['name']; + foundname = hostname; } } - hostl += '%h\u2003'.format(foundname); + hostl.appendChild( + E('span', { 'class': 'cbi-tooltip-container' }, [ + '%h\u2003'.format(foundname), + E('div', { 'class': 'cbi-tooltip' }, tootltip(mac, Hosts[macUp], hostname)) + ]) + ); } } compactconnectioninfo_table_entries.push([ -- 2.30.2