From 799d11f341a6e1b6fa716ba27190d789c19ba245 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sun, 8 Mar 2009 19:10:21 +0000
Subject: [PATCH] template display fixes for sites

---
 interface/web/sites/lib/lang/de_ftp_user.lng  |  41 +--
 interface/web/sites/lib/lang/en_ftp_user.lng  |   1 +
 .../web/sites/templates/database_edit.htm     |  16 +-
 .../web/sites/templates/ftp_user_advanced.htm |  16 +-
 .../web/sites/templates/ftp_user_edit.htm     |   6 +-
 .../sites/templates/shell_user_advanced.htm   |   6 +-
 .../web/sites/templates/shell_user_edit.htm   |   6 +-
 .../sites/templates/web_aliasdomain_edit.htm  |   6 +-
 .../sites/templates/web_domain_advanced.htm   |   8 +-
 .../web/sites/templates/web_domain_edit.htm   | 264 +++++++++---------
 .../sites/templates/web_domain_redirect.htm   |   4 +-
 .../web/sites/templates/web_domain_ssl.htm    |   4 +-
 .../sites/templates/web_subdomain_edit.htm    |   4 +-
 .../web/tools/templates/user_settings.htm     |   4 +-
 14 files changed, 194 insertions(+), 192 deletions(-)

diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index a0dfe42e4..21069099a 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -1,26 +1,27 @@
-<?php
-$wb['uid_txt'] = 'UID';
-$wb['gid_txt'] = 'GID';
-$wb['dir_txt'] = 'Verzeichnis';
-$wb['quota_files_txt'] = 'Dateiquota';
-$wb['ul_ratio_txt'] = 'Uploadrate';
-$wb['dl_ratio_txt'] = 'Downloadrate';
-$wb['ul_bandwidth_txt'] = 'Uploadbandbreite';
+<?php
+$wb['uid_txt'] = 'UID';
+$wb['gid_txt'] = 'GID';
+$wb['dir_txt'] = 'Verzeichnis';
+$wb['quota_files_txt'] = 'Dateiquota';
+$wb["quota_files_unity_txt"] = 'Dateien';
+$wb['ul_ratio_txt'] = 'Uploadrate';
+$wb['dl_ratio_txt'] = 'Downloadrate';
+$wb['ul_bandwidth_txt'] = 'Uploadbandbreite';
 $wb['dl_bandwidth_txt'] = 'Downloadbandbreite';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Benutzername';
-$wb['password_txt'] = 'Passwort';
-$wb['quota_size_txt'] = 'Harddiskquota';
-$wb['active_txt'] = 'Aktiv';
-$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für ihr Konto wurde erreicht.';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['username_txt'] = 'Benutzername';
+$wb['password_txt'] = 'Passwort';
+$wb['quota_size_txt'] = 'Harddiskquota';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für ihr Konto wurde erreicht.';
 $wb['username_error_empty'] = 'Benutzername ist leer.';
-$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
-$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
+$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
+$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
 $wb['quota_size_error_empty'] = 'Quota ist leer.';
 $wb['uid_error_empty'] = 'GID ist leer.';
 $wb['directory_error_empty'] = 'Verzeichniss ist leer.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
-?>
-
-
+?>
+
+
diff --git a/interface/web/sites/lib/lang/en_ftp_user.lng b/interface/web/sites/lib/lang/en_ftp_user.lng
index da20e6fe5..691bc7d0f 100644
--- a/interface/web/sites/lib/lang/en_ftp_user.lng
+++ b/interface/web/sites/lib/lang/en_ftp_user.lng
@@ -3,6 +3,7 @@ $wb["uid_txt"] = 'UID';
 $wb["gid_txt"] = 'GID';
 $wb["dir_txt"] = 'Directory';
 $wb["quota_files_txt"] = 'Filequota';
+$wb["quota_files_unity_txt"] = 'Files';
 $wb["ul_ratio_txt"] = 'Uploadratio';
 $wb["dl_ratio_txt"] = 'Downloadratio';
 $wb["ul_bandwidth_txt"] = 'Uploadbandwidth';
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 706ea1976..000a483db 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_database">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Database</legend>
+    <fieldset class="inlineLabels">
       <tmpl_if name="is_admin">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
