From 807fa3b487ea3fa2d24073f51c2b960ea12127e4 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 23 Mar 2020 22:01:06 +0100
Subject: [PATCH] luci-mod-status: adjust assoclist markup for easier styling

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e26b6c8c1408586ccbf59aac7368420c7a055097)
---
 .../resources/view/status/include/60_wifi.js  | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
index e4c623289..115fe9909 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
@@ -121,7 +121,7 @@ return baseclass.extend({
 		if (!table.lastElementChild)
 			return null;
 
-		var assoclist = E('div', { 'class': 'table' }, [
+		var assoclist = E('div', { 'class': 'table assoclist' }, [
 			E('div', { 'class': 'tr table-titles' }, [
 				E('div', { 'class': 'th nowrap' }, _('Network')),
 				E('div', { 'class': 'th hide-xs' }, _('MAC-Address')),
@@ -170,23 +170,37 @@ return baseclass.extend({
 				var hint;
 
 				if (name && ipv4 && ipv6)
-					hint = '%s (%s, %s)'.format(name, ipv4, ipv6);
+					hint = '%s <span class="hide-xs">(%s, %s)</span>'.format(name, ipv4, ipv6);
 				else if (name && (ipv4 || ipv6))
-					hint = '%s (%s)'.format(name, ipv4 || ipv6);
+					hint = '%s <span class="hide-xs">(%s)</span>'.format(name, ipv4 || ipv6);
 				else
 					hint = name || ipv4 || ipv6 || '?';
 
 				var row = [
-					E('span', { 'class': 'ifacebadge', 'title': networks[i].getI18n() }, [
+					E('span', {
+						'class': 'ifacebadge',
+						'title': networks[i].getI18n(),
+						'data-ifname': networks[i].getIfname(),
+						'data-ssid': networks[i].getActiveSSID()
+					}, [
 						E('img', { 'src': L.resource('icons/wifi.png') }),
-						' ', networks[i].getShortName(),
-						E('small', {}, [ ' (', networks[i].getIfname(), ')' ])
+						E('span', {}, [
+							' ', networks[i].getShortName(),
+							E('small', {}, [ ' (', networks[i].getIfname(), ')' ])
+						])
 					]),
 					bss.mac,
 					hint,
-					E('span', { 'class': 'ifacebadge', 'title': sig_title }, [
+					E('span', {
+						'class': 'ifacebadge',
+						'title': sig_title,
+						'data-signal': bss.signal,
+						'data-noise': bss.noise
+					}, [
 						E('img', { 'src': icon }),
-						' ', sig_value
+						E('span', {}, [
+							' ', sig_value
+						])
 					]),
 					E('span', {}, [
 						E('span', wifirate(bss.rx)),
-- 
2.25.1