From 113636cce92c9a48ed1f282037f00fb85641fa5c Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 29 Apr 2015 01:31:52 +0100 Subject: [PATCH] Updated alerts status box --- html/includes/print-alerts.php | 2 +- html/includes/table/alerts.inc.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/html/includes/print-alerts.php b/html/includes/print-alerts.php index 645db93cb9..baa18f2d84 100644 --- a/html/includes/print-alerts.php +++ b/html/includes/print-alerts.php @@ -31,7 +31,7 @@ var grid = $("#alerts").bootgrid({ url: "/ajax_table.php", formatters: { "status": function(column,row) { - return "" + row.msg + ""; + return "

" + row.msg + "

"; }, "ack": function(column,row) { return ""; diff --git a/html/includes/table/alerts.inc.php b/html/includes/table/alerts.inc.php index f6f2aa6acb..837e30b358 100644 --- a/html/includes/table/alerts.inc.php +++ b/html/includes/table/alerts.inc.php @@ -65,22 +65,22 @@ foreach (dbFetchRows($sql,$param) as $alert) { $ico = "ok"; $col = "green"; $extra = "success"; - $msg = "OK"; + $msg = "ok"; } elseif ( (int) $alert['state'] === 1 || (int) $alert['state'] === 3 || (int) $alert['state'] === 4) { $ico = "volume-up"; $col = "red"; $extra = "danger"; - $msg = "ALERT"; + $msg = "alert"; if ( (int) $alert['state'] === 3) { - $msg = "WORSE"; + $msg = "worse"; } elseif ( (int) $alert['state'] === 4) { - $msg = "BETTER"; + $msg = "better"; } } elseif ( (int) $alert['state'] === 2) { $ico = "volume-off"; $col = "#800080"; $extra = "warning"; - $msg = "MUTED"; + $msg = "muted"; } $alert_checked = ''; $orig_ico = $ico;