From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/client/templates/client_edit_limits.htm | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 66db76b..1396946 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -45,7 +45,7 @@
</div>
<div class="form-group">
<label for="reseller" class="col-sm-3 control-label">{tmpl_var name='reseller_txt'}</label>
- <div class="col-sm-9"><input class="form-control" type="checkbox" name="reseller" value="1" id="reseller" /></div>
+ <div class="col-sm-9"><input type="checkbox" name="reseller" value="1" id="reseller" /></div>
</div>
</tmpl_if>
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
@@ -137,6 +137,12 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_letsencrypt_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='limit_ssl_letsencrypt'}
+ </div>
+ </div>
+ <div class="form-group">
<label for="limit_web_aliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" class="form-control" /></div></div>
<div class="form-group">
@@ -163,6 +169,12 @@
{tmpl_var name='limit_backup'}
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_directive_snippets_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='limit_directive_snippets'}
+ </div>
+ </div>
</div>
</div>
</div>
@@ -174,11 +186,12 @@
</a>
</h4>
</div>
- <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
- <div class="panel-body">
+ <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail">
+ <div class="panel-body">
<div class="form-group">
<label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>
- <div class="col-sm-9"><select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
+ <div class="col-sm-9">
+ <select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
{tmpl_var name='mail_servers'}
</select></div>
</div>
@@ -320,6 +333,9 @@
<div class="form-group">
<label for="limit_database" class="col-sm-3 control-label">{tmpl_var name='limit_database_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" class="form-control" /></div></div>
+ <div class="form-group">
+ <label for="limit_database_user" class="col-sm-3 control-label">{tmpl_var name='limit_database_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_database_user" id="limit_database_user" value="{tmpl_var name='limit_database_user'}" class="form-control" /></div></div>
<div class="form-group">
<label for="limit_database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
<div class="col-sm-6"><input type="text" name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" class="form-control" /></div><div class="col-sm-3 input-sm"> MB
--
Gitblit v1.9.1