summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-status
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-03-23 22:01:06 +0100
committerJo-Philipp Wich <jo@mein.io>2020-03-23 22:01:53 +0100
commite26b6c8c1408586ccbf59aac7368420c7a055097 (patch)
tree91de6a64139c56c1eb89e72d3dd47c4255691508 /modules/luci-mod-status
parent3afe606743c44414f11f713b1557d4c0fb9faf80 (diff)
luci-mod-status: adjust assoclist markup for easier styling
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-status')
-rw-r--r--modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js30
1 files 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 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 <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)),