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

modules/admin-full: fix word wrapping in wifi overview page when using bootstrap theme

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-11-21 17:04:12 +00:00
parent dfdd128c4b
commit 9aad27f48e
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
View file

@ -9,8 +9,6 @@ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
$Id$
-%> -%>
<%- <%-
@ -124,6 +122,10 @@ $Id$
var is_reconnecting = false; var is_reconnecting = false;
function nowrap(s) {
return s.replace(/ /g, '&#160;');
}
function wifi_shutdown(id, toggle) { function wifi_shutdown(id, toggle) {
var reconnect = (toggle.getAttribute('active') == 'false'); var reconnect = (toggle.getAttribute('active') == 'false');
@ -300,24 +302,24 @@ $Id$
icon, assoclist[j].signal, assoclist[j].noise icon, assoclist[j].signal, assoclist[j].noise
); );
tr.insertCell(-1).innerHTML = String.format('%h', iw.ssid ? iw.ssid : '?'); tr.insertCell(-1).innerHTML = nowrap(String.format('%h', iw.ssid ? iw.ssid : '?'));
tr.insertCell(-1).innerHTML = assoclist[j].bssid; tr.insertCell(-1).innerHTML = assoclist[j].bssid;
tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid] tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid]
? arptable[assoclist[j].bssid] : '?'; ? arptable[assoclist[j].bssid] : '?';
tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[j].signal); tr.insertCell(-1).innerHTML = nowrap(String.format('%d <%:dBm%>', assoclist[j].signal));
tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[j].noise); tr.insertCell(-1).innerHTML = nowrap(String.format('%d <%:dBm%>', assoclist[j].noise));
tr.insertCell(-1).innerHTML = (assoclist[j].rx_mcs > -1) tr.insertCell(-1).innerHTML = nowrap((assoclist[j].rx_mcs > -1)
? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20) ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20)
: String.format('%.1f <%:Mbit/s%>', assoclist[j].rx_rate / 1000) : String.format('%.1f <%:Mbit/s%>', assoclist[j].rx_rate / 1000)
; );
tr.insertCell(-1).innerHTML = (assoclist[j].tx_mcs > -1) tr.insertCell(-1).innerHTML = nowrap((assoclist[j].tx_mcs > -1)
? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20) ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20)
: String.format('%.1f <%:Mbit/s%>', assoclist[j].tx_rate / 1000) : String.format('%.1f <%:Mbit/s%>', assoclist[j].tx_rate / 1000)
; );
rowstyle = (rowstyle == 1) ? 2 : 1; rowstyle = (rowstyle == 1) ? 2 : 1;
} }