From fb9d3ce2b671a051adaa188de016d8ead19e1385 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 2 Dec 2012 14:20:42 +0000 Subject: [PATCH] modules/admin-full: several white-space fixes for Bootstrap --- .../luasrc/view/admin_status/index.htm | 18 ++++++++---------- .../luasrc/view/admin_status/load.htm | 6 +++--- .../luasrc/view/admin_status/wireless.htm | 14 ++++++-------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm index 003ec31031..f8707c05dd 100644 --- a/modules/admin-full/luasrc/view/admin_status/index.htm +++ b/modules/admin-full/luasrc/view/admin_status/index.htm @@ -9,8 +9,6 @@ You may obtain a copy of the License at 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 = String.format( - '%h', + '%s', 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].noise); + tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal).nobr(); + tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise).nobr(); 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%>', assoclist[i].rx_rate / 1000) + ? 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).nobr() ; 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%>', assoclist[i].tx_rate / 1000) + ? 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).nobr() ; } diff --git a/modules/admin-full/luasrc/view/admin_status/load.htm b/modules/admin-full/luasrc/view/admin_status/load.htm index 062874851e..a002715ec8 100644 --- a/modules/admin-full/luasrc/view/admin_status/load.htm +++ b/modules/admin-full/luasrc/view/admin_status/load.htm @@ -257,7 +257,7 @@ You may obtain a copy of the License at - + @@ -267,7 +267,7 @@ You may obtain a copy of the License at - + @@ -277,7 +277,7 @@ You may obtain a copy of the License at - + diff --git a/modules/admin-full/luasrc/view/admin_status/wireless.htm b/modules/admin-full/luasrc/view/admin_status/wireless.htm index ff8382bf0b..465143ebce 100644 --- a/modules/admin-full/luasrc/view/admin_status/wireless.htm +++ b/modules/admin-full/luasrc/view/admin_status/wireless.htm @@ -8,8 +8,6 @@ You may obtain a copy of the License at 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_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_noise_cur.innerHTML = wireless_label(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]).nobr(); - label_rssi_avg.innerHTML = wireless_label(data_rssi_avg, data_noise_avg); - label_noise_avg.innerHTML = wireless_label(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).nobr(); - label_rssi_peak.innerHTML = wireless_label(data_rssi_peak, data_noise_peak); - label_noise_peak.innerHTML = wireless_label(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).nobr(); label_rate_cur.innerHTML = rate_label(data_rate[data_rate.length-1]); label_rate_avg.innerHTML = rate_label(data_rate_avg); -- 2.30.2
<%:1 Minute Load:%><%:1 Minute Load:%> 0 <%:Average:%>0
<%:5 Minute Load:%><%:5 Minute Load:%> 0 <%:Average:%>0
<%:15 Minute Load:%><%:15 Minute Load:%> 0 <%:Average:%>