Changes specific to darnassus.sceen.netHEADdarnassus

1 files changed, 83 insertions, 68 deletions

diff --git a/index.php b/index.php
index fbf0c09..9a5c3d2 100644
--- a/index.php
+++ b/index.php
@@ -110,12 +110,87 @@ $update = $Config->checkUpdate();
                         <td>Server date & time</td>
                         <td id="system-server_date"></td>
                     </tr>
+                    <tr>
+                        <td>Load average</td>
+                        <td id="system-load_avg"></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="box column-right" id="esm-memory">
+        <div class="box-header">
+            <h1>Memory</h1>
+            <ul>
+                <li><a href="#" class="reload" onclick="esm.reloadBlock('memory');"><span class="icon-cycle"></span></a></li>
+            </ul>
+        </div>
+
+        <div class="box-content">
+            <table class="firstBold">
+                <tbody>
+                    <tr>
+                        <td class="w20p">Used %</td>
+                        <td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td>
+                    </tr>
+                    <tr>
+                        <td class="w20p">Used</td>
+                        <td id="memory-used"></td>
+                    </tr>
+                    <tr>
+                        <td class="w20p">Buffers/Cache</td>
+                        <td id="memory-cached"></td>
+                    </tr>
+                    <tr>
+                        <td class="w20p">Free</td>
+                        <td id="memory-free"></td>
+                    </tr>
+                    <tr>
+                        <td class="w20p">Total</td>
+                        <td id="memory-total"></td>
+                    </tr>
                 </tbody>
             </table>
         </div>
     </div>
 
-    <div class="box column-right" id="esm-load_average">
+
+    <div class="box column-right" id="esm-swap">
+        <div class="box-header">
+            <h1>Swap</h1>
+            <ul>
+                <li><a href="#" class="reload" onclick="esm.reloadBlock('swap');"><span class="icon-cycle"></span></a></li>
+            </ul>
+        </div>
+
+        <div class="box-content">
+            <table class="firstBold">
+                <tbody>
+                    <tr>
+                        <td class="w20p">Used %</td>
+                        <td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td>
+                    </tr>
+                    <tr>
+                        <td class="w20p">Used</td>
+                        <td id="swap-used"></td>
+                    </tr>
+                    <tr>
+                        <td class="w20p">Free</td>
+                        <td id="swap-free"></td>
+                    </tr>
+                    <tr>
+                        <td class="w20p">Total</td>
+                        <td id="swap-total"></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+
+<!--
+    <div class="box column-left" id="esm-load_average">
         <div class="box-header">
             <h1>Load Average</h1>
             <ul>
@@ -140,9 +215,10 @@ $update = $Config->checkUpdate();
             </div>
         </div>
     </div>
+-->
 
 
-
+<!--
     <div class="box column-right" id="esm-cpu">
         <div class="box-header">
             <h1>CPU</h1>
@@ -184,9 +260,11 @@ $update = $Config->checkUpdate();
             </table>
         </div>
     </div>
+-->
 
 
 
+<!--
     <div class="box column-left" id="esm-network">
         <div class="box-header">
             <h1>Network usage</h1>
@@ -209,6 +287,7 @@ $update = $Config->checkUpdate();
             </table>
         </div>
     </div>
+-->
 
 
     <div class="cls"></div>
@@ -246,72 +325,7 @@ $update = $Config->checkUpdate();
 
 
 
-
-    <div class="box column-left" id="esm-memory">
-        <div class="box-header">
-            <h1>Memory</h1>
-            <ul>
-                <li><a href="#" class="reload" onclick="esm.reloadBlock('memory');"><span class="icon-cycle"></span></a></li>
-            </ul>
-        </div>
-
-        <div class="box-content">
-            <table class="firstBold">
-                <tbody>
-                    <tr>
-                        <td class="w20p">Used %</td>
-                        <td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td>
-                    </tr>
-                    <tr>
-                        <td class="w20p">Used</td>
-                        <td id="memory-used"></td>
-                    </tr>
-                    <tr>
-                        <td class="w20p">Free</td>
-                        <td id="memory-free"></td>
-                    </tr>
-                    <tr>
-                        <td class="w20p">Total</td>
-                        <td id="memory-total"></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    <div class="box column-right" id="esm-swap">
-        <div class="box-header">
-            <h1>Swap</h1>
-            <ul>
-                <li><a href="#" class="reload" onclick="esm.reloadBlock('swap');"><span class="icon-cycle"></span></a></li>
-            </ul>
-        </div>
-
-        <div class="box-content">
-            <table class="firstBold">
-                <tbody>
-                    <tr>
-                        <td class="w20p">Used %</td>
-                        <td><div class="progressbar-wrap"><div class="progressbar" style="width: 0%;">0%</div></div></td>
-                    </tr>
-                    <tr>
-                        <td class="w20p">Used</td>
-                        <td id="swap-used"></td>
-                    </tr>
-                    <tr>
-                        <td class="w20p">Free</td>
-                        <td id="swap-free"></td>
-                    </tr>
-                    <tr>
-                        <td class="w20p">Total</td>
-                        <td id="swap-total"></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-
+<!--
     <div class="cls"></div>
 
 
@@ -377,6 +391,7 @@ $update = $Config->checkUpdate();
     <div class="cls"></div>
 
 </div>
+-->