From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/monitor/lib/module.conf.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index c019b84..ca68ade 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -106,6 +106,11 @@
                   'link'	=> 'monitor/show_data.php?type=disk_usage',
                   'html_id' => 'disk_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 Memory usage",
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_data.php?type=mem_usage',

--
Gitblit v1.9.1