From e9b7b1664ca531e041b8f3313272c968c87cdf50 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sun, 8 Mar 2009 18:23:38 +0000
Subject: [PATCH] template display fixes

---
 .../web/admin/lib/lang/de_language_add.lng    | 15 +++++++------
 .../admin/lib/lang/de_language_complete.lng   | 13 ++++++-----
 .../lib/lang/de_software_update_list.lng      | 19 ++++++++--------
 .../web/admin/lib/lang/en_language_add.lng    |  1 +
 .../admin/lib/lang/en_language_complete.lng   |  3 ++-
 .../lib/lang/en_software_update_list.lng      |  1 +
 .../web/admin/templates/firewall_edit.htm     |  2 +-
 interface/web/admin/templates/groups_edit.htm |  4 ++--
 .../web/admin/templates/language_add.htm      |  3 ++-
 .../templates/server_config_fastcgi_edit.htm  |  6 ++---
 .../templates/server_config_getmail_edit.htm  |  2 +-
 .../templates/server_config_jailkit_edit.htm  |  2 +-
 .../templates/server_config_mail_edit.htm     | 22 +++++++++----------
 .../templates/server_config_server_edit.htm   |  9 ++++----
 .../templates/server_config_web_edit.htm      |  2 +-
 .../admin/templates/server_edit_config.htm    |  2 +-
 .../admin/templates/server_edit_services.htm  |  4 ++--
 .../web/admin/templates/server_ip_edit.htm    |  4 ++--
 .../admin/templates/software_repo_edit.htm    |  6 ++---
 .../templates/system_config_mail_edit.htm     |  2 +-
 .../templates/system_config_sites_edit.htm    | 10 ++++-----
 .../web/admin/templates/users_groups_edit.htm |  2 +-
 .../web/admin/templates/users_user_edit.htm   |  4 ++--
 23 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/interface/web/admin/lib/lang/de_language_add.lng b/interface/web/admin/lib/lang/de_language_add.lng
index 3f760ce59..005116963 100644
--- a/interface/web/admin/lib/lang/de_language_add.lng
+++ b/interface/web/admin/lib/lang/de_language_add.lng
@@ -1,9 +1,10 @@
-<?php
+<?php
 $wb['list_head_txt'] = 'Neue Sprache hinzufügen';
 $wb['language_select_txt'] = 'Sprachbasis auswählen';
-$wb['language_new_txt'] = 'Neue Sprache';
-$wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen';
-$wb['btn_cancel_txt'] = 'Zurück';
-?>
-
-
+$wb['language_new_txt'] = 'Neue Sprache';
+$wb["language_new_hint_txt"] = '2 Buchstaben ISO 639-1 Sprachcode (siehe http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen';
+$wb['btn_cancel_txt'] = 'Zurück';
+?>
+
+
diff --git a/interface/web/admin/lib/lang/de_language_complete.lng b/interface/web/admin/lib/lang/de_language_complete.lng
index 6c57280fe..0d1dabc59 100644
--- a/interface/web/admin/lib/lang/de_language_complete.lng
+++ b/interface/web/admin/lib/lang/de_language_complete.lng
@@ -1,8 +1,9 @@
-<?php
-$wb['list_head_txt'] = 'Die ausgewählte Sprache mit der englischen Master Sprachdatei zusammenführen. <br />Dies fügt fehlende Sätze aus der englischen Master Sprachdatei in der gewählten Sprache ein..';
+<?php
+$wb['list_head_txt'] = 'Sprachdatei zusammenführen';
+$wb['list_desc_txt'] = 'Die ausgewählte Sprache mit der englischen Master Sprachdatei zusammenführen. <br />Dies fügt fehlende Sätze aus der englischen Master Sprachdatei in der gewählten Sprache ein.';
 $wb['language_select_txt'] = 'Sprache auswählen';
 $wb['btn_save_txt'] = 'Dateien jetzt zusammenführen';
