From 5d2d1ffa1a89a5753354402e35b6723785267ab8 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Fri, 9 Sep 2011 10:33:33 +0200
Subject: [PATCH] Improve showing of MySQL - databasesize, refs #834, thx
 arnoldB

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 lng/english.lng.php                                  | 5 +++--
 lng/german.lng.php                                   | 1 +
 templates/Classic/customer/mysql/mysqls.tpl          | 2 +-
 templates/Classic/customer/mysql/mysqls_database.tpl | 1 +
 templates/Froxlor/customer/mysql/mysqls.tpl          | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lng/english.lng.php b/lng/english.lng.php
index 6d3aa915..8444a910 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -153,8 +153,8 @@ $lng['ftp']['account_add'] = 'Create Account';
  * MySQL
  */
 
-$lng['mysql']['databasename'] = 'user/database name';
-$lng['mysql']['databasedescription'] = 'database description';
+$lng['mysql']['databasename'] = 'User/Database name';
+$lng['mysql']['databasedescription'] = 'Database description';
 $lng['mysql']['database_create'] = 'Create database';
 
 /**
@@ -1897,3 +1897,4 @@ $lng['logrotate_keep'] = 'How many logfiles should be kept?';
 $lng['admin']['assignedmax'] = 'Assigned / Max';
 $lng['admin']['usedmax'] = 'Used / Max';
 $lng['admin']['used'] = 'Used';
+$lng['mysql']['size'] = 'Database size (MB)';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 5c1da2a6..4cd7cc64 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1628,3 +1628,4 @@ $lng['logrotate_keep'] = 'Wie viele Logdateien sollen aufbewahrt werden?';
 $lng['admin']['assignedmax'] = 'Zugewiesen / Max.';
 $lng['admin']['usedmax'] = 'Benutzt / Max.';	
 $lng['admin']['used'] = 'Benutzt';
+$lng['mysql']['size'] = 'Datenbankgr&ouml;&szlig;e (MB)';
diff --git a/templates/Classic/customer/mysql/mysqls.tpl b/templates/Classic/customer/mysql/mysqls.tpl
index 4fbdabc9..558d3669 100644
--- a/templates/Classic/customer/mysql/mysqls.tpl
+++ b/templates/Classic/customer/mysql/mysqls.tpl
@@ -15,7 +15,7 @@ $header
 			<tr>
 				<td class="field_display_border_left">{$lng['mysql']['databasename']}&nbsp;&nbsp;{$arrowcode['databasename']}</td>
 				<td class="field_display">{$lng['mysql']['databasedescription']}&nbsp;&nbsp;{$arrowcode['description']}</td>
-				<td class="field_display">{$lng['panel']['megabyte']}</td>
+				<td class="field_display">{$lng['mysql']['size']}</td>
 				<if 1 < count($sql_root)><td class="field_display">{$lng['mysql']['mysql_server']}</td></if>
 				<td class="field_display_search" colspan="2">{$sortcode}</td>
 			</tr>
diff --git a/templates/Classic/customer/mysql/mysqls_database.tpl b/templates/Classic/customer/mysql/mysqls_database.tpl
index b44efdac..878fce58 100644
--- a/templates/Classic/customer/mysql/mysqls_database.tpl
+++ b/templates/Classic/customer/mysql/mysqls_database.tpl
@@ -1,6 +1,7 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
 	<td class="field_name_border_left">{$row['databasename']}</td>
 	<td class="field_name">{$row['description']}</td>
+	<td class="field_name">{$row['size']}</td>
 	<if 1 < count($sql_root)><td class="field_name">{$sql_root[$row['dbserver']]['caption']}</td></if>
 	<if $row['apsdb'] != '1'>
 		<td class="field_name"><a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
diff --git a/templates/Froxlor/customer/mysql/mysqls.tpl b/templates/Froxlor/customer/mysql/mysqls.tpl
index ff1a560e..4284f6a4 100644
--- a/templates/Froxlor/customer/mysql/mysqls.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls.tpl
@@ -27,7 +27,7 @@
 					<tr>
 						<th>{$lng['mysql']['databasename']}&nbsp;{$arrowcode['databasename']}</th>
 						<th>{$lng['mysql']['databasedescription']}&nbsp;{$arrowcode['description']}</th>
-						<th>{$lng['panel']['megabyte']}</th>
+						<th>{$lng['mysql']['size']}</th>
 						<if 1 < count($sql_root)><th>{$lng['mysql']['mysql_server']}</th></if>
 						<th>{$lng['panel']['options']}</th>
 					</tr>