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

diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm
index 003ec31031b91fb8253a183158d3dd9a32e35525..f8707c05dd6783a59c95fd53bd8a39b3d08950ce 100644 (file)
--- 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(
-                                               '<a href="%s">%h</a>',
+                                               '<a href="%s">%s</a>',
                                                        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 062874851e6f02b07761cb8602866946d45970b6..a002715ec8f72ea9141fc15cbb0961ca72053fb7 100644 (file)
--- 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
 
 <table style="width:100%; table-layout:fixed" cellspacing="5">
        <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 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>
        </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 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>
        </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 style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>

diff --git a/modules/admin-full/luasrc/view/admin_status/wireless.htm b/modules/admin-full/luasrc/view/admin_status/wireless.htm
index ff8382bf0b97202a33b16fd8bee6c91bb2ef95ad..465143ebce5e631be2c07756eea094188e7845a9 100644 (file)
--- 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);