From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/monitor/show_data.php | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index c8f46bb..f6940cf 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -53,6 +53,7 @@
$time = $app->tools_monitor->getDataTime('server_load');
$title = $app->lng("Server Load").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
case 'disk_usage':
$template = 'templates/show_data.htm';
@@ -95,6 +96,7 @@
$time = $app->tools_monitor->getDataTime('openvz_beancounter');
$title = $app->lng("monitor_title_beancounter_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
case 'system_update':
$template = 'templates/show_data.htm';
@@ -102,6 +104,7 @@
$time = $app->tools_monitor->getDataTime('system_update');
$title = $app->lng("monitor_title_updatestate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
case 'mailq':
$template = 'templates/show_data.htm';
@@ -109,6 +112,7 @@
$time = $app->tools_monitor->getDataTime('mailq');
$title = $app->lng("monitor_title_mailq_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
case 'raid_state':
$template = 'templates/show_data.htm';
@@ -116,6 +120,7 @@
$time = $app->tools_monitor->getDataTime('raid_state');
$title = $app->lng("monitor_title_raidstate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
case 'rkhunter':
$template = 'templates/show_data.htm';
@@ -123,6 +128,7 @@
$time = $app->tools_monitor->getDataTime('rkhunter');
$title = $app->lng("monitor_title_rkhunterlog_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
case 'fail2ban':
$template = 'templates/show_data.htm';
@@ -130,6 +136,7 @@
$time = $app->tools_monitor->getDataTime('log_fail2ban');
$title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
case 'mongodb':
$template = 'templates/show_data.htm';
@@ -144,12 +151,17 @@
$time = $app->tools_monitor->getDataTime('iptables_rules');
$title = $app->lng("monitor_title_iptables_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
+ $add_padding = true;
break;
default:
$template = '';
break;
}
+if($add_padding == true) {
+$output = '<div style="padding:20px;">'.$output.'</div>';
+}
+
// Loading the template
$app->uses('tpl');
--
Gitblit v1.9.1