-$wb['btn_cancel_txt'] = 'Zurück';
-?>
-
-
+$wb['btn_cancel_txt'] = 'Zurück';
+?>
+
+
diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng
index f83ffa46c..c88cb1f15 100644
--- a/interface/web/admin/lib/lang/de_software_update_list.lng
+++ b/interface/web/admin/lib/lang/de_software_update_list.lng
@@ -1,9 +1,10 @@
-<?php
-$wb['list_head_txt'] = 'Softwareupdates';
-$wb['installed_txt'] = 'Aktion';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Aktion';
-?>
-
-
+<?php
+$wb['list_head_txt'] = 'Softwareupdates';
+$wb['server_select_txt'] = 'Server wählen';
+$wb['installed_txt'] = 'Aktion';
+$wb['update_title_txt'] = 'Update';
+$wb['version_txt'] = 'Version';
+$wb['action_txt'] = 'Aktion';
+?>
+
+
diff --git a/interface/web/admin/lib/lang/en_language_add.lng b/interface/web/admin/lib/lang/en_language_add.lng
index 519da572e..2b5e5a40f 100644
--- a/interface/web/admin/lib/lang/en_language_add.lng
+++ b/interface/web/admin/lib/lang/en_language_add.lng
@@ -2,6 +2,7 @@
 $wb["list_head_txt"] = 'Add new language';
 $wb["language_select_txt"] = 'Select language basis';
 $wb["language_new_txt"] = 'New language';
+$wb["language_new_hint_txt"] = '2 characters ISO 639-1 language-code (See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
 $wb['btn_save_txt'] = 'Create new language file set';
 $wb['btn_cancel_txt'] = 'Back';
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_language_complete.lng b/interface/web/admin/lib/lang/en_language_complete.lng
index 734e75c5f..15438775f 100644
--- a/interface/web/admin/lib/lang/en_language_complete.lng
+++ b/interface/web/admin/lib/lang/en_language_complete.lng
@@ -1,5 +1,6 @@
 <?php
-$wb["list_head_txt"] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
+$wb["list_head_txt"] = 'Merge language';
+$wb["list_desc_txt"] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
 $wb["language_select_txt"] = 'Select language';
 $wb['btn_save_txt'] = 'Merge files now';
 $wb['btn_cancel_txt'] = 'Back';
diff --git a/interface/web/admin/lib/lang/en_software_update_list.lng b/interface/web/admin/lib/lang/en_software_update_list.lng
index 3894beb1e..ec4af23a4 100644
--- a/interface/web/admin/lib/lang/en_software_update_list.lng
+++ b/interface/web/admin/lib/lang/en_software_update_list.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['list_head_txt'] = 'Software updates';
+$wb['server_select_txt'] = 'Select server';
 $wb['installed_txt'] = 'Action';
 $wb['update_title_txt'] = 'Update';
 $wb['version_txt'] = 'Version';
diff --git a/interface/web/admin/templates/firewall_edit.htm b/interface/web/admin/templates/firewall_edit.htm
index c8d19463d..554f7d0a0 100644
--- a/interface/web/admin/templates/firewall_edit.htm
+++ b/interface/web/admin/templates/firewall_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_firewall">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Firewall</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput">
diff --git a/interface/web/admin/templates/groups_edit.htm b/interface/web/admin/templates/groups_edit.htm
index cf191d277..6a3434714 100644
--- a/interface/web/admin/templates/groups_edit.htm
+++ b/interface/web/admin/templates/groups_edit.htm
@@ -4,10 +4,10 @@
 <div class="panel panel_groups">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Groups</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="name">{tmpl_var name='name_txt'}</label>
-        <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="description">{tmpl_var name='description_txt'}</label>
diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm
index eeb1fdd62..d2254c289 100644
--- a/interface/web/admin/templates/language_add.htm
+++ b/interface/web/admin/templates/language_add.htm
@@ -13,7 +13,8 @@
       </div>
       <div class="ctrlHolder">
       	<label for="lng_new">{tmpl_var name='language_new_txt'}</label>
-        <input name="lng_new" id="lng_new" value="" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="lng_new" id="lng_new" value="" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+        <p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
 			</div>
     </fieldset>
 
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm
index eb7b3c316..8551d87ab 100644
--- a/interface/web/admin/templates/server_config_fastcgi_edit.htm
+++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server_config">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>FastCGI</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="fastcgi_starter_path">{tmpl_var name='fastcgi_starter_path_txt'}</label>
         <input name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -23,11 +23,11 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="fastcgi_children">{tmpl_var name='fastcgi_children_txt'}</label>
-        <input name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" size="40" maxlength="255" type="text" class="textInput" />
+        <input name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
 			</div>
       <div class="ctrlHolder">
       	<label for="fastcgi_max_requests">{tmpl_var name='fastcgi_max_requests_txt'}</label>