@@ -15,7 +15,7 @@
       <div class="ctrlHolder">
       	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
         <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='server_id'}
+					{tmpl_var name='client_group_id'}
 				</select>
       </div>
       </tmpl_if>
@@ -23,29 +23,29 @@
       <div class="ctrlHolder">
       	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
         <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='server_id'}
+					{tmpl_var name='client_group_id'}
 				</select>
       </div>
       </tmpl_if>
       <div class="ctrlHolder">
       	<label for="type">{tmpl_var name='type_txt'}</label>
-        <select name="type" id="type" class="selectInput">
+        <select name="type" id="type" class="selectInput formLengthHalf">
 					{tmpl_var name='type'}
 				</select>
       </div>
       <div class="ctrlHolder">
       	<label for="database_name">{tmpl_var name='database_name_txt'}</label>
       	<div style="float: left;">{tmpl_var name='database_name_prefix'} </div>
-        <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="database_user">{tmpl_var name='database_user_txt'}</label>
       	<div style="float: left;">{tmpl_var name='database_user_prefix'} </div>
-        <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="database_password">{tmpl_var name='database_password_txt'}</label>
-        <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='password_strength_txt'}</p>
@@ -54,7 +54,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
-        <select name="database_charset" id="database_charset" class="selectInput">
+        <select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
 					{tmpl_var name='database_charset'}
 				</select>
       </div>
diff --git a/interface/web/sites/templates/ftp_user_advanced.htm b/interface/web/sites/templates/ftp_user_advanced.htm
index 608fc6f55..1520630b5 100644
--- a/interface/web/sites/templates/ftp_user_advanced.htm
+++ b/interface/web/sites/templates/ftp_user_advanced.htm
@@ -4,14 +4,14 @@
 <div class="panel panel_ftp_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Options</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="uid">{tmpl_var name='uid_txt'}</label>
-        <input name="uid" id="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="uid" id="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="gid">{tmpl_var name='gid_txt'}</label>
-        <input name="gid" id="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="gid" id="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="dir">{tmpl_var name='dir_txt'}</label>
@@ -19,23 +19,23 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="quota_files">{tmpl_var name='quota_files_txt'}</label>
-        <input name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7" type="text" class="textInput" />
+        <input name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;{tmpl_var name='quota_files_unity_txt'}</p>
 			</div>
       <div class="ctrlHolder">
       	<label for="ul_ratio">{tmpl_var name='ul_ratio_txt'}</label>
-        <input name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7" type="text" class="textInput" />
+        <input name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
 			</div>
       <div class="ctrlHolder">
       	<label for="dl_ratio">{tmpl_var name='dl_ratio_txt'}</label>
-        <input name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7" type="text" class="textInput" />
+        <input name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
 			</div>
       <div class="ctrlHolder">
       	<label for="ul_bandwidth">{tmpl_var name='ul_bandwidth_txt'}</label>
-        <input name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7" type="text" class="textInput" />
+        <input name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;kb/s</p>
 			</div>
       <div class="ctrlHolder">
       	<label for="dl_bandwidth">{tmpl_var name='dl_bandwidth_txt'}</label>
-        <input name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7" type="text" class="textInput" />
+        <input name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;kb/s</p>
 			</div>
     </fieldset>
 
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index e6d24a28c..f7588b331 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_ftp_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>FTP User</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
         <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
@@ -18,7 +18,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="password">{tmpl_var name='password_txt'}</label>
-        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" />
+        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value)" />
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='password_strength_txt'}</p>
@@ -27,7 +27,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
-        <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput" />
+        <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='active_txt'}</p>
diff --git a/interface/web/sites/templates/shell_user_advanced.htm b/interface/web/sites/templates/shell_user_advanced.htm
index 48ecceed0..eb7d8ceb1 100644
--- a/interface/web/sites/templates/shell_user_advanced.htm
+++ b/interface/web/sites/templates/shell_user_advanced.htm
@@ -4,14 +4,14 @@
 <div class="panel panel_shell_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Options</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="puser">{tmpl_var name='puser_txt'}</label>
