From adfecbfba2c04131f03bb1c0fcb75356ded26f4f Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 12 Feb 2016 10:45:41 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/sites/templates/web_vhost_domain_edit.htm | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 8ba2825..468797e 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -206,16 +206,18 @@
</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">
+ <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">
@@ -229,12 +231,12 @@
{tmpl_var name='fastcgi_php_version'}
</select></div>
</div>
- <div class="form-group">
+ <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>
+ </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>
--
Gitblit v1.9.1