diff options
Diffstat (limited to 'modules/luci-mod-status/htdocs/luci-static')
3 files changed, 36 insertions, 22 deletions
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js index 9975a648ff..5de79a8ee2 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js @@ -23,7 +23,7 @@ return L.Class.extend({ leases6 = Array.isArray(data[0].dhcp6_leases) ? data[0].dhcp6_leases : [], machints = data[1].getMACHints(false); - var table = E('div', { 'class': 'table' }, [ + var table = E('div', { 'class': 'table lases' }, [ E('div', { 'class': 'tr table-titles' }, [ E('div', { 'class': 'th' }, _('Hostname')), E('div', { 'class': 'th' }, _('IPv4-Address')), @@ -50,7 +50,7 @@ return L.Class.extend({ ]; }), E('em', _('There are no active leases'))); - var table6 = E('div', { 'class': 'table' }, [ + var table6 = E('div', { 'class': 'table leases6' }, [ E('div', { 'class': 'tr table-titles' }, [ E('div', { 'class': 'th' }, _('Host')), E('div', { 'class': 'th' }, _('IPv6-Address')), 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 86468c7188..5eff561536 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 @@ -58,16 +58,16 @@ function renderbox(radio, networks) { } function wifirate(rt) { - var s = '%.1f %s, %d%s'.format(rt.rate / 1000, _('Mbit/s'), rt.mhz, _('MHz')), + var s = '%.1f\xa0%s, %d\xa0%s'.format(rt.rate / 1000, _('Mbit/s'), rt.mhz, _('MHz')), ht = rt.ht, vht = rt.vht, mhz = rt.mhz, nss = rt.nss, mcs = rt.mcs, sgi = rt.short_gi; if (ht || vht) { - if (vht) s += ', VHT-MCS %d'.format(mcs); - if (nss) s += ', VHT-NSS %d'.format(nss); - if (ht) s += ', MCS %s'.format(mcs); - if (sgi) s += ', ' + _('Short GI'); + if (vht) s += ', VHT-MCS\xa0%d'.format(mcs); + if (nss) s += ', VHT-NSS\xa0%d'.format(nss); + if (ht) s += ', MCS\xa0%s'.format(mcs); + if (sgi) s += ', ' + _('Short GI').replace(/ /g, '\xa0'); } return s; @@ -119,13 +119,13 @@ 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')), E('div', { 'class': 'th' }, _('Host')), - E('div', { 'class': 'th nowrap' }, '%s / %s'.format(_('Signal'), _('Noise'))), - E('div', { 'class': 'th nowrap' }, '%s / %s'.format(_('RX Rate'), _('TX Rate'))) + E('div', { 'class': 'th' }, '%s / %s'.format(_('Signal'), _('Noise'))), + E('div', { 'class': 'th' }, '%s / %s'.format(_('RX Rate'), _('TX Rate'))) ]) ]); @@ -154,37 +154,51 @@ return L.Class.extend({ var sig_title, sig_value; if (bss.noise) { - sig_value = '%d / %d %s'.format(bss.signal, bss.noise, _('dBm')); + sig_value = '%d/%d\xa0%s'.format(bss.signal, bss.noise, _('dBm')); sig_title = '%s: %d %s / %s: %d %s / %s %d'.format( _('Signal'), bss.signal, _('dBm'), _('Noise'), bss.noise, _('dBm'), _('SNR'), bss.signal - bss.noise); } else { - sig_value = '%d %s'.format(bss.signal, _('dBm')); + sig_value = '%d\xa0%s'.format(bss.signal, _('dBm')); sig_title = '%s: %d %s'.format(_('Signal'), bss.signal, _('dBm')); } 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)), @@ -195,7 +209,7 @@ return L.Class.extend({ if (networks[i].isClientDisconnectSupported()) { if (assoclist.firstElementChild.childNodes.length < 6) - assoclist.firstElementChild.appendChild(E('div', { 'class': 'th nowrap right' }, [ _('Disconnect') ])); + assoclist.firstElementChild.appendChild(E('div', { 'class': 'th cbi-section-actions' })); row.push(E('button', { 'class': 'cbi-button cbi-button-remove', diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js index b996b78ce5..d56eca5071 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js @@ -38,7 +38,7 @@ return L.view.extend({ proc.COMMAND, proc['%CPU'], proc['%MEM'], - E('div', { 'class': 'nowrap' }, [ + E('div', {}, [ E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleSignal', 1, proc.PID) @@ -70,7 +70,7 @@ return L.view.extend({ E('div', { 'class': 'th' }, _('Command')), E('div', { 'class': 'th' }, _('CPU usage (%)')), E('div', { 'class': 'th' }, _('Memory usage (%)')), - E('div', { 'class': 'th center' }, _('Actions')) + E('div', { 'class': 'th center nowrap cbi-section-actions' }) ]) ]) ]); |