-        <input name="puser" id="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="puser" id="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="pgroup">{tmpl_var name='pgroup_txt'}</label>
-        <input name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="shell">{tmpl_var name='shell_txt'}</label>
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 935374907..814bc65a7 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_shell_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Shell User</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
         <select name="parent_domain_id" id="parent_domain_id" class="selectInput" {tmpl_var name='parent_domain_id_disabled'}>
@@ -27,13 +27,13 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="chroot">{tmpl_var name='chroot_txt'}</label>
-        <select name="chroot" id="chroot" class="selectInput">
+        <select name="chroot" id="chroot" class="selectInput formLengthHalf">
 					{tmpl_var name='chroot'}
 				</select>
       </div>
       <div class="ctrlHolder">
       	<label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
-        <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput" />
+        <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='active_txt'}</p>
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
index 9de6619bc..76aca15f8 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_web_domain">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Domain</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="domain">{tmpl_var name='domain_txt'}</label>
         <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
@@ -17,7 +17,7 @@
       </div>
       <div class="ctrlHolder">
       	<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
-        <select name="redirect_type" id="redirect_type" class="selectInput">
+        <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
 					{tmpl_var name='redirect_type'}
 				</select>
       </div>
@@ -27,7 +27,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
-        <select name="subdomain" id="subdomain" class="selectInput">
+        <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
 					{tmpl_var name='subdomain'}
 				</select>
       </div>
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm
index f0a4b0ba8..6c92a90ef 100644
--- a/interface/web/sites/templates/web_domain_advanced.htm
+++ b/interface/web/sites/templates/web_domain_advanced.htm
@@ -4,22 +4,22 @@
 <div class="panel panel_web_domain">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Options</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="document_root">{tmpl_var name='document_root_txt'}</label>
         <input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="text" class="textInput" />
 			</div>
       <div class="ctrlHolder">
       	<label for="system_user">{tmpl_var name='system_user_txt'}</label>
