Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/client/templates/client_template_edit_limits.htm

@@ -89,6 +89,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">
@@ -113,6 +119,12 @@
                    <label class="col-sm-3 control-label">{tmpl_var name='limit_backup_txt'}</label>
                    <div class="col-sm-9">
                        {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>
@@ -254,6 +266,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">&nbsp;MB