From 5152e9a75e6e0ed4dc26358e4e608ce684147b32 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 26 Apr 2016 03:01:50 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/templates/web_vhost_domain_edit.htm | 6 +++---
1 files changed, 3 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 468797e..ec9005a 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -74,7 +74,7 @@
{tmpl_var name='ip_address'}
</select></div>
</div>
- <div class="form-group" style="display:none">
+ <div class="form-group">
<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'}
@@ -126,7 +126,7 @@
</tmpl_if>
<div class="form-group">
<label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
- <div class="col-sm-6"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'></div><div class="col-sm-3 input-sm"> readonly="readonly"</div></tmpl_if> />
+ <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'>readonly="readonly"</tmpl_if> /></div>
</div>
</tmpl_if>
<tmpl_if name="vhostdomain_type" value="aliasdomain">
@@ -148,7 +148,7 @@
</div>
<div class="form-group">
<label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
- <div class="col-sm-6"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'></div><div class="col-sm-3 input-sm"> readonly="readonly"</div></tmpl_if> />
+ <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> /></div>
</div>
</tmpl_if>
<div class="form-group">
--
Gitblit v1.9.1