From: Jo-Philipp Wich Date: Mon, 23 Mar 2020 21:01:06 +0000 (+0100) Subject: luci-mod-status: adjust assoclist markup for easier styling X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e26b6c8c1408586ccbf59aac7368420c7a055097;p=oweals%2Fluci.git luci-mod-status: adjust assoclist markup for easier styling Signed-off-by: Jo-Philipp Wich --- 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 86468c718..0d7d4f4a8 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 @@ -119,7 +119,7 @@ return L.Class.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')), @@ -168,23 +168,37 @@ return L.Class.extend({ var hint; if (name && ipv4 && ipv6) - hint = '%s (%s, %s)'.format(name, ipv4, ipv6); + hint = '%s (%s, %s)'.format(name, ipv4, ipv6); else if (name && (ipv4 || ipv6)) - hint = '%s (%s)'.format(name, ipv4 || ipv6); + hint = '%s (%s)'.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)),