From ef55b578effea959ed4fdcdb0fd4bbab38209fef Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 06 Sep 2012 11:21:32 -0400
Subject: [PATCH] - New feature: you can now add directive snippets for Apache, nginx, and PHP under System > Directive Snippets. These snippets are then available on the Options tab of a web site where they can be easily added to the respective textarea by simply clicking the name of the directive snippet.
---
interface/web/monitor/show_sys_state.php | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 634880c..92f9f15 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -29,7 +29,6 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-require_once('tools.inc.php');
/* Check permissions for module */
$app->auth->check_module_permissions('monitor');
@@ -222,45 +221,53 @@
/*
* Info of a VE inside a OpenVz-Host
*/
- $html_ve = '<div class="systemmonitor-state state-' . $serverState . '-ve">';
- $html_ve .= '<div class="systemmonitor-device device-ve">';
- $html_ve .= '<div class="systemmonitor-content icons32 ico-' . $serverState . '">';
- $html_ve .= $serverName . '<br>';
+ $html_ve = '<div class="systemmonitor-ve state-' . $serverState . '-ve os-' . $osData['name'] . '">';
+ if ($osData != null) {
+ $html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
+ }
+ else {
+ $html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
+ }
+ $html_ve .= '<div class="statusDevice"><p>' . $serverName;
if ($osData != null) {
- $html_ve .= $osData['name'] . ' ' . $osData['version'] . '<br>';
+ $html_ve .= ' (' . $osData['name'] . ' ' . $osData['version'] . ') ';
}
if ($ispcData != null) {
- $html_ve .= $ispcData['name'] . ' ' . $ispcData['version'] . '<br>';
+ $html_ve .= $ispcData['name'] . ' ' . $ispcData['version'] . '</p>';
}
- $html_ve .= $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . '<br>';
+ else {
+ $html_ve .= '</p>';
+ }
+ $html_ve .= '<p>' . $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . '</p>';
/*
* Info of a "normal" Server or a OpenVz-Host
*/
- $html_server = '<div class="systemmonitor-state state-' . $serverState . '">';
- $html_server .= '<div class="systemmonitor-device device-server">';
- $html_server .= '<div class="systemmonitor-content icons32 ico-' . $serverState . '">';
- $html_server .= $app->lng("monitor_serverstate_server_txt") . ': ' . $serverName;
+ $html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">';
if ($osData != null) {
- $html_server .= ' (' . $osData['name'] . ' ' . $osData['version'] . ')<br>';
- }
- else {
- $html_server .= '<br />';
+ $html_server .= '<div class="icoDevice"><p class="status"></p></div>';
+ }
+ else {
+ $html_server .= '<div class="icoDevice"><p class="status"></p></div>';
+ }
+ $html_server .= '<div class="statusDevice"><p>' . $app->lng("monitor_serverstate_server_txt") . ': ' . $serverName;
+ if ($osData != null) {
+ $html_server .= ' (' . $osData['name'] . ' ' . $osData['version'] . ') ';
}
if ($ispcData != null) {
- $html_server .= $ispcData['name'] . ' ' . $ispcData['version'] . '<br>';
+ $html_server .= $ispcData['name'] . ' ' . $ispcData['version'] . '</p>';
}
- else {
- $html_server .= '<br />';
- }
+ else {
+ $html_server .= '</p>';
+ }
- $html_server .= $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . ' (';
+ $html_server .= '<p>' . $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . ' (';
$html_server .= sizeof((isset($messages[$app->lng("monitor_serverstate_listunknown_txt")]) ? $messages[$app->lng("monitor_serverstate_listunknown_txt")] : array())) . ' ' . $app->lng("monitor_serverstate_unknown_txt") . ', ';
$html_server .= sizeof((isset($messages[$app->lng("monitor_serverstate_listinfo_txt")]) ? $messages[$app->lng("monitor_serverstate_listinfo_txt")] : array())) . ' ' . $app->lng("monitor_serverstate_info_txt") . ', ';
$html_server .= sizeof((isset($messages[$app->lng("monitor_serverstate_listwarning_txt")]) ? $messages[$app->lng("monitor_serverstate_listwarning_txt")] : array())) . ' ' . $app->lng("monitor_serverstate_warning_txt") . ', ';
$html_server .= sizeof((isset($messages[$app->lng("monitor_serverstate_listcritical_txt")]) ? $messages[$app->lng("monitor_serverstate_listcritical_txt")] : array())) . ' ' . $app->lng("monitor_serverstate_critical_txt") . ', ';
$html_server .= sizeof((isset($messages[$app->lng("monitor_serverstate_listerror_txt")]) ? $messages[$app->lng("monitor_serverstate_listerror_txt")] : array())) . ' ' . $app->lng("monitor_serverstate_error_txt") . '';
- $html_server .= ')<br />';
+ $html_server .= ')</p>';
/*
* Verbose - Info
@@ -283,9 +290,9 @@
/*
* Finish all html's
*/
- $html_ve .= '</div></div></div>';
- $html_server .= '<div>##VE_INFO##</div></div></div></div>';
- $html_verbose .= '</div></div></div>';
+ $html_ve .= '</div></div>';
+ $html_server .= '<div>##VE_INFO##</div></div></div>';
+ $html_verbose .= '</div></div>';
/*
* create and return the result
--
Gitblit v1.9.1