From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
interface/web/admin/templates/server_config_web_edit.htm | 111 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 34 deletions(-)
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index f22583f..ed522f6 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -31,19 +31,19 @@
{tmpl_var name='website_symlinks_rel'}
</div>
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder apache">
<label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
<input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder apache">
<label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
<input name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder nginx">
<label for="nginx_vhost_conf_dir">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
<input name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder nginx">
<label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
<input name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
@@ -63,33 +63,93 @@
</select>
</div>
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder apache">
<p class="label">{tmpl_var name='check_apache_config_txt'}</p>
<div class="multiField">
{tmpl_var name='check_apache_config'}
</div>
</div>
<div class="ctrlHolder">
+ <p class="label">{tmpl_var name='enable_sni_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='enable_sni'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='set_folder_permissions_on_update'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='add_web_users_to_sshusers_group'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='connect_userid_to_webid'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+ <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder apache">
<label for="user">{tmpl_var name='web_user_txt'}</label>
<input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder apache">
<label for="group">{tmpl_var name='web_group_txt'}</label>
<input name="group" id="group" value="{tmpl_var name='group'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder nginx">
+ <label for="nginx_user">{tmpl_var name='nginx_user_txt'}</label>
+ <input name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="nginx_group">{tmpl_var name='nginx_group_txt'}</label>
+ <input name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder apache">
<label for="php_ini_path_apache">{tmpl_var name='php_ini_path_apache_txt'}</label>
<input name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder apache">
<label for="php_ini_path_cgi">{tmpl_var name='php_ini_path_cgi_txt'}</label>
<input name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
+ <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="php_fpm_ini_path">{tmpl_var name='php_fpm_ini_path_txt'}</label>
+ <input name="php_fpm_ini_path" id="php_fpm_ini_path" value="{tmpl_var name='php_fpm_ini_path'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+ <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
+ <input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="php_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+ <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
<div class="ctrlHolder">
<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
<input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder nginx">
+ <label for="nginx_cgi_socket">{tmpl_var name='nginx_cgi_socket_txt'}</label>
+ <input name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder apache">
<label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
<input name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
@@ -134,37 +194,20 @@
</div>
<script language="JavaScript" type="text/javascript">
var serverType = jQuery('#server_type').val();
- adjustForm(serverType);
+ jQuery('#server_type').replaceWith('<label for="server_Type">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
+ adjustForm();
jQuery('#server_type').change(function(){
serverType = $(this).val();
- adjustForm(serverType);
+ adjustForm();
});
- function adjustForm(serverType){
+ function adjustForm(){
if(serverType == "nginx"){
- jQuery('#vhost_conf_dir').closest('div.ctrlHolder').hide();
- jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
- jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').show();
- jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
-
- jQuery('#security_level').closest('div.ctrlHolder').hide();
- jQuery('#check_apache_config').closest('div.ctrlHolder').hide();
- jQuery('#user').closest('div.ctrlHolder').hide();
- jQuery('#group').closest('div.ctrlHolder').hide();
- jQuery('#php_ini_path_apache').closest('div.ctrlHolder').hide();
- jQuery('#htaccess_allow_override').closest('div.ctrlHolder').hide();
+ jQuery('.nginx').show();
+ jQuery('.apache').hide();
} else {
- jQuery('#vhost_conf_dir').closest('div.ctrlHolder').show();
- jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
- jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').hide();
- jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
-
- jQuery('#security_level').closest('div.ctrlHolder').show();
- jQuery('#check_apache_config').closest('div.ctrlHolder').show();
- jQuery('#user').closest('div.ctrlHolder').show();
- jQuery('#group').closest('div.ctrlHolder').show();
- jQuery('#php_ini_path_apache').closest('div.ctrlHolder').show();
- jQuery('#htaccess_allow_override').closest('div.ctrlHolder').show();
+ jQuery('.nginx').hide();
+ jQuery('.apache').show();
}
}
</script>
\ No newline at end of file
--
Gitblit v1.9.1