From 0e3e3c99217c80068fe620460c7a331c34fe1b40 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 25 Feb 2014 09:29:50 -0500
Subject: [PATCH]  Merge branch 'master' into 'master'

---
 interface/web/client/templates/client_edit_limits.htm |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index c97e03f..01dae64 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -229,6 +229,10 @@
                     <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
                     <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
                 </div>
+				<div class="ctrlHolder">
+					<label for="limit_database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
+					<input name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+				</div>
             </div>
             <div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
             <div style="display:none;">

--
Gitblit v1.9.1