-        <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="system_group">{tmpl_var name='system_group_txt'}</label>
-        <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
-        <input name="apache_directives" id="apache_directives" value="{tmpl_var name='apache_directives'}" size="30" maxlength="255" type="text" class="textInput" />
+      	<textarea name="apache_directives" id="apache_directives" rows='10' cols='30'>{tmpl_var name='apache_directives'}</textarea>
 			</div>
     </fieldset>
 
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 404657e9a..55f4a1142 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -1,132 +1,132 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Domain</legend>
-      <tmpl_if name="is_admin">
-      <div class="ctrlHolder">
-      	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput">
-					{tmpl_var name='server_id'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
-        <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='client_group_id'}
-				</select>
-      </div>
-      </tmpl_if>
-      <tmpl_if name="is_reseller">
-      <div class="ctrlHolder">
-      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
-        <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='client_group_id'}
-				</select>
-      </div>
-      </tmpl_if>
-      <div class="ctrlHolder">
-      	<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
-        <select name="ip_address" id="ip_address" class="selectInput">
-					{tmpl_var name='ip_address'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="domain">{tmpl_var name='domain_txt'}</label>
-        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
-			</div>
-<!--
-      <div class="ctrlHolder">
-      	<label for="type">{tmpl_var name='type_txt'}</label>
-        <select name="type" id="type" class="selectInput">
-					{tmpl_var name='type'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
-        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
-					{tmpl_var name='parent_domain_id'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="vhost_type">{tmpl_var name='vhost_type_txt'}</label>
-        <select name="vhost_type" id="vhost_type" class="selectInput">
-					{tmpl_var name='vhost_type'}
-				</select>
-      </div>
--->
-      <div class="ctrlHolder">
-      	<label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
-        <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
-        <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='cgi_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='cgi'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='ssi_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='ssi'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='suexec_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='suexec'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='errordocs_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='errordocs'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='is_subdomainwww_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='is_subdomainwww'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
-        <select name="subdomain" id="subdomain" class="selectInput">
-					{tmpl_var name='subdomain'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='ssl_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='ssl'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="php">{tmpl_var name='php_txt'}</label>
-        <select name="php" id="php" class="selectInput">
-					{tmpl_var name='php'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='active_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='active'}
-					</div>
-			</div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels">
+      <tmpl_if name="is_admin">
+      <div class="ctrlHolder">
+      	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
+        <select name="server_id" id="server_id" class="selectInput">
+					{tmpl_var name='server_id'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+        <select name="client_group_id" id="client_group_id" class="selectInput">
+					{tmpl_var name='client_group_id'}
+				</select>
+      </div>
+      </tmpl_if>
+      <tmpl_if name="is_reseller">
+      <div class="ctrlHolder">
+      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+        <select name="client_group_id" id="client_group_id" class="selectInput">
+					{tmpl_var name='client_group_id'}
+				</select>
+      </div>
+      </tmpl_if>
+      <div class="ctrlHolder">
+      	<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+        <select name="ip_address" id="ip_address" class="selectInput formLengthIPv4">
+					{tmpl_var name='ip_address'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="domain">{tmpl_var name='domain_txt'}</label>
+        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+			</div>
+<!--
+      <div class="ctrlHolder">
+      	<label for="type">{tmpl_var name='type_txt'}</label>
+        <select name="type" id="type" class="selectInput">
+					{tmpl_var name='type'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+					{tmpl_var name='parent_domain_id'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="vhost_type">{tmpl_var name='vhost_type_txt'}</label>
+        <select name="vhost_type" id="vhost_type" class="selectInput">
+					{tmpl_var name='vhost_type'}
+				</select>
+      </div>
+-->
+      <div class="ctrlHolder">
+      	<label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
+        <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
+        <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='cgi_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='cgi'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='ssi_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='ssi'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='suexec_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='suexec'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='errordocs_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='errordocs'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='is_subdomainwww_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='is_subdomainwww'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+        <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+					{tmpl_var name='subdomain'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='ssl_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='ssl'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="php">{tmpl_var name='php_txt'}</label>
+        <select name="php" id="php" class="selectInput formLengthHalf">
+					{tmpl_var name='php'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='active_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='active'}
+					</div>
+			</div>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm
index 510066f4e..89e6fab80 100644
--- a/interface/web/sites/templates/web_domain_redirect.htm
+++ b/interface/web/sites/templates/web_domain_redirect.htm
@@ -4,10 +4,10 @@
 <div class="panel panel_web_domain">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Redirect</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
-        <select name="redirect_type" id="redirect_type" class="selectInput">
+        <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
 					{tmpl_var name='redirect_type'}
 				</select>
       </div>
diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_domain_ssl.htm
index 94e0eedf7..0017e0e8f 100644
--- a/interface/web/sites/templates/web_domain_ssl.htm
+++ b/interface/web/sites/templates/web_domain_ssl.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_web_domain">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>SSL</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
         <input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
@@ -39,7 +39,7 @@
       </div>
       <div class="ctrlHolder">
       	<label for="ssl_action">{tmpl_var name='ssl_action_txt'}</label>
-        <select name="ssl_action" id="ssl_action" class="selectInput">
+        <select name="ssl_action" id="ssl_action" class="selectInput formLengthHalf">
 					{tmpl_var name='ssl_action'}
 				</select>
       </div>
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm
index 3441feed0..7c08fc093 100644
--- a/interface/web/sites/templates/web_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_subdomain_edit.htm
@@ -4,14 +4,14 @@
 <div class="panel panel_web_subdomain">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Domain</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="domain">{tmpl_var name='domain_txt'}</label>
         <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
 			</div>
       <div class="ctrlHolder">
       	<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
-        <select name="redirect_type" id="redirect_type" class="selectInput">
+        <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
 					{tmpl_var name='redirect_type'}
 				</select>
       </div>
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index 208d56437..658b94faf 100644
--- a/interface/web/tools/templates/user_settings.htm
+++ b/interface/web/tools/templates/user_settings.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_usersettings">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Users</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="passwort">{tmpl_var name='passwort_txt'}</label>
         <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value)"/>
@@ -27,7 +27,7 @@
 
     <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
-    <div class="wf_actions buttons">
+    <div class="buttonHolder buttons">
       <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','tools/user_settings.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
       <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('tools/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
     </div>
-- 
GitLab