modules/admin-full: several white-space fixes for Bootstrap
[project/luci.git] / modules / admin-full / luasrc / view / admin_status / load.htm
index d1b602c..a002715 100644 (file)
@@ -8,8 +8,6 @@ You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
-$Id$
-
 -%>
 
 <%+header%>
@@ -59,121 +57,6 @@ $Id$
        var label_scale;
 
 
-       function update_graph()
-       {
-               bwxhr.get('<%=build_url("admin/status/load_status")%>', null,
-                       function(x, data)
-                       {
-                               var data_max   = 0;
-                               var data_scale = 0;
-
-                               var data_01_avg = 0;
-                               var data_05_avg = 0;
-                               var data_15_avg = 0;
-
-                               var data_01_peak = 0;
-                               var data_05_peak = 0;
-                               var data_15_peak = 0;
-
-                               for (var i = data_stamp ? 0 : 1; i < data.length; i++)
-                               {
-                                       /* skip overlapping entries */
-                                       if (data[i][TIME] <= data_stamp)
-                                               continue;
-
-                                       data_01.push(data[i][L01]);
-                                       data_05.push(data[i][L05]);
-                                       data_15.push(data[i][L15]);
-                               }
-
-                               /* cut off outdated entries */
-                               data_01 = data_01.slice(data_01.length - data_wanted, data_01.length);
-                               data_05 = data_05.slice(data_05.length - data_wanted, data_05.length);
-                               data_15 = data_15.slice(data_15.length - data_wanted, data_15.length);
-
-                               /* find peak */
-                               for (var i = 0; i < data_01.length; i++)
-                               {
-                                       data_max = Math.max(data_max, data_01[i]);
-                                       data_max = Math.max(data_max, data_05[i]);
-                                       data_max = Math.max(data_max, data_15[i]);
-
-                                       data_01_peak = Math.max(data_01_peak, data_01[i]);
-                                       data_05_peak = Math.max(data_05_peak, data_05[i]);
-                                       data_15_peak = Math.max(data_15_peak, data_15[i]);
-
-                                       if (i > 0)
-                                       {
-                                               data_01_avg = (data_01_avg + data_01[i]) / 2;
-                                               data_05_avg = (data_05_avg + data_05[i]) / 2;
-                                               data_15_avg = (data_15_avg + data_15[i]) / 2;
-                                       }
-                                       else
-                                       {
-                                               data_01_avg = data_01[i];
-                                               data_05_avg = data_05[i];
-                                               data_15_avg = data_15[i];
-                                       }
-                               }
-
-                               /* remember current timestamp, calculate horizontal scale */
-                               data_stamp = data[data.length-1][TIME];
-                               data_scale = height / (data_max * 1.1);
-
-
-                               /* plot data */
-                               var pt_01 = '0,' + height;
-                               var pt_05 = '0,' + height;
-                               var pt_15 = '0,' + height;
-
-                               var y_01 = 0;
-                               var y_05 = 0;
-                               var y_15 = 0;
-
-                               for (var i = 0; i < data_01.length; i++)
-                               {
-                                       var x = i * step;
-
-                                       y_01 = height - Math.floor(data_01[i] * data_scale);
-                                       y_05 = height - Math.floor(data_05[i] * data_scale);
-                                       y_15 = height - Math.floor(data_15[i] * data_scale);
-
-                                       pt_01 += ' ' + x + ',' + y_01;
-                                       pt_05 += ' ' + x + ',' + y_05;
-                                       pt_15 += ' ' + x + ',' + y_15;
-                               }
-
-                               pt_01 += ' ' + width + ',' + y_01 + ' ' + width + ',' + height;
-                               pt_05 += ' ' + width + ',' + y_05 + ' ' + width + ',' + height;
-                               pt_15 += ' ' + width + ',' + y_15 + ' ' + width + ',' + height;
-
-
-                               line_01.setAttribute('points', pt_01);
-                               line_05.setAttribute('points', pt_05);
-                               line_15.setAttribute('points', pt_15);
-
-                               label_25.firstChild.data = (1.1 * 0.25 * data_max / 100).toFixed(2);
-                               label_50.firstChild.data = (1.1 * 0.50 * data_max / 100).toFixed(2);
-                               label_75.firstChild.data = (1.1 * 0.75 * data_max / 100).toFixed(2);
-
-                               label_01_cur.innerHTML = (data_01[data_01.length-1] / 100).toFixed(2);
-                               label_05_cur.innerHTML = (data_05[data_05.length-1] / 100).toFixed(2);
-                               label_15_cur.innerHTML = (data_01[data_15.length-1] / 100).toFixed(2);
-
-                               label_01_avg.innerHTML = (data_01_avg / 100).toFixed(2);
-                               label_05_avg.innerHTML = (data_05_avg / 100).toFixed(2);
-                               label_15_avg.innerHTML = (data_15_avg / 100).toFixed(2);
-
-                               label_01_peak.innerHTML = (data_01_peak / 100).toFixed(2);
-                               label_05_peak.innerHTML = (data_05_peak / 100).toFixed(2);
-                               label_15_peak.innerHTML = (data_15_peak / 100).toFixed(2);
-
-                               /* reset timer */
-                               window.setTimeout(update_graph, 1000);
-                       }
-               )
-       }
-
        /* wait for SVG */
        window.setTimeout(
                function() {
@@ -231,7 +114,7 @@ $Id$
 
 
                                /* plot horizontal time interval lines */
-                               for (var i = step * 60; i < width; i += step * 60)
+                               for (var i = width % (step * 60); i < width; i += step * 60)
                                {
                                        var line = G.createElementNS('http://www.w3.org/2000/svg', 'line');
                                                line.setAttribute('x1', i);
@@ -244,16 +127,123 @@ $Id$
                                                text.setAttribute('x', i + 5);
                                                text.setAttribute('y', 15);
                                                text.setAttribute('style', 'fill:#999999; font-size:9pt');
-                                               text.appendChild(G.createTextNode(Math.round(i / step / 60) + 'm'));
+                                               text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
 
                                        label_25.parentNode.appendChild(line);
                                        label_25.parentNode.appendChild(text);
                                }
 
-                               label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 1);
+                               label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
 
                                /* render datasets, start update interval */
-                               update_graph();
+                               XHR.poll(3, '<%=build_url("admin/status/realtime/load_status")%>', null,
+                                       function(x, data)
+                                       {
+                                               var data_max   = 0;
+                                               var data_scale = 0;
+
+                                               var data_01_avg = 0;
+                                               var data_05_avg = 0;
+                                               var data_15_avg = 0;
+
+                                               var data_01_peak = 0;
+                                               var data_05_peak = 0;
+                                               var data_15_peak = 0;
+
+                                               for (var i = data_stamp ? 0 : 1; i < data.length; i++)
+                                               {
+                                                       /* skip overlapping entries */
+                                                       if (data[i][TIME] <= data_stamp)
+                                                               continue;
+
+                                                       data_01.push(data[i][L01]);
+                                                       data_05.push(data[i][L05]);
+                                                       data_15.push(data[i][L15]);
+                                               }
+
+                                               /* cut off outdated entries */
+                                               data_01 = data_01.slice(data_01.length - data_wanted, data_01.length);
+                                               data_05 = data_05.slice(data_05.length - data_wanted, data_05.length);
+                                               data_15 = data_15.slice(data_15.length - data_wanted, data_15.length);
+
+                                               /* find peak */
+                                               for (var i = 0; i < data_01.length; i++)
+                                               {
+                                                       data_max = Math.max(data_max, data_01[i]);
+                                                       data_max = Math.max(data_max, data_05[i]);
+                                                       data_max = Math.max(data_max, data_15[i]);
+
+                                                       data_01_peak = Math.max(data_01_peak, data_01[i]);
+                                                       data_05_peak = Math.max(data_05_peak, data_05[i]);
+                                                       data_15_peak = Math.max(data_15_peak, data_15[i]);
+
+                                                       if (i > 0)
+                                                       {
+                                                               data_01_avg = (data_01_avg + data_01[i]) / 2;
+                                                               data_05_avg = (data_05_avg + data_05[i]) / 2;
+                                                               data_15_avg = (data_15_avg + data_15[i]) / 2;
+                                                       }
+                                                       else
+                                                       {
+                                                               data_01_avg = data_01[i];
+                                                               data_05_avg = data_05[i];
+                                                               data_15_avg = data_15[i];
+                                                       }
+                                               }
+
+                                               /* remember current timestamp, calculate horizontal scale */
+                                               data_stamp = data[data.length-1][TIME];
+                                               data_scale = height / (data_max * 1.1);
+
+
+                                               /* plot data */
+                                               var pt_01 = '0,' + height;
+                                               var pt_05 = '0,' + height;
+                                               var pt_15 = '0,' + height;
+
+                                               var y_01 = 0;
+                                               var y_05 = 0;
+                                               var y_15 = 0;
+
+                                               for (var i = 0; i < data_01.length; i++)
+                                               {
+                                                       var x = i * step;
+
+                                                       y_01 = height - Math.floor(data_01[i] * data_scale);
+                                                       y_05 = height - Math.floor(data_05[i] * data_scale);
+                                                       y_15 = height - Math.floor(data_15[i] * data_scale);
+
+                                                       pt_01 += ' ' + x + ',' + y_01;
+                                                       pt_05 += ' ' + x + ',' + y_05;
+                                                       pt_15 += ' ' + x + ',' + y_15;
+                                               }
+
+                                               pt_01 += ' ' + width + ',' + y_01 + ' ' + width + ',' + height;
+                                               pt_05 += ' ' + width + ',' + y_05 + ' ' + width + ',' + height;
+                                               pt_15 += ' ' + width + ',' + y_15 + ' ' + width + ',' + height;
+
+
+                                               line_01.setAttribute('points', pt_01);
+                                               line_05.setAttribute('points', pt_05);
+                                               line_15.setAttribute('points', pt_15);
+
+                                               label_25.firstChild.data = (1.1 * 0.25 * data_max / 100).toFixed(2);
+                                               label_50.firstChild.data = (1.1 * 0.50 * data_max / 100).toFixed(2);
+                                               label_75.firstChild.data = (1.1 * 0.75 * data_max / 100).toFixed(2);
+
+                                               label_01_cur.innerHTML = (data_01[data_01.length-1] / 100).toFixed(2);
+                                               label_05_cur.innerHTML = (data_05[data_05.length-1] / 100).toFixed(2);
+                                               label_15_cur.innerHTML = (data_15[data_15.length-1] / 100).toFixed(2);
+
+                                               label_01_avg.innerHTML = (data_01_avg / 100).toFixed(2);
+                                               label_05_avg.innerHTML = (data_05_avg / 100).toFixed(2);
+                                               label_15_avg.innerHTML = (data_15_avg / 100).toFixed(2);
+
+                                               label_01_peak.innerHTML = (data_01_peak / 100).toFixed(2);
+                                               label_05_peak.innerHTML = (data_05_peak / 100).toFixed(2);
+                                               label_15_peak.innerHTML = (data_15_peak / 100).toFixed(2);
+                                       }
+                               );
                        }
                }, 1000
        );
@@ -267,7 +257,7 @@ $Id$
 
 <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>
@@ -277,7 +267,7 @@ $Id$
                <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>
@@ -287,7 +277,7 @@ $Id$
                <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>