From 6a00b4e599f724cbc9a12927c8a0446ef5621028 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 23 Dec 2015 12:21:09 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/admin/templates/server_config_web_edit.htm | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 9f621e0..f32e147 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -7,11 +7,9 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='server_type_txt'}</label>
- <div class="col-sm-9">
- <div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
+ <div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
{tmpl_var name='server_type'}
- </select>
- </div></div>
+ </select></div>
</div>
<div class="form-group">
<label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
@@ -58,11 +56,9 @@
<div class="col-sm-9"><input type="text" name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" class="form-control" /></div></div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='security_level_txt'}</label>
- <div class="col-sm-9">
- <div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
+ <div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
{tmpl_var name='security_level'}
- </select>
- </div></div>
+ </select></div>
</div>
<div class="form-group apache">
<label class="col-sm-3 control-label">{tmpl_var name='check_apache_config_txt'}</label>
@@ -140,8 +136,8 @@
{tmpl_var name='overquota_notify_onok'}
</div>
</div>
- <div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
- <div style="display:none;">
+ <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>
+ <div id="toggle-ssl-settings" class="collapse">
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='enable_sni_txt'}</label>
<div class="col-sm-9">
@@ -163,8 +159,8 @@
<label for="CA_pass" class="col-sm-3 control-label">{tmpl_var name='CA_pass_txt'}</label>
<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>
</div>
- <div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
- <div style="display:none;">
+ <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>
+ <div id="toggle-permissions" class="collapse">
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='set_folder_permissions_on_update_txt'}</label>
<div class="col-sm-9">
@@ -193,8 +189,8 @@
<label for="connect_userid_to_webid_start" class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
<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>
</div>
- <div class="subsectiontoggle"><span></span>{tmpl_var name='php_settings_txt'}<em></em></div>
- <div style="display:none;">
+ <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>
+ <div id="toggle-php_settings" class="collapse">
<div class="form-group apache">
<label for="php_ini_path_apache" class="col-sm-3 control-label">{tmpl_var name='php_ini_path_apache_txt'}</label>
<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>
@@ -225,15 +221,16 @@
</div></div>
<div class="form-group">
<label for="php_handler" class="col-sm-3 control-label">{tmpl_var name='php_handler_txt'}</label>
- <div class="col-sm-9">
- <div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
+ <div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
{tmpl_var name='php_handler'}
- </select>
- </div></div>
+ </select></div>
</div>
</div>
- <div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
- <div style="display:none;">
+ <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>
+ <div id="toggle-apps_vhost_settings" class="collapse">
+ <div class="form-group">
+ <label for="apps_vhost_enabled" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_enabled_txt'}</label>
+ <div class="col-sm-9">{tmpl_var name='apps_vhost_enabled'}</div></div>
<div class="form-group">
<label for="apps_vhost_port" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_port_txt'}</label>
<div class="col-sm-9"><input type="text" name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" class="form-control" /></div></div>
@@ -244,8 +241,8 @@
<label for="apps_vhost_servername" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_servername_txt'}</label>
<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>
</div>
- <div class="subsectiontoggle"><span></span>{tmpl_var name='awstats_settings_txt'}<em></em></div>
- <div style="display:none;">
+ <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>
+ <div id="toggle-awstats_settings" class="collapse">
<div class="form-group">
<label for="awstats_conf_dir" class="col-sm-3 control-label">{tmpl_var name='awstats_conf_dir_txt'}</label>
<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>
@@ -264,7 +261,7 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
<script language="JavaScript" type="text/javascript">
--
Gitblit v1.9.1