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/sites/templates/web_vhost_domain_edit.htm | 92 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index faee19a..468797e 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -13,7 +13,7 @@
</tmpl_if>
-
+ {tmpl_hook name="begin_form"}
<tmpl_if name="vhostdomain_type" value="domain">
<tmpl_if name="is_admin">
<div class="form-group">
@@ -74,7 +74,7 @@
{tmpl_var name='ip_address'}
</select></div>
</div>
- <div class="form-group">
+ <div class="form-group" style="display:none">
<label for="ipv6_address" class="col-sm-3 control-label">{tmpl_var name='ipv6_address_txt'}</label>
<div class="col-sm-9"><select name="ipv6_address" id="ipv6_address" class="form-control">
{tmpl_var name='ipv6_address'}
@@ -97,8 +97,8 @@
</tmpl_if>
<div class="form-group">
<label for="hd_quota" class="col-sm-3 control-label">{tmpl_var name='hd_quota_txt'}</label>
- <div class="col-sm-6"><input type="text" name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" class="form-control" /></div><div class="col-sm-3 input-sm"> MB
- </div></div>
+ <div class="col-sm-9"><div class="input-group"><input type="text" name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" class="form-control" /><span class="input-group-addon" id="quota-desc">MB</span></div></div>
+ </div>
</tmpl_if>
<tmpl_if name="vhostdomain_type" value="subdomain">
<input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
@@ -153,7 +153,7 @@
</tmpl_if>
<div class="form-group">
<label for="traffic_quota" class="col-sm-3 control-label">{tmpl_var name='traffic_quota_txt'}</label>
- <div class="col-sm-6"><input type="text" name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" class="form-control" /></div><div class="col-sm-3 input-sm"> MB </div><tmpl_var name='traffic_quota_exceeded_txt'>
+ <div class="col-sm-9"><div class="input-group"><input type="text" name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" class="form-control" /><span class="input-group-addon" id="quota-desc">MB</span></div></div><tmpl_var name='traffic_quota_exceeded_txt'>
</div>
<tmpl_if name="limit_cgi" op="==" value="y"><div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='cgi_txt'}</label>
@@ -206,36 +206,52 @@
</div>
<tmpl_if name="limit_ssl" op="==" value="y"><div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='ssl_txt'}</label>
- <div class="col-sm-9">
+ <div class="col-sm-9" data-uncheck-fields="ssl_letsencrypt">
{tmpl_var name='ssl'}
</div>
+ </div>
+ <tmpl_if name="limit_ssl_letsencrypt" op="==" value="y">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ssl_letsencrypt_txt'}</label>
+ <div class="col-sm-9" data-check-fields="ssl">
+ {tmpl_var name='ssl_letsencrypt'}
+ </div>
</div></tmpl_if>
+ </tmpl_if>
<div class="form-group">
<label for="php" class="col-sm-3 control-label">{tmpl_var name='php_txt'}</label>
<div class="col-sm-9"><select name="php" id="php" class="form-control">
{tmpl_var name='php'}
</select></div>
</div>
+ {tmpl_hook name="field_fastcgi_php_version"}
<div class="form-group fastcgi_php_version">
<label for="fastcgi_php_version" class="col-sm-3 control-label">{tmpl_var name='fastcgi_php_version_txt'}</label>
<div class="col-sm-9"><select name="fastcgi_php_version" id="fastcgi_php_version" class="form-control">
{tmpl_var name='fastcgi_php_version'}
</select></div>
</div>
- {tmpl_var name="directive_snippets_id"}
+ <tmpl_if name="limit_directive_snippets" op="==" value="y"><div class="form-group">
+ <label for="directive_snippets_id" class="col-sm-3 control-label">{tmpl_var name='directive_snippets_id_txt'}</label>
+ <div class="col-sm-9"><select name="directive_snippets_id" id="directive_snippets_id" class="form-control">
+ {tmpl_var name='directive_snippets_id'}
+ </select></div>
+ </div></tmpl_if>
+ {tmpl_hook name="field_enable_pagespeed"}
<div class="form-group nginx pagespeed">
<label class="col-sm-3 control-label">{tmpl_var name='enable_pagespeed_txt'}</label>
<div class="col-sm-9">
{tmpl_var name="enable_pagespeed"}
</div>
</div>
+ {tmpl_hook name="field_active"}
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
-
+ {tmpl_hook name="end_form"}
<input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -247,6 +263,7 @@
var serverId;
var clientGroupId = jQuery('#client_group_id').val();
var serverIdDisabled = jQuery('#server_id_disabled').val();
+ var serverType;
if(serverIdDisabled > 0){
serverId = serverIdDisabled;
} else {
@@ -261,15 +278,22 @@
}
adjustForm(true);
reloadFastcgiPHPVersions(true);
-
+
jQuery('#client_group_id').change(function(){
clientGroupId = $(this).val();
reloadWebIP();
reloadFastcgiPHPVersions();
});
- if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
+ if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm' || (jQuery('#php').val() == 'hhvm' && serverType == 'nginx')){
jQuery('.fastcgi_php_version:hidden').show();
+ if(jQuery('#php').val() == 'hhvm'){
+ jQuery('#fastcgi_php_version_txt').hide();
+ jQuery('#fastcgi_php_fallback_version_txt').show();
+ } else {
+ jQuery('#fastcgi_php_version_txt').show();
+ jQuery('#fastcgi_php_fallback_version_txt').hide();
+ }
} else {
jQuery('.fastcgi_php_version:visible').hide();
}
@@ -277,8 +301,15 @@
jQuery('#php').change(function(){
reloadFastcgiPHPVersions();
- if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
+ if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm' || (jQuery(this).val() == 'hhvm' && serverType == 'nginx')){
jQuery('.fastcgi_php_version:hidden').show();
+ if(jQuery(this).val() == 'hhvm'){
+ jQuery('#fastcgi_php_version_txt').hide();
+ jQuery('#fastcgi_php_fallback_version_txt').show();
+ } else {
+ jQuery('#fastcgi_php_version_txt').show();
+ jQuery('#fastcgi_php_fallback_version_txt').hide();
+ }
} else {
jQuery('.fastcgi_php_version:visible').hide();
}
@@ -314,6 +345,7 @@
function adjustForm(noFormChange){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
if(data.servertype == "nginx"){
+ serverType = 'nginx';
var selected = jQuery('#php').val();
jQuery('.apache').hide();
jQuery('.nginx').show();
@@ -337,6 +369,7 @@
jQuery('#php option[value="mod"]').hide();
jQuery('#php option[value="suphp"]').hide();
} else {
+ serverType = 'apache';
jQuery('.nginx').hide();
jQuery('.apache').show();
jQuery('#php option[value="fast-cgi"]').show();
@@ -356,16 +389,30 @@
function reloadDirectiveSnippets() {
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getdirectivesnippet"}, function(data) {
- var options = '<option value="0"></option>';
- for (var i = 0, len = data.length; i < len; i++) {
+ var options = '<option value="0">-</option>';
+ options += "<optgroup label=\"{tmpl_var name='select_master_directive_snippet_txt'}\">";
+ for (var i = 0, len = data['m_snippets'].length; i < len; i++) {
var isSelected = '';
if ($('#directive_snippets_id').val() == i + 1) {
isSelected = 'selected="selected"';
}
- options += '<option ' + isSelected + ' value="' + data[i]['directive_snippets_id'] + '">' + data[i]['name'] + '</option>';
+ options += '<option ' + isSelected + ' value="' + data['m_snippets'][i]['directive_snippets_id'] + '">' + data['m_snippets'][i]['name'] + '</option>';
}
+ options += '</optgroup>';
+
+ options += "<optgroup label=\"{tmpl_var name='select_directive_snippet_txt'}\">";
+ for (var i = 0, len = data['snippets'].length; i < len; i++) {
+ var isSelected = '';
+
+ if ($('#directive_snippets_id').val() == i + 1) {
+ isSelected = 'selected="selected"';
+ }
+
+ options += '<option ' + isSelected + ' value="' + data['snippets'][i]['directive_snippets_id'] + '">' + data['snippets'][i]['name'] + '</option>';
+ }
+ options += '</optgroup>';
$('#directive_snippets_id').html(options).change();
});
@@ -425,5 +472,22 @@
ISPConfig.submitForm('pageForm','sites/web_vhost_domain_edit.php');
});
</tmpl_if>
+
+ if($('#domain').val() == ''){
+ $('#web_folder_domain').text('[DOMAIN]');
+ } else {
+ $('#web_folder_domain').text($('#domain').val());
+ }
+ $('#domain').bind('change keyup', function(){
+ if($(this).val() == ''){
+ $('#web_folder_domain').text('[DOMAIN]');
+ } else {
+ $('#web_folder_domain').text($('#domain').val());
+ }
+ });
+
+ $('#more_folder_directive_snippets').click(function(){
+ $('.folder_directive_snippets:hidden:first').removeClass('hidden');
+ });
</script>
--
Gitblit v1.9.1