From 9cd0f6e2287a9c91603ca8c594b961b0f7a78a8b Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Tue, 25 Nov 2008 16:23:51 -0500
Subject: [PATCH] some improvement of the monitor output 

---
 interface/web/monitor/tools.inc.php |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index 5780a25..1def6aa 100644
--- a/interface/web/monitor/tools.inc.php
+++ b/interface/web/monitor/tools.inc.php
@@ -39,7 +39,9 @@
         Format the data
         */
         $html =
-        '<table id="system_load">
+           '<div class="systemmonitor-state systemmonitor-state-' . $record['state'] . '">
+            <div class="systemmonitor-state-' . $record['state'] . '-icon">
+            <table>
             <tr>
             <td>' . $app->lng("Server online since").':</td>
             <td>' . $data['up_days'] . ' days, ' . $data['up_hours'] . ':' . $data['up_minutes'] . ' hours</center></td>
@@ -60,7 +62,9 @@
             <td>'.$app->lng("System load 15 minutes").':</td>
             <td>' . $data['load_15'] . '</td>
             </tr>
-            </table>';
+            </table>
+            </div>
+            </div>';
     } else {
         $html = '<p>'.$app->lng("no_data_serverload_txt").'</p>';
     }
@@ -80,7 +84,18 @@
         /*
         Format the data
         */
-        $html = '<table id="system_disk">';
+        $html =
+           '<div class="systemmonitor-state systemmonitor-state-' . $record['state'] . '">
+            <div class="systemmonitor-state-' . $record['state'] . '-icon">
+            <table>
+            <tr>
+            <td>Filesystem</td>
+            <td>1K-blocks</td>
+            <td>Used</td>
+            <td>Available</td>
+            <td>Use%</td>
+            <td>Mounted on</td>
+            </tr>';
         foreach($data as $line) {
             $html .= '<tr>';
             foreach ($line as $item) {
@@ -89,6 +104,7 @@
             $html .= '</tr>';
         }
         $html .= '</table>';
+        $html .= '</div></div>';
     } else {
         $html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
     }
@@ -111,7 +127,10 @@
         /*
         Format the data
         */
-        $html = '<table id="system_memusage">';
+        $html =
+           '<div class="systemmonitor-state systemmonitor-state-' . $record['state'] . '">
+            <div class="systemmonitor-state-' . $record['state'] . '-icon">
+            <table>';
 
         foreach($data as $key => $value){
             if ($key != '') {
@@ -122,6 +141,8 @@
             }
         }
         $html .= '</table>';
+        $html .= '</div></div>';
+
     } else {
         $html = '<p>'.$app->lng("no_data_memusage_txt").'</p>';
     }
@@ -142,7 +163,10 @@
         /*
         Format the data
         */
-        $html = '<table id="system_cpu">';
+        $html = 
+           '<div class="systemmonitor-state systemmonitor-state-' . $record['state'] . '">
+            <div class="systemmonitor-state-' . $record['state'] . '-icon">
+            <table>';
         foreach($data as $key => $value){
             if ($key != '') {
                 $html .= '<tr>
@@ -152,6 +176,7 @@
             }
         }
         $html .= '</table>';
+        $html .= '</div></div>';
     } else {
         $html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
     }
@@ -172,7 +197,10 @@
         /*
         Format the data
         */
-        $html = '<table id="system_services">';
+        $html =
+           '<div class="systemmonitor-state systemmonitor-state-' . $record['state'] . '">
+            <div class="systemmonitor-state-' . $record['state'] . '-icon">
+            <table>';
 
         if($data['webserver'] != -1) {
             if($data['webserver'] == 1) {
@@ -260,7 +288,7 @@
         }
 
 
-        $html .= '</table></div>';
+        $html .= '</table></div></div>';
     } else {
         $html = '<p>'.$app->lng("no_data_services_txt").'</p>';
     }
@@ -277,17 +305,21 @@
     $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'system_update' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
 
     if(isset($record['data'])) {
+        $html =
+           '<div class="systemmonitor-state systemmonitor-state-' . $record['state'] . '">
+            <div class="systemmonitor-state-' . $record['state'] . '-icon">';
         /*
          * First, we have to detect, if there is any monitoring-data.
          * If not (because the destribution is not supported) show this.
          */
         if ($record['state'] == 'no_state'){
-            $html = '<p>' . "Your distribution is not supported for this monitoring" . '</p>';
+            $html .= "Your distribution is not supported for this monitoring";
         }
         else {
             $data = unserialize($record['data']);
-            $html = nl2br($data['output']);
+            $html .= nl2br($data['output']);
         }
+        $html .= '</div></div>';
     } else {
         $html = '<p>' . "No Update-Data available" . '</p>';
     }
@@ -303,17 +335,23 @@
     $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'raid_state' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
 
     if(isset($record['data'])) {
+        $html =
+           '<div class="systemmonitor-state systemmonitor-state-' . $record['state'] . '">
+            <div class="systemmonitor-state-' . $record['state'] . '-icon">';
+
         /*
          * First, we have to detect, if there is any monitoring-data.
          * If not (because the destribution is not supported) show this.
          */
         if ($record['state'] == 'no_state'){
-            $html = '<p>' . "mdadm ist not installed or your Server has no supported RAID" . '</p>';
+            $html .= '<p>' . "mdadm ist not installed or your Server has no supported RAID" . '</p>';
         }
         else {
             $data = unserialize($record['data']);
-            $html = nl2br($data['output']);
+            $html .= nl2br($data['output']);
         }
+        $html .= '</div></div>';
+
     } else {
         $html = '<p>' . "No RAID-Data available" . '</p>';
     }

--
Gitblit v1.9.1