-        <input name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" size="40" maxlength="255" type="text" class="textInput" />
+        <input name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
 			</div>
       <div class="ctrlHolder">
       	<label for="fastcgi_bin">{tmpl_var name='fastcgi_bin_txt'}</label>
diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm
index 01cab8515..fc86eb4ca 100644
--- a/interface/web/admin/templates/server_config_getmail_edit.htm
+++ b/interface/web/admin/templates/server_config_getmail_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server_config">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Getmail</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="getmail_config_dir">{tmpl_var name='getmail_config_dir_txt'}</label>
         <input name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm
index 3f9824b78..ec2081de6 100644
--- a/interface/web/admin/templates/server_config_jailkit_edit.htm
+++ b/interface/web/admin/templates/server_config_jailkit_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server_config">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Jailkit</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="jailkit_chroot_home">{tmpl_var name='jailkit_chroot_home_txt'}</label>
         <input name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" size="40" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index b042526c1..c6943505c 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -4,10 +4,10 @@
 <div class="panel panel_server_config">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Mail</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="module">{tmpl_var name='module_txt'}</label>
-        <select name="module" id="module" class="selectInput">
+        <select name="module" id="module" class="selectInput formLengthHalf">
 					{tmpl_var name='module'}
 				</select>
       </div>
@@ -21,39 +21,39 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="mailuser_uid">{tmpl_var name='mailuser_uid_txt'}</label>
-        <input name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255" type="text" class="textInput" />
+        <input name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="mailuser_gid">{tmpl_var name='mailuser_gid_txt'}</label>
-        <input name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255" type="text" class="textInput" />
+        <input name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="mailuser_name">{tmpl_var name='mailuser_name_txt'}</label>
-        <input name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255" type="text" class="textInput" />
+        <input name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="mailuser_group">{tmpl_var name='mailuser_group_txt'}</label>
-        <input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput" />
+        <input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="relayhost">{tmpl_var name='relayhost_txt'}</label>
-        <input name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255" type="text" class="textInput" />
+        <input name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="relayhost_user">{tmpl_var name='relayhost_user_txt'}</label>
-        <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" class="textInput" />
+        <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="relayhost_password">{tmpl_var name='relayhost_password_txt'}</label>
-        <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="text" class="textInput" />
+        <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="mailbox_size_limit">{tmpl_var name='mailbox_size_limit_txt'}</label>
-        <input name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15" type="text" class="textInput" />
+        <input name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />
 			</div>
       <div class="ctrlHolder">
       	<label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
-        <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15" type="text" class="textInput" />
+        <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />
 			</div>
     </fieldset>
 
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index b03b910b7..bda14cd81 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server_config">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Server</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='auto_network_configuration_txt'}</p>
 					<div class="multiField">
@@ -13,15 +13,15 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
-        <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput" />
+        <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
 			</div>
       <div class="ctrlHolder">
       	<label for="netmask">{tmpl_var name='netmask_txt'}</label>
-        <input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput" />
+        <input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
 			</div>
       <div class="ctrlHolder">
       	<label for="gateway">{tmpl_var name='gateway_txt'}</label>
-        <input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput" />
+        <input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
 			</div>
       <div class="ctrlHolder">
       	<label for="hostname">{tmpl_var name='hostname_txt'}</label>
@@ -30,6 +30,7 @@
       <div class="ctrlHolder">
       	<label for="nameservers">{tmpl_var name='nameservers_txt'}</label>
         <input name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255" type="text" class="textInput" />
+				<p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
 			</div>
     </fieldset>
 
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 0a7d4c45f..c02f39c23 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server_config">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Web</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="website_path">{tmpl_var name='website_path_txt'}</label>
         <input name="website_path" id="website_path" value="{tmpl_var name='website_path'}" size="40" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/admin/templates/server_edit_config.htm b/interface/web/admin/templates/server_edit_config.htm
index d451f3966..02f6ef34d 100644
--- a/interface/web/admin/templates/server_edit_config.htm
+++ b/interface/web/admin/templates/server_edit_config.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Config</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="config">{tmpl_var name='config_txt'}</label>
         <textarea name="config" id="config" rows='20' cols='40'>{tmpl_var name='config'}</textarea>
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
index abca20321..c5a3be685 100644
--- a/interface/web/admin/templates/server_edit_services.htm
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Services</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_name">{tmpl_var name='server_name_txt'}</label>
         <input name="server_name" id="server_name" value="{tmpl_var name='server_name'}" size="30" maxlength="255" type="text" class="textInput" />
