From b25f400cd6bc255b01e05ac274f050ba4039a411 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 21 Dec 2015 05:41:34 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/sites/templates/web_vhost_domain_edit.htm | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..230c8d0 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">
@@ -209,6 +209,12 @@
<div class="col-sm-9">
{tmpl_var name='ssl'}
</div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ssl_letsencrypt_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='ssl_letsencrypt'}
+ </div>
</div></tmpl_if>
<div class="form-group">
<label for="php" class="col-sm-3 control-label">{tmpl_var name='php_txt'}</label>
@@ -216,26 +222,29 @@
{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_var name="directive_snippets_id"}
+ {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'}">
--
Gitblit v1.9.1