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

luci-mod-network: rework signal badge disabled state

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-04-02 15:20:23 +02:00
parent c8f9f6f494
commit eb1422defe
1 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View file

@ -29,7 +29,7 @@ function render_radio_badge(radioDev) {
]); ]);
} }
function render_signal_badge(signalPercent, signalValue, noiseValue, wrap) { function render_signal_badge(signalPercent, signalValue, noiseValue, wrap, mode) {
var icon, title, value; var icon, title, value;
if (signalPercent < 0) if (signalPercent < 0)
@ -45,20 +45,42 @@ function render_signal_badge(signalPercent, signalValue, noiseValue, wrap) {
else else
icon = L.resource('icons/signal-75-100.png'); icon = L.resource('icons/signal-75-100.png');
if (signalValue != null && signalValue != 0 && noiseValue != null && noiseValue != 0) { if (signalValue != null && signalValue != 0) {
if (noiseValue != null && noiseValue != 0) {
value = '%d/%d\xa0%s'.format(signalValue, noiseValue, _('dBm')); value = '%d/%d\xa0%s'.format(signalValue, noiseValue, _('dBm'));
title = '%s: %d %s / %s: %d %s / %s %d'.format( title = '%s: %d %s / %s: %d %s / %s %d'.format(
_('Signal'), signalValue, _('dBm'), _('Signal'), signalValue, _('dBm'),
_('Noise'), noiseValue, _('dBm'), _('Noise'), noiseValue, _('dBm'),
_('SNR'), signalValue - noiseValue); _('SNR'), signalValue - noiseValue);
} }
else if (signalValue != null && signalValue != 0) { else {
value = '%d\xa0%s'.format(signalValue, _('dBm')); value = '%d\xa0%s'.format(signalValue, _('dBm'));
title = '%s: %d %s'.format(_('Signal'), signalValue, _('dBm')); title = '%s: %d %s'.format(_('Signal'), signalValue, _('dBm'));
} }
}
else if (signalPercent > -1) { else if (signalPercent > -1) {
value = '\xa0---\xa0'; switch (mode) {
title = _('No signal'); case 'ap':
title = _('No client associated');
break;
case 'sta':
case 'adhoc':
case 'mesh':
title = _('Not associated');
break;
default:
title = _('No RX signal');
}
if (noiseValue != null && noiseValue != 0) {
value = '---/%d\x0a%s'.format(noiseValue, _('dBm'));
title = '%s / %s: %d %s'.format(title, _('Noise'), noiseValue, _('dBm'));
}
else {
value = '---\xa0%s'.format(_('dBm'));
}
} }
else { else {
value = E('em', {}, E('small', {}, [ _('disabled') ])); value = E('em', {}, E('small', {}, [ _('disabled') ]));
@ -80,7 +102,9 @@ function render_signal_badge(signalPercent, signalValue, noiseValue, wrap) {
} }
function render_network_badge(radioNet) { function render_network_badge(radioNet) {
return render_signal_badge(radioNet.isUp() ? radioNet.getSignalPercent() : -1, radioNet.getSignal(), radioNet.getNoise()); return render_signal_badge(
radioNet.isUp() ? radioNet.getSignalPercent() : -1,
radioNet.getSignal(), radioNet.getNoise(), false, radioNet.getMode());
} }
function render_radio_status(radioDev, wifiNets) { function render_radio_status(radioDev, wifiNets) {
@ -143,7 +167,9 @@ function render_modal_status(node, radioNet) {
if (node == null) if (node == null)
node = E('span', { 'class': 'ifacebadge large', 'data-network': radioNet.getName() }, [ E('small'), E('span') ]); node = E('span', { 'class': 'ifacebadge large', 'data-network': radioNet.getName() }, [ E('small'), E('span') ]);
L.dom.content(node.firstElementChild, render_signal_badge(disabled ? -1 : radioNet.getSignalPercent(), radioNet.getSignal(), noise, true)); L.dom.content(node.firstElementChild, render_signal_badge(
disabled ? -1 : radioNet.getSignalPercent(),
radioNet.getSignal(), noise, true, radioNet.getMode()));
L.itemlist(node.lastElementChild, [ L.itemlist(node.lastElementChild, [
_('Mode'), mode, _('Mode'), mode,