From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/client/templates/reseller_edit_limits.htm | 207 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 163 insertions(+), 44 deletions(-)
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index d58e284..b68fff9 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -48,10 +48,21 @@
<div class="col-sm-9"><input type="text" name="customer_no_start" id="customer_no_start" value="{tmpl_var name='customer_no_start'}" class="form-control" /></div></div>
<div class="form-group">
<label for="customer_no_counter" class="col-sm-3 control-label">{tmpl_var name='customer_no_counter_txt'}</label>
- <div class="col-sm-9"><input type="text" name="customer_no_counter" id="customer_no_counter" value="{tmpl_var name='customer_no_counter'}" class="form-control" /></div></div>
- <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
- <div>
- <div class="form-group">
+ <div class="col-sm-9"><input type="text" name="customer_no_counter" id="customer_no_counter" value="{tmpl_var name='customer_no_counter'}" class="form-control" /></div>
+ </div>
+
+<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingWeb">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseWeb" aria-expanded="true" aria-controls="collapseWeb">
+ {tmpl_var name='web_limits_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseWeb" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingWeb">
+ <div class="panel-body">
+ <div class="form-group">
<label for="web_servers" class="col-sm-3 control-label">{tmpl_var name='web_servers_txt'}</label>
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="form-control">
{tmpl_var name='web_servers'}
@@ -129,6 +140,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">
@@ -155,10 +172,26 @@
{tmpl_var name='limit_backup'}
</div>
</div>
- </div>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-email_limits" aria-expanded="false" aria-controls="toggle-email_limits">{tmpl_var name='email_limits_txt'}</button></div>
- <div id="toggle-email_limits" class="collapse">
<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>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingMail">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseMail" aria-expanded="false" aria-controls="collapseMail">
+ {tmpl_var name='email_limits_txt'}
+ </a>
+ </h4>
+ </div>
+ <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">
{tmpl_var name='mail_servers'}
@@ -168,9 +201,6 @@
<label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" class="form-control" /></div></div>
<div class="form-group">
- <label for="limit_mailmailinglist" class="col-sm-3 control-label">{tmpl_var name='limit_mailmailinglist_txt'}</label>
- <div class="col-sm-9"><input type="text" name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" class="form-control" /></div></div>
- <div class="form-group">
<label for="limit_mailbox" class="col-sm-3 control-label">{tmpl_var name='limit_mailbox_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" class="form-control" /></div></div>
<div class="form-group">
@@ -179,6 +209,9 @@
<div class="form-group">
<label for="limit_mailaliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" class="form-control" /></div></div>
+ <div class="form-group">
+ <label for="limit_mailmailinglist" class="col-sm-3 control-label">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" class="form-control" /></div></div>
<div class="form-group">
<label for="limit_mailforward" class="col-sm-3 control-label">{tmpl_var name='limit_mailforward_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" class="form-control" /></div></div>
@@ -206,11 +239,21 @@
<div class="col-sm-9"><input type="text" name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" class="form-control" /></div></div>
<div class="form-group">
<label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
- <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" /></div></div>
- </div>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-xmpp_limits" aria-expanded="false" aria-controls="toggle-xmpp_limits">{tmpl_var name='xmpp_limits_txt'}</button></div>
- <div id="toggle-xmpp_limits" class="collapse">
- <div class="form-group">
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" /></div>
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingXMPP">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseXMPP" aria-expanded="false" aria-controls="collapseXMPP">
+ {tmpl_var name='xmpp_limits_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseXMPP" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingXMPP">
+ <div class="panel-body">
+ <div class="form-group">
<label for="xmpp_servers" class="col-sm-3 control-label">{tmpl_var name='xmpp_servers_txt'}</label>
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='xmpp_servers_placeholder'}" multiple name="xmpp_servers[]" id="xmpp_servers" class="form-control">
{tmpl_var name='xmpp_servers'}
@@ -270,11 +313,20 @@
{tmpl_var name='limit_xmpp_status'}
</div>
</div>
-
- </div>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-database_limits" aria-expanded="false" aria-controls="toggle-database_limits">{tmpl_var name='database_limits_txt'}</button></div>
- <div id="toggle-database_limits" class="collapse">
- <div class="form-group">
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingDB">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseDB" aria-expanded="false" aria-controls="collapseDB">
+ {tmpl_var name='database_limits_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseDB" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingDB">
+ <div class="panel-body">
+ <div class="form-group">
<label for="db_servers" class="col-sm-3 control-label">{tmpl_var name='db_servers_txt'}</label>
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="form-control">
{tmpl_var name='db_servers'}
@@ -283,10 +335,28 @@
<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>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-cron_job_limits" aria-expanded="false" aria-controls="toggle-cron_job_limits">{tmpl_var name='cron_job_limits_txt'}</button></div>
- <div id="toggle-cron_job_limits" class="collapse">
<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
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingCron">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseCron" aria-expanded="false" aria-controls="collapseCron">
+ {tmpl_var name='cron_job_limits_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseCron" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingCron">
+ <div class="panel-body">
+ <div class="form-group">
<label for="limit_cron" class="col-sm-3 control-label">{tmpl_var name='limit_cron_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" class="form-control" /></div></div>
<div class="form-group">
@@ -297,11 +367,23 @@
</div>
<div class="form-group">
<label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
- <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div></div>
- </div>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-dns_limits" aria-expanded="false" aria-controls="toggle-dns_limits">{tmpl_var name='dns_limits_txt'}</button></div>
- <div id="toggle-dns_limits" class="collapse">
- <div class="form-group">
+ <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingDNS">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseDNS" aria-expanded="false" aria-controls="collapseDNS">
+ {tmpl_var name='dns_servers_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseDNS" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingDNS">
+ <div class="panel-body">
+ <div class="form-group">
<label for="dns_servers" class="col-sm-3 control-label">{tmpl_var name='dns_servers_txt'}</label>
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="form-control">
{tmpl_var name='dns_servers'}
@@ -321,11 +403,22 @@
<div class="col-sm-9"><input type="text" name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" class="form-control" /></div></div>
<div class="form-group">
<label for="limit_dns_record" class="col-sm-3 control-label">{tmpl_var name='limit_dns_record_txt'}</label>
- <div class="col-sm-9"><input type="text" name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" class="form-control" /></div></div>
- </div>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-virtualization_limits" aria-expanded="false" aria-controls="toggle-virtualization_limits">{tmpl_var name='virtualization_limits_txt'}</button></div>
- <div id="toggle-virtualization_limits" class="collapse">
- <div class="form-group">
+ <div class="col-sm-9"><input type="text" name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" class="form-control" /></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingVM">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseVM" aria-expanded="false" aria-controls="collapseVM">
+ {tmpl_var name='virtualization_limits_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseVM" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingVM">
+ <div class="panel-body">
+ <div class="form-group">
<label for="limit_openvz_vm" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" class="form-control" /></div></div>
<div class="form-group">
@@ -334,23 +427,49 @@
{tmpl_var name='limit_openvz_vm_template_id'}
</select></div>
</div>
- </div>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-aps_limits" aria-expanded="false" aria-controls="toggle-aps_limits">{tmpl_var name='aps_limits_txt'}</button></div>
- <div id="toggle-aps_limits" class="collapse">
- <div class="form-group">
+ </div>
+ </div>
+ </div>
+ <!-- APS -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingAPS">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseAPS" aria-expanded="false" aria-controls="collapseAPS">
+ {tmpl_var name='aps_limits_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseAPS" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAPS">
+ <div class="panel-body">
+ <div class="form-group">
<label for="limit_aps" class="col-sm-3 control-label">{tmpl_var name='limit_aps_txt'}</label>
- <div class="col-sm-9"><input type="text" name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" class="form-control" /></div></div>
- </div>
- <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-client_limits" aria-expanded="false" aria-controls="toggle-client_limits">{tmpl_var name='client_limits_txt'}</button></div>
- <div id="toggle-client_limits" class="collapse">
+ <div class="col-sm-9"><input type="text" name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" class="form-control" /></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Client -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingClient">
+ <h4 class="panel-title">
+ <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseClient" aria-expanded="false" aria-controls="collapseClient">
+ {tmpl_var name='limit_client_txt'}
+ </a>
+ </h4>
+ </div>
+ <div id="collapseClient" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingClient">
+ <div class="panel-body">
<div class="form-group">
<label for="limit_client" class="col-sm-3 control-label">{tmpl_var name='limit_client_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" class="form-control" /></div></div>
<div class="form-group">
<label for="limit_domainmodule" class="col-sm-3 control-label">{tmpl_var name='limit_domainmodule_txt'}</label>
- <div class="col-sm-9"><input type="text" name="limit_domainmodule" id="limit_domainmodule" value="{tmpl_var name='limit_domainmodule'}" class="form-control" /></div></div>
- </div>
-
+ <div class="col-sm-9"><input type="text" name="limit_domainmodule" id="limit_domainmodule" value="{tmpl_var name='limit_domainmodule'}" class="form-control" /></div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
--
Gitblit v1.9.1