From dd0130670fe3cab4c7e2c1ab4f3bf0d2b2d512b0 Mon Sep 17 00:00:00 2001
From: Denny Bortfeldt <denny@bortfeldt.net>
Date: Mon, 27 Jun 2016 18:02:16 -0400
Subject: [PATCH] When uploading a logo which is smaller than the current ispconfig one, then the logo will be on the left side of the header. In my opinion it will look better when it's centered. You could vote about it ;)
---
interface/web/monitor/lib/module.conf.php | 258 ++++++++++++++++++++++++++++-----------------------
1 files changed, 140 insertions(+), 118 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 5983687..c0719e7 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -3,31 +3,32 @@
/*
Config of the Module
*/
-$module["name"] = "monitor";
-$module["title"] = "top_menu_monitor";
-$module["template"] = "module.tpl.htm";
+$module["name"] = "monitor";
+$module["title"] = "top_menu_monitor";
+$module["template"] = "module.tpl.htm";
$module["tab_width"] = '';
-$module["startpage"] = "monitor/show_sys_state.php?state=system";
+$module["startpage"] = "monitor/show_sys_state.php?state=system";
+$module['order'] = '60';
unset($items);
-$items[] = array( 'title' => "Show Overview",
- 'target' => 'content',
- 'link' => 'monitor/show_sys_state.php?state=system',
- 'html_id' => 'system');
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=system',
+ 'html_id' => 'system');
-$items[] = array( 'title' => "Show System-Log",
- 'target' => 'content',
- 'link' => 'monitor/log_list.php',
- 'html_id' => 'system_log');
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/log_list.php',
+ 'html_id' => 'system_log');
-$items[] = array( 'title' => 'Show Jobqueue',
- 'target' => 'content',
- 'link' => 'monitor/datalog_list.php',
- 'html_id' => 'jobqueue');
+$items[] = array( 'title' => 'Show Jobqueue',
+ 'target' => 'content',
+ 'link' => 'monitor/datalog_list.php',
+ 'html_id' => 'jobqueue');
-$module["nav"][] = array( 'title' => 'System State (All Servers)',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'System State (All Servers)',
+ 'open' => 1,
+ 'items' => $items);
/*
@@ -37,10 +38,10 @@
$servers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
-$dropDown = "<select id='server_id' onchange=\"loadContent('monitor/show_sys_state.php?state=server&server=' + document.getElementById('server_id').value);\">";
+$dropDown = "<select id='server_id' onchange=\"ISPConfig.loadContent('monitor/show_sys_state.php?state=server&server=' + document.getElementById('server_id').value);\">";
foreach ($servers as $server)
{
- $dropDown .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
+ $dropDown .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
}
$dropDown .= "</select>";
@@ -48,14 +49,14 @@
Now add them as dropdown to the navigation
*/
unset($items);
-$items[] = array( 'title' => $dropDown,
- 'target' => '', // no action!
- 'link' => '', // no action!
- 'html_id' => 'select_server');
+$items[] = array( 'title' => $dropDown,
+ 'target' => '', // no action!
+ 'link' => '', // no action!
+ 'html_id' => 'select_server');
-$module["nav"][] = array( 'title' => 'Server to Monitor',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'Server to Monitor',
+ 'open' => 1,
+ 'items' => $items);
/*
The first Server at the list is the server first selected
@@ -68,124 +69,145 @@
*/
unset($items);
-$items[] = array( 'title' => "Show CPU info",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=cpu_info',
- 'html_id' => 'cpu_info');
+$items[] = array( 'title' => "Show CPU info",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=cpu_info',
+ 'html_id' => 'cpu_info');
-$module["nav"][] = array( 'title' => 'Hardware-Information',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'Hardware-Information',
+ 'open' => 1,
+ 'items' => $items);
/*
* Clear and set the Navigation-Items
*/
unset($items);
-$items[] = array( 'title' => "Show Overview",
- 'target' => 'content',
- 'link' => 'monitor/show_sys_state.php?state=server',
- 'html_id' => 'server');
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=server',
+ 'html_id' => 'server');
-$items[] = array( 'title' => "Show Update State",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=system_update',
- 'html_id' => 'system_update');
+$items[] = array( 'title' => "Show Update State",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=system_update',
+ 'html_id' => 'system_update');
-$items[] = array( 'title' => "Show RAID state",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=raid_state',
- 'html_id' => 'raid_state');
+$items[] = array( 'title' => "Show RAID state",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=raid_state',
+ 'html_id' => 'raid_state');
-$items[] = array( 'title' => "Show Server load",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=server_load',
- 'html_id' => 'serverload');
+$items[] = array( 'title' => "Show Server load",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=server_load',
+ 'html_id' => 'serverload');
-$items[] = array( 'title' => "Show Disk usage",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=disk_usage',
- 'html_id' => 'disk_usage');
+$items[] = array( 'title' => "Show Disk usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=disk_usage',
+ 'html_id' => 'disk_usage');
-$items[] = array( 'title' => "Show Memory usage",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mem_usage',
- 'html_id' => 'mem_usage');
+$items[] = array( 'title' => "Show MySQL Database size",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=database_size',
+ 'html_id' => 'database_usage');
-$items[] = array( 'title' => "Show Services",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=services',
- 'html_id' => 'services');
+$items[] = array( 'title' => "Show Memory usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mem_usage',
+ 'html_id' => 'mem_usage');
-$items[] = array( 'title' => "Show OpenVz VE BeanCounter",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=openvz_beancounter',
- 'html_id' => 'openvz_beancounter');
+$items[] = array( 'title' => "Show Services",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=services',
+ 'html_id' => 'services');
-$module["nav"][] = array( 'title' => 'Server State',
- 'open' => 1,
- 'items' => $items);
+$items[] = array( 'title' => "Show Monit",
+ 'target' => 'content',
+ 'link' => 'monitor/show_monit.php',
+ 'html_id' => 'monit');
+
+$items[] = array( 'title' => "Show OpenVz VE BeanCounter",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=openvz_beancounter',
+ 'html_id' => 'openvz_beancounter');
+
+$items[] = array( 'title' => "Show Munin",
+ 'target' => 'content',
+ 'link' => 'monitor/show_munin.php',
+ 'html_id' => 'monit');
+
+$module["nav"][] = array( 'title' => 'Server State',
+ 'open' => 1,
+ 'items' => $items);
/*
* Clear and set the Navigation-Items
*/
unset($items);
-$items[] = array( 'title' => "Show Mail-Queue",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mailq',
- 'html_id' => 'mailq');
+$items[] = array( 'title' => "Show Mail-Queue",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mailq',
+ 'html_id' => 'mailq');
-$items[] = array( 'title' => "Show Mail-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail',
- 'html_id' => 'log_mail');
+$items[] = array( 'title' => "Show Mail-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail',
+ 'html_id' => 'log_mail');
-$items[] = array( 'title' => "Show Mail warn-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_warn',
- 'html_id' => 'log_mail_warn');
+$items[] = array( 'title' => "Show Mail warn-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_warn',
+ 'html_id' => 'log_mail_warn');
-$items[] = array( 'title' => "Show Mail err-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_err',
- 'html_id' => 'log_mail_err');
+$items[] = array( 'title' => "Show Mail err-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_err',
+ 'html_id' => 'log_mail_err');
-$items[] = array( 'title' => "Show System-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_messages',
- 'html_id' => 'log_messages');
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_messages',
+ 'html_id' => 'log_messages');
-$items[] = array( 'title' => "Show ISPC Cron-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_ispc_cron',
- 'html_id' => 'log_ispc_cron');
+$items[] = array( 'title' => "Show ISPC Cron-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_ispc_cron',
+ 'html_id' => 'log_ispc_cron');
-$items[] = array( 'title' => "Show Freshclam-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_freshclam',
- 'html_id' => 'log_freshclam');
+$items[] = array( 'title' => "Show Freshclam-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_freshclam',
+ 'html_id' => 'log_freshclam');
-$items[] = array( 'title' => "Show Clamav-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_clamav',
- 'html_id' => 'log_clamav');
+$items[] = array( 'title' => "Show Clamav-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_clamav',
+ 'html_id' => 'log_clamav');
-$items[] = array( 'title' => "Show RKHunter-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=rkhunter',
- 'html_id' => 'rkhunter');
+$items[] = array( 'title' => "Show RKHunter-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=rkhunter',
+ 'html_id' => 'rkhunter');
-$items[] = array( 'title' => "Show fail2ban-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=fail2ban',
- 'html_id' => 'fai2ban');
+$items[] = array( 'title' => "Show fail2ban-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=fail2ban',
+ 'html_id' => 'fai2ban');
-$items[] = array( 'title' => "Show IPTables",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=iptables',
- 'html_id' => 'iptables');
+/*
+$items[] = array( 'title' => "Show MongoDB-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mongodb',
+ 'html_id' => 'mongodb');
+*/
+$items[] = array( 'title' => "Show IPTables",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=iptables',
+ 'html_id' => 'iptables');
-$module["nav"][] = array( 'title' => 'Logfiles',
- 'open' => 1,
- 'items' => $items);
-?>
\ No newline at end of file
+$module["nav"][] = array( 'title' => 'Logfiles',
+ 'open' => 1,
+ 'items' => $items);
+?>
--
Gitblit v1.9.1