From 48d977960db7a3af1474ab6e0850e55a8815002d Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Fri, 29 Mar 2013 23:00:30 -0400
Subject: [PATCH] style fix
---
interface/web/themes/default/css/styles.css | 3 ++-
interface/web/monitor/show_log.php | 12 +++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index cb9e4c1..bb4e3c0 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -129,18 +129,20 @@
$logDataHtml = '';
/* set css class for each line of log, depending on key words in each line */
foreach($logData as $val) {
- if (strpos($val, 'ERROR') !== FALSE) {
+ if (strpos(strtolower($val), 'fatal') !== FALSE) {
$logDataHtml .= "<div class='logerror'>$val</div>";
- } elseif (strpos($val, 'WARN') !== FALSE) {
+ } elseif (strpos(strtolower($val), 'error') !== FALSE) {
+ $logDataHtml .= "<div class='logerror'>$val</div>";
+ } elseif (strpos(strtolower($val), 'warn') !== FALSE) {
$logDataHtml .= "<div class='logwarn'>$val</div>";
- } elseif (strpos($val, 'INFO') !== FALSE) {
+ } elseif (strpos(strtolower($val), 'info') !== FALSE) {
$logDataHtml .= "<div class='loginfo'>$val</div>";
} else {
$logDataHtml .= "<div class='log'>$val</div>";
}
}
-
- $app->tpl->setVar("log_data", $logData);
+
+ $app->tpl->setVar("log_data", $logDataHtml);
} else {
$app->tpl->setVar("log_data", $app->lng("no_logdata_txt"));
}
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index 4696350..8686f3d 100644
--- a/interface/web/themes/default/css/styles.css
+++ b/interface/web/themes/default/css/styles.css
@@ -455,7 +455,7 @@
font-family: Consolas, "Lucida Console", "Courier New", monospace;
font-size: 0.9em;
}
-.codeview .logerror { background: rgb(255,0,0); }
+.codeview .logerror { background: rgb(255,0,0); color: #fff; }
.codeview .logwarn { background: rgb(255,204,0); }
.codeview .loginfo { background: rgb(153,204,255); }
@@ -492,6 +492,7 @@
}
/* Systemmonitor */
+.systemmonitor,
.systemmonitor-server,
.systemmonitor-ve,
.systemmonitor-state {
--
Gitblit v1.9.1