@@ -47,7 +47,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="active">{tmpl_var name='active_txt'}</label>
-        <select name="active" id="active" class="selectInput">
+        <select name="active" id="active" class="selectInput formLengthBool">
 					{tmpl_var name='active'}
 				</select>
       </div>
diff --git a/interface/web/admin/templates/server_ip_edit.htm b/interface/web/admin/templates/server_ip_edit.htm
index 67e60f3c4..1ebe8bd91 100644
--- a/interface/web/admin/templates/server_ip_edit.htm
+++ b/interface/web/admin/templates/server_ip_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_server_ip">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>IP Address</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput">
@@ -13,7 +13,7 @@
       </div>
       <div class="ctrlHolder">
       	<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
-        <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="15" type="text" class="textInput" />
+        <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="15" type="text" class="textInput formLengthIPv4" />
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='virtualhost_txt'}</p>
diff --git a/interface/web/admin/templates/software_repo_edit.htm b/interface/web/admin/templates/software_repo_edit.htm
index 90ed5e6f9..af335ecf5 100644
--- a/interface/web/admin/templates/software_repo_edit.htm
+++ b/interface/web/admin/templates/software_repo_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_software_repo">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Repository</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="repo_name">{tmpl_var name='repo_name_txt'}</label>
         <input name="repo_name" id="repo_name" value="{tmpl_var name='repo_name'}" size="40" maxlength="40" type="text" class="textInput" />
@@ -15,11 +15,11 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="repo_username">{tmpl_var name='repo_username_txt'}</label>
-        <input name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" size="30" maxlength="30" type="text" class="textInput" />
+        <input name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" size="30" maxlength="30" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="repo_password">{tmpl_var name='repo_password_txt'}</label>
-        <input name="repo_password" id="repo_password" value="{tmpl_var name='repo_password'}" size="30" maxlength="30" type="password" class="textInput" />
+        <input name="repo_password" id="repo_password" value="{tmpl_var name='repo_password'}" size="30" maxlength="30" type="password" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='active_txt'}</p>
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 06769da77..1dffbc9e1 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_system_config">
   
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Mail</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
 					<div class="multiField">
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
index 0e6e70093..209efaad3 100644
--- a/interface/web/admin/templates/system_config_sites_edit.htm
+++ b/interface/web/admin/templates/system_config_sites_edit.htm
@@ -4,22 +4,22 @@
 <div class="panel panel_system_config">
 	
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Sites</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="dbname_prefix">{tmpl_var name='dbname_prefix_txt'}</label>
-        <input name="dbname_prefix" id="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="dbname_prefix" id="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="dbuser_prefix">{tmpl_var name='dbuser_prefix_txt'}</label>
-        <input name="dbuser_prefix" id="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="dbuser_prefix" id="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="ftpuser_prefix">{tmpl_var name='ftpuser_prefix_txt'}</label>
-        <input name="ftpuser_prefix" id="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="ftpuser_prefix" id="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
       	<label for="shelluser_prefix">{tmpl_var name='shelluser_prefix_txt'}</label>
-        <input name="shelluser_prefix" id="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="shelluser_prefix" id="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='dblist_phpmyadmin_link_txt'}</p>
diff --git a/interface/web/admin/templates/users_groups_edit.htm b/interface/web/admin/templates/users_groups_edit.htm
index 3182d7176..004c7dbd6 100644
--- a/interface/web/admin/templates/users_groups_edit.htm
+++ b/interface/web/admin/templates/users_groups_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_users">
 	
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Groups</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="default_group">{tmpl_var name='default_group_txt'}</label>
         <select name="default_group" id="default_group" class="selectInput">
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index 6063e32db..ce0017823 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -4,7 +4,7 @@
 <div class="panel panel_users">
 	
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Users</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="username">{tmpl_var name='username_txt'}</label>
         <input name="username" id="username" value="{tmpl_var name='username'}" size="15" maxlength="30" type="text" class="textInput" />
@@ -26,7 +26,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
-        <select name="startmodule" id="startmodule" class="selectInput">
+        <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
 					{tmpl_var name='startmodule'}
 				</select>
       </div>
-- 
GitLab