Skip to content

Commit 874c680

Browse files
author
Till Brehm
committed
Improved server config form.
1 parent 6acf324 commit 874c680

File tree

2 files changed

+107
-27
lines changed

2 files changed

+107
-27
lines changed

‎interface/web/admin/lib/lang/en_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
266266
$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
267267
$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
268268
$wb['enable_spdy_txt'] = 'Makes SPDY available';
269+
$wb['web_settings_txt'] = 'Web Server';
269270

270271
// New for XMPP
271272
$wb['xmpp_server_txt'] = 'XMPP Server';

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 106 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,25 @@ <h1><tmpl_var name="list_head_txt"></h1>
33
</div>
44
<p><tmpl_var name="list_desc_txt"></p>
55

6-
7-
8-
<div class="form-group">
6+
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
7+
<div class="panel panel-default">
8+
<div class="panel-heading" role="tab" id="headingWeb">
9+
<h4 class="panel-title">
10+
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseWeb" aria-expanded="true" aria-controls="collapseWeb">
11+
{tmpl_var name='web_settings_txt'}
12+
</a>
13+
</h4>
14+
</div>
15+
<div id="collapseWeb" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingWeb">
16+
<div class="panel-body">
17+
<!-- Begin content -->
18+
<div class="form-group">
919
<label class="col-sm-3 control-label">{tmpl_var name='server_type_txt'}</label>
10-
<div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
20+
<div class="col-sm-9">
21+
<select name="server_type" id="server_type" class="form-control">
1122
{tmpl_var name='server_type'}
12-
</select></div>
23+
</select>
24+
</div>
1325
</div>
1426
<div class="form-group">
1527
<label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
@@ -136,9 +148,22 @@ <h1><tmpl_var name="list_head_txt"></h1>
136148
{tmpl_var name='overquota_notify_onok'}
137149
</div>
138150
</div>
139-
<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-ssl-settings" aria-expanded="false" aria-controls="toggle-ssl-settings">{tmpl_var name='ssl_settings_txt'}</button></div>
140-
<div id="toggle-ssl-settings" class="collapse">
141-
<div class="form-group">
151+
<!-- End content -->
152+
</div>
153+
</div>
154+
</div>
155+
<div class="panel panel-default">
156+
<div class="panel-heading" role="tab" id="headingSSL">
157+
<h4 class="panel-title">
158+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSSL" aria-expanded="false" aria-controls="collapseSSL">
159+
{tmpl_var name='ssl_settings_txt'}
160+
</a>
161+
</h4>
162+
</div>
163+
<div id="collapseSSL" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSSL">
164+
<div class="panel-body">
165+
<!-- Begin content -->
166+
<div class="form-group">
142167
<label class="col-sm-3 control-label">{tmpl_var name='enable_sni_txt'}</label>
143168
<div class="col-sm-9">
144169
{tmpl_var name='enable_sni'}
@@ -158,10 +183,22 @@ <h1><tmpl_var name="list_head_txt"></h1>
158183
<div class="form-group">
159184
<label for="CA_pass" class="col-sm-3 control-label">{tmpl_var name='CA_pass_txt'}</label>
160185
<div class="col-sm-9"><input type="password" name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" autocomplete="off" class="form-control" /></div></div>
161-
</div>
162-
<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-permissions" aria-expanded="false" aria-controls="toggle-permissions">{tmpl_var name='permissions_txt'}</button></div>
163-
<div id="toggle-permissions" class="collapse">
164-
<div class="form-group">
186+
<!-- End content -->
187+
</div>
188+
</div>
189+
</div>
190+
<div class="panel panel-default">
191+
<div class="panel-heading" role="tab" id="headingPerms">
192+
<h4 class="panel-title">
193+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsePerms" aria-expanded="false" aria-controls="collapsePerms">
194+
{tmpl_var name='permissions_txt'}
195+
</a>
196+
</h4>
197+
</div>
198+
<div id="collapsePerms" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingPerms">
199+
<div class="panel-body">
200+
<!-- Begin content -->
201+
<div class="form-group">
165202
<label class="col-sm-3 control-label">{tmpl_var name='set_folder_permissions_on_update_txt'}</label>
166203
<div class="col-sm-9">
167204
{tmpl_var name='set_folder_permissions_on_update'}
@@ -188,10 +225,23 @@ <h1><tmpl_var name="list_head_txt"></h1>
188225
<div class="form-group">
189226
<label for="connect_userid_to_webid_start" class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
190227
<div class="col-sm-9"><input type="text" name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" class="form-control" /></div></div>
191-
</div>
192-
<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-php_settings" aria-expanded="false" aria-controls="toggle-php_settings">{tmpl_var name='php_settings_txt'}</button></div>
193-
<div id="toggle-php_settings" class="collapse">
194-
<div class="form-group apache">
228+
229+
<!-- End content -->
230+
</div>
231+
</div>
232+
</div>
233+
<div class="panel panel-default">
234+
<div class="panel-heading" role="tab" id="headingPHP">
235+
<h4 class="panel-title">
236+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsePHP" aria-expanded="false" aria-controls="collapsePHP">
237+
{tmpl_var name='php_settings_txt'}
238+
</a>
239+
</h4>
240+
</div>
241+
<div id="collapsePHP" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingPHP">
242+
<div class="panel-body">
243+
<!-- Begin content -->
244+
<div class="form-group apache">
195245
<label for="php_ini_path_apache" class="col-sm-3 control-label">{tmpl_var name='php_ini_path_apache_txt'}</label>
196246
<div class="col-sm-9"><input type="text" name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" class="form-control" /></div></div>
197247
<div class="form-group apache">
@@ -225,10 +275,22 @@ <h1><tmpl_var name="list_head_txt"></h1>
225275
{tmpl_var name='php_handler'}
226276
</select></div>
227277
</div>
228-
</div>
229-
<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-apps_vhost_settings" aria-expanded="false" aria-controls="toggle-apps_vhost_settings">{tmpl_var name='apps_vhost_settings_txt'}</button></div>
230-
<div id="toggle-apps_vhost_settings" class="collapse">
231-
<div class="form-group">
278+
<!-- End content -->
279+
</div>
280+
</div>
281+
</div>
282+
<div class="panel panel-default">
283+
<div class="panel-heading" role="tab" id="headingApps">
284+
<h4 class="panel-title">
285+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseApps" aria-expanded="false" aria-controls="collapseApps">
286+
{tmpl_var name='apps_vhost_settings_txt'}
287+
</a>
288+
</h4>
289+
</div>
290+
<div id="collapseApps" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingApps">
291+
<div class="panel-body">
292+
<!-- Begin content -->
293+
<div class="form-group">
232294
<label for="apps_vhost_enabled" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_enabled_txt'}</label>
233295
<div class="col-sm-9">{tmpl_var name='apps_vhost_enabled'}</div></div>
234296
<div class="form-group">
@@ -240,10 +302,23 @@ <h1><tmpl_var name="list_head_txt"></h1>
240302
<div class="form-group">
241303
<label for="apps_vhost_servername" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_servername_txt'}</label>
242304
<div class="col-sm-9"><input type="text" name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" class="form-control" /></div></div>
243-
</div>
244-
<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-awstats_settings" aria-expanded="false" aria-controls="toggle-awstats_settings">{tmpl_var name='awstats_settings_txt'}</button></div>
245-
<div id="toggle-awstats_settings" class="collapse">
246-
<div class="form-group">
305+
306+
<!-- End content -->
307+
</div>
308+
</div>
309+
</div>
310+
<div class="panel panel-default">
311+
<div class="panel-heading" role="tab" id="headingAWStats">
312+
<h4 class="panel-title">
313+
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseAWStats" aria-expanded="false" aria-controls="collapseAWStats">
314+
{tmpl_var name='awstats_settings_txt'}
315+
</a>
316+
</h4>
317+
</div>
318+
<div id="collapseAWStats" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAWStats">
319+
<div class="panel-body">
320+
<!-- Begin content -->
321+
<div class="form-group">
247322
<label for="awstats_conf_dir" class="col-sm-3 control-label">{tmpl_var name='awstats_conf_dir_txt'}</label>
248323
<div class="col-sm-9"><input type="text" name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" class="form-control" /></div></div>
249324
<div class="form-group">
@@ -255,9 +330,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
255330
<div class="form-group">
256331
<label for="awstats_buildstaticpages_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
257332
<div class="col-sm-9"><input type="text" name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" class="form-control" /></div></div>
258-
</div>
259-
260333

334+
<!-- End content -->
335+
</div>
336+
</div>
337+
</div>
338+
</div>
339+
261340
<input type="hidden" name="id" value="{tmpl_var name='id'}">
262341

263342
<div class="clear"><div class="right">
@@ -266,7 +345,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
266345
</div></div>
267346
<script language="JavaScript" type="text/javascript">
268347
var serverType = jQuery('#server_type').val();
269-
jQuery('#server_type').replaceWith('<label for="server_Type" class="col-sm-3 control-label">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
348+
jQuery('#server_type').replaceWith('<p>'+serverType+'</p><input type="hidden" name="server_type" value="'+serverType+'">');
270349
adjustForm();
271350
jQuery('#server_type').change(function(){
272351
serverType = $(this).val();

0 commit comments

Comments
 (0)