Skip to content

Commit e0e69db

Browse files
author
Marius Cramer
committed
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
2 parents bc09783 + 6659cd9 commit e0e69db

File tree

4 files changed

+541
-48
lines changed

4 files changed

+541
-48
lines changed

‎interface/web/client/form/reseller.tform.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@
584584
'mail_servers' => array (
585585
'datatype' => 'INTEGER',
586586
'formtype' => 'MULTIPLE',
587+
'separator' => ',',
587588
'default' => '1',
588589
'datasource' => array ( 'type' => 'SQL',
589590
'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND {AUTHSQL} ORDER BY server_name',
@@ -1116,6 +1117,7 @@
11161117
'dns_servers' => array (
11171118
'datatype' => 'INTEGER',
11181119
'formtype' => 'MULTIPLE',
1120+
'separator' => ',',
11191121
'default' => '1',
11201122
'datasource' => array ( 'type' => 'SQL',
11211123
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
@@ -1215,6 +1217,7 @@
12151217
'db_servers' => array (
12161218
'datatype' => 'INTEGER',
12171219
'formtype' => 'MULTIPLE',
1220+
'separator' => ',',
12181221
'default' => '1',
12191222
'datasource' => array ( 'type' => 'SQL',
12201223
'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND {AUTHSQL} ORDER BY server_name',

‎interface/web/client/templates/client_edit_limits.htm‎

Lines changed: 126 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,21 @@ <h1><tmpl_var name="list_head_txt"></h1>
4545
</div>
4646
<div class="form-group">
4747
<label for="reseller" class="col-sm-3 control-label">{tmpl_var name='reseller_txt'}</label>
48-
<div class="col-sm-9"><input class="form-control" type="checkbox" name="reseller" value="1" id="reseller" /></div></div>
48+
<div class="col-sm-9"><input class="form-control" type="checkbox" name="reseller" value="1" id="reseller" /></div>
49+
</div>
4950
</tmpl_if>
50-
<div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
51-
<div>
52-
<div class="form-group">
51+
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
52+
<div class="panel panel-default">
53+
<div class="panel-heading" role="tab" id="headingWeb">
54+
<h4 class="panel-title">
55+
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseWeb" aria-expanded="true" aria-controls="collapseWeb">
56+
{tmpl_var name='web_limits_txt'}
57+
</a>
58+
</h4>
59+
</div>
60+
<div id="collapseWeb" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingWeb">
61+
<div class="panel-body">
62+
<div class="form-group">
5363
<label for="web_servers" class="col-sm-3 control-label">{tmpl_var name='web_servers_txt'}</label>
5464
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="form-control">
5565
{tmpl_var name='web_servers'}
@@ -153,10 +163,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
153163
{tmpl_var name='limit_backup'}
154164
</div>
155165
</div>
156-
</div>
157-
<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>
158-
<div id="toggle-email_limits" class="collapse">
159-
<div class="form-group">
166+
</div>
167+
</div>
168+
</div>
169+
<div class="panel panel-default">
170+
<div class="panel-heading" role="tab" id="headingMail">
171+
<h4 class="panel-title">
172+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseMail" aria-expanded="false" aria-controls="collapseMail">
173+
{tmpl_var name='email_limits_txt'}
174+
</a>
175+
</h4>
176+
</div>
177+
<div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
178+
<div class="panel-body">&nbsp;
179+
<div class="form-group">
160180
<label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>
161181
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
162182
{tmpl_var name='mail_servers'}
@@ -204,11 +224,21 @@ <h1><tmpl_var name="list_head_txt"></h1>
204224
<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>
205225
<div class="form-group">
206226
<label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
207-
<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>
208-
</div>
209-
<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>
210-
<div id="toggle-xmpp_limits" class="collapse">
211-
<div class="form-group">
227+
<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>
228+
</div>
229+
</div>
230+
</div>
231+
<div class="panel panel-default">
232+
<div class="panel-heading" role="tab" id="headingXMPP">
233+
<h4 class="panel-title">
234+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseXMPP" aria-expanded="false" aria-controls="collapseXMPP">
235+
{tmpl_var name='xmpp_limits_txt'}
236+
</a>
237+
</h4>
238+
</div>
239+
<div id="collapseXMPP" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingXMPP">
240+
<div class="panel-body">
241+
<div class="form-group">
212242
<label for="xmpp_servers" class="col-sm-3 control-label">{tmpl_var name='xmpp_servers_txt'}</label>
213243
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='xmpp_servers_placeholder'}" multiple name="xmpp_servers[]" id="xmpp_servers" class="form-control">
214244
{tmpl_var name='xmpp_servers'}
@@ -268,11 +298,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
268298
{tmpl_var name='limit_xmpp_status'}
269299
</div>
270300
</div>
271-
272-
</div>
273-
<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>
274-
<div id="toggle-database_limits" class="collapse">
275-
<div class="form-group">
301+
</div>
302+
</div>
303+
</div>
304+
<div class="panel panel-default">
305+
<div class="panel-heading" role="tab" id="headingDB">
306+
<h4 class="panel-title">
307+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseDB" aria-expanded="false" aria-controls="collapseDB">
308+
{tmpl_var name='database_limits_txt'}
309+
</a>
310+
</h4>
311+
</div>
312+
<div id="collapseDB" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingDB">
313+
<div class="panel-body">
314+
<div class="form-group">
276315
<label for="db_servers" class="col-sm-3 control-label">{tmpl_var name='db_servers_txt'}</label>
277316
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="form-control">
278317
{tmpl_var name='db_servers'}
@@ -284,11 +323,22 @@ <h1><tmpl_var name="list_head_txt"></h1>
284323
<div class="form-group">
285324
<label for="limit_database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
286325
<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
287-
</div></div>
288-
</div>
289-
<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>
290-
<div id="toggle-cron_job_limits" class="collapse">
291-
<div class="form-group">
326+
</div>
327+
</div>
328+
</div>
329+
</div>
330+
</div>
331+
<div class="panel panel-default">
332+
<div class="panel-heading" role="tab" id="headingCron">
333+
<h4 class="panel-title">
334+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseCron" aria-expanded="false" aria-controls="collapseCron">
335+
{tmpl_var name='cron_job_limits_txt'}
336+
</a>
337+
</h4>
338+
</div>
339+
<div id="collapseCron" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingCron">
340+
<div class="panel-body">
341+
<div class="form-group">
292342
<label for="limit_cron" class="col-sm-3 control-label">{tmpl_var name='limit_cron_txt'}</label>
293343
<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>
294344
<div class="form-group">
@@ -299,11 +349,23 @@ <h1><tmpl_var name="list_head_txt"></h1>
299349
</div>
300350
<div class="form-group">
301351
<label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
302-
<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>
303-
</div>
304-
<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>
305-
<div id="toggle-dns_limits" class="collapse">
306-
<div class="form-group">
352+
<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>
353+
</div>
354+
355+
</div>
356+
</div>
357+
</div>
358+
<div class="panel panel-default">
359+
<div class="panel-heading" role="tab" id="headingDNS">
360+
<h4 class="panel-title">
361+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseDNS" aria-expanded="false" aria-controls="collapseDNS">
362+
{tmpl_var name='dns_servers_txt'}
363+
</a>
364+
</h4>
365+
</div>
366+
<div id="collapseDNS" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingDNS">
367+
<div class="panel-body">
368+
<div class="form-group">
307369
<label for="dns_servers" class="col-sm-3 control-label">{tmpl_var name='dns_servers_txt'}</label>
308370
<div class="col-sm-9"><select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="form-control">
309371
{tmpl_var name='dns_servers'}
@@ -323,11 +385,22 @@ <h1><tmpl_var name="list_head_txt"></h1>
323385
<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>
324386
<div class="form-group">
325387
<label for="limit_dns_record" class="col-sm-3 control-label">{tmpl_var name='limit_dns_record_txt'}</label>
326-
<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>
327-
</div>
328-
<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>
329-
<div id="toggle-virtualization_limits" class="collapse">
330-
<div class="form-group">
388+
<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>
389+
</div>
390+
</div>
391+
</div>
392+
</div>
393+
<div class="panel panel-default">
394+
<div class="panel-heading" role="tab" id="headingVM">
395+
<h4 class="panel-title">
396+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseVM" aria-expanded="false" aria-controls="collapseVM">
397+
{tmpl_var name='virtualization_limits_txt'}
398+
</a>
399+
</h4>
400+
</div>
401+
<div id="collapseVM" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingVM">
402+
<div class="panel-body">
403+
<div class="form-group">
331404
<label for="limit_openvz_vm" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_txt'}</label>
332405
<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>
333406
<div class="form-group">
@@ -336,15 +409,27 @@ <h1><tmpl_var name="list_head_txt"></h1>
336409
{tmpl_var name='limit_openvz_vm_template_id'}
337410
</select></div>
338411
</div>
339-
</div>
340-
<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>
341-
<div id="toggle-aps_limits" class="collapse">
342-
<div class="form-group">
412+
</div>
413+
</div>
414+
</div>
415+
<div class="panel panel-default">
416+
<div class="panel-heading" role="tab" id="headingAPS">
417+
<h4 class="panel-title">
418+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseAPS" aria-expanded="false" aria-controls="collapseAPS">
419+
{tmpl_var name='aps_limits_txt'}
420+
</a>
421+
</h4>
422+
</div>
423+
<div id="collapseAPS" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAPS">
424+
<div class="panel-body">
425+
<div class="form-group">
343426
<label for="limit_aps" class="col-sm-3 control-label">{tmpl_var name='limit_aps_txt'}</label>
344-
<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>
345-
</div>
346-
347-
427+
<div class="col-sm-9"><input type="text" name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" class="form-control" /></div>
428+
</div>
429+
</div>
430+
</div>
431+
</div>
432+
</div>
348433
<input type="hidden" name="id" value="{tmpl_var name='id'}">
349434

350435
<div class="clear"><div class="right">

0 commit comments

Comments
 (0)