From 39fab06dfae1e0218a1bb3aa48a381586dfaea6d Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Sat, 13 Dec 2014 16:18:41 -0500
Subject: [PATCH] Merge branch 'develop' into 'master'
---
interface/web/admin/templates/server_config_web_edit.htm | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 1ad90ba..c4079bf 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -101,14 +101,6 @@
<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>
- <div class="ctrlHolder">
- <p class="label">
- <tmpl_var name="enable_spdy_txt">
- </p>
- <div class="multiField">
- <tmpl_var name="enable_spdy">
- </div>
- </div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='enable_ip_wildcard_txt'}</p>
<div class="multiField">
@@ -169,6 +161,14 @@
{tmpl_var name='enable_sni'}
</div>
</div>
+ <div class="ctrlHolder">
+ <p class="label">
+ <tmpl_var name="enable_spdy_txt">
+ </p>
+ <div class="multiField">
+ <tmpl_var name="enable_spdy">
+ </div>
+ </div>
<div class="ctrlHolder">
<label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
<input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput" />
--
Gitblit v1.9.1