From 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 04:54:19 -0500
Subject: [PATCH] Merged revisions 2812-2883 from staböe branch.

---
 interface/web/admin/templates/server_config_web_edit.htm |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index a2b5f49..da93a2e 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -76,6 +76,28 @@
 					</div>
 			</div>
 	  <div class="ctrlHolder apache">
+				<p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='set_folder_permissions_on_update'}
+					</div>
+			</div>
+	  <div class="ctrlHolder apache">
+				<p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='add_web_users_to_sshusers_group'}
+					</div>
+			</div>
+	  <div class="ctrlHolder apache">
+				<p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='connect_userid_to_webid'}
+					</div>
+			</div>
+	  <div class="ctrlHolder apache">
+      	<label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+        <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
+			</div>
+	  <div class="ctrlHolder apache">
       	<label for="user">{tmpl_var name='web_user_txt'}</label>
         <input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
 			</div>

--
Gitblit v1.9.1