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

modules/admin-full: several white-space fixes for Bootstrap

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-12-02 14:20:42 +00:00
parent 564ca0accd
commit fb9d3ce2b6
3 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/admin-full/luasrc/view/admin_status/index.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$
-%> -%>
<% <%
@ -432,22 +430,22 @@ $Id$
tr.insertCell(-1).innerHTML = assoclist[i].bssid; tr.insertCell(-1).innerHTML = assoclist[i].bssid;
tr.insertCell(-1).innerHTML = String.format( tr.insertCell(-1).innerHTML = String.format(
'<a href="%s">%h</a>', '<a href="%s">%s</a>',
assoclist[i].link, assoclist[i].link,
assoclist[i].name '%h'.format(assoclist[i].name).nobr()
); );
tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal); tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal).nobr();
tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise); tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise).nobr();
tr.insertCell(-1).innerHTML = (assoclist[i].rx_mcs > -1) tr.insertCell(-1).innerHTML = (assoclist[i].rx_mcs > -1)
? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20) ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20).nobr()
: String.format('%.1f <%:Mbit/s%>', assoclist[i].rx_rate / 1000) : String.format('%.1f <%:Mbit/s%>', assoclist[i].rx_rate / 1000).nobr()
; ;
tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1) tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1)
? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20) ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20).nobr()
: String.format('%.1f <%:Mbit/s%>', assoclist[i].tx_rate / 1000) : String.format('%.1f <%:Mbit/s%>', assoclist[i].tx_rate / 1000).nobr()
; ;
} }

6
modules/admin-full/luasrc/view/admin_status/load.htm
View file

@ -257,7 +257,7 @@ You may obtain a copy of the License at
<table style="width:100%; table-layout:fixed" cellspacing="5"> <table style="width:100%; table-layout:fixed" cellspacing="5">
<tr> <tr>
<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff0000"><%:1 Minute Load:%></strong></td> <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff0000; white-space:nowrap"><%:1 Minute Load:%></strong></td>
<td id="lb_load01_cur">0</td> <td id="lb_load01_cur">0</td>
<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
@ -267,7 +267,7 @@ You may obtain a copy of the License at
<td id="lb_load01_peak">0</td> <td id="lb_load01_peak">0</td>
</tr> </tr>
<tr> <tr>
<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff6600"><%:5 Minute Load:%></strong></td> <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff6600; white-space:nowrap"><%:5 Minute Load:%></strong></td>
<td id="lb_load05_cur">0</td> <td id="lb_load05_cur">0</td>
<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
@ -277,7 +277,7 @@ You may obtain a copy of the License at
<td id="lb_load05_peak">0</td> <td id="lb_load05_peak">0</td>
</tr> </tr>
<tr> <tr>
<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ffaa00"><%:15 Minute Load:%></strong></td> <td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ffaa00; white-space:nowrap"><%:15 Minute Load:%></strong></td>
<td id="lb_load15_cur">0</td> <td id="lb_load15_cur">0</td>
<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td> <td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>

14
modules/admin-full/luasrc/view/admin_status/wireless.htm
View file

@ -8,8 +8,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$
-%> -%>
<%- <%-
@ -304,14 +302,14 @@ $Id$
label_50_2.firstChild.data = rate_label(1.1 * 0.50 * data_max_2); label_50_2.firstChild.data = rate_label(1.1 * 0.50 * data_max_2);
label_75_2.firstChild.data = rate_label(1.1 * 0.75 * data_max_2); label_75_2.firstChild.data = rate_label(1.1 * 0.75 * data_max_2);
label_rssi_cur.innerHTML = wireless_label(data_rssi[data_rssi.length-1], data_noise[data_noise.length-1]); label_rssi_cur.innerHTML = wireless_label(data_rssi[data_rssi.length-1], data_noise[data_noise.length-1]).nobr();
label_noise_cur.innerHTML = wireless_label(data_noise[data_noise.length-1]); label_noise_cur.innerHTML = wireless_label(data_noise[data_noise.length-1]).nobr();
label_rssi_avg.innerHTML = wireless_label(data_rssi_avg, data_noise_avg); label_rssi_avg.innerHTML = wireless_label(data_rssi_avg, data_noise_avg).nobr();
label_noise_avg.innerHTML = wireless_label(data_noise_avg); label_noise_avg.innerHTML = wireless_label(data_noise_avg).nobr();
label_rssi_peak.innerHTML = wireless_label(data_rssi_peak, data_noise_peak); label_rssi_peak.innerHTML = wireless_label(data_rssi_peak, data_noise_peak).nobr();
label_noise_peak.innerHTML = wireless_label(data_noise_peak); label_noise_peak.innerHTML = wireless_label(data_noise_peak).nobr();
label_rate_cur.innerHTML = rate_label(data_rate[data_rate.length-1]); label_rate_cur.innerHTML = rate_label(data_rate[data_rate.length-1]);
label_rate_avg.innerHTML = rate_label(data_rate_avg); label_rate_avg.innerHTML = rate_label(data_rate_avg);