Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-status: adjust assoclist markup for easier styling

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-03-23 22:01:06 +01:00
parent 3afe606743
commit e26b6c8c14
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
View file

@ -119,7 +119,7 @@ return L.Class.extend({
if (!table.lastElementChild) if (!table.lastElementChild)
return null; return null;
var assoclist = E('div', { 'class': 'table' }, [ var assoclist = E('div', { 'class': 'table assoclist' }, [
E('div', { 'class': 'tr table-titles' }, [ E('div', { 'class': 'tr table-titles' }, [
E('div', { 'class': 'th nowrap' }, _('Network')), E('div', { 'class': 'th nowrap' }, _('Network')),
E('div', { 'class': 'th hide-xs' }, _('MAC-Address')), E('div', { 'class': 'th hide-xs' }, _('MAC-Address')),
@ -168,23 +168,37 @@ return L.Class.extend({
var hint; var hint;
if (name && ipv4 && ipv6) 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)) 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 else
hint = name || ipv4 || ipv6 || '?'; hint = name || ipv4 || ipv6 || '?';
var row = [ 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') }), E('img', { 'src': L.resource('icons/wifi.png') }),
' ', networks[i].getShortName(), E('span', {}, [
E('small', {}, [ ' (', networks[i].getIfname(), ')' ]) ' ', networks[i].getShortName(),
E('small', {}, [ ' (', networks[i].getIfname(), ')' ])
])
]), ]),
bss.mac, bss.mac,
hint, 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 }), E('img', { 'src': icon }),
' ', sig_value E('span', {}, [
' ', sig_value
])
]), ]),
E('span', {}, [ E('span', {}, [
E('span', wifirate(bss.rx)), E('span', wifirate(bss.rx)),