template display fixes

interface/web/dns/templates/dns_a_edit.htm

@@ -4,14 +4,15 @@
 <div class="panel panel_dns_a">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS A</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" />
+				<p class="formHint">{tmpl_var name='name_hint_txt'}</p>
 			</div>
       <div class="ctrlHolder">
       	<label for="data">{tmpl_var name='data_txt'}</label>
-        <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+        <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput formLengthIPv4" />
 			</div>
       <div class="ctrlHolder">
       	<label for="ttl">{tmpl_var name='ttl_txt'}</label>

interface/web/dns/templates/dns_alias_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_alias">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS ALIAS</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" />

interface/web/dns/templates/dns_cname_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_cname">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS CNAME</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" />

interface/web/dns/templates/dns_hinfo_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_hinfo">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS HINFO</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" />

interface/web/dns/templates/dns_mx_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_mx">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS mx</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" />
@@ -15,7 +15,7 @@
 			</div>
       <div class="ctrlHolder">
       	<label for="aux">{tmpl_var name='aux_txt'}</label>
-        <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput" />
+        <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
 			</div>
       <div class="ctrlHolder">
       	<label for="ttl">{tmpl_var name='ttl_txt'}</label>

interface/web/dns/templates/dns_ns_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_ns">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS ns</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" />

interface/web/dns/templates/dns_ptr_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_ptr">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS ptr</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" />

interface/web/dns/templates/dns_rp_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_rp">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS RP</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" />

interface/web/dns/templates/dns_srv_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_srv">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS SRV</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" />

interface/web/dns/templates/dns_template_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_template">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS Template</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="40" maxlength="255" type="text" class="textInput" />

interface/web/dns/templates/dns_txt_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_dns_txt">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS TXT</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" />

interface/web/mail/lib/lang/de_mail_user.lng

-<?php
-$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Passwort';
-$wb['active_txt'] = 'Aktiv';
+<?php
+$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
+$wb['email_txt'] = 'Email';
+$wb['cryptpwd_txt'] = 'Passwort';
+$wb['active_txt'] = 'Aktiv';
 $wb['email_error_isemail'] = 'Emailadresse ist ungültig.';
 $wb['email_error_unique'] = 'Doppelte Emailadresse.';
-$wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['error_no_pwd'] = 'Passwort ist leer.';
-$wb['quota_error_isint'] = 'Mailboxgröße muss eine Zahl sein.';
-$wb['quota_txt'] = 'Quota in MB';
-$wb['server_id_txt'] = 'server_id';
-$wb['password_txt'] = 'Passwort';
-$wb['maildir_txt'] = 'Maildir';
-$wb['postfix_txt'] = 'Aktiviere Empfang';
-$wb['access_txt'] = 'Aktiviere Zugriff';
-$wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- nicht aktiviert -';
-$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
-$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
-$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
-$wb['welcome_mail_message'] = 'Welcome to your new email account.';
-$wb['disableimap_txt'] = 'IMAP deaktivieren';
-$wb['disablepop3_txt'] = 'POP3 deaktivieren';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['error_no_pwd'] = 'Passwort ist leer.';
+$wb['quota_error_isint'] = 'Mailboxgröße muss eine Zahl sein.';
+$wb['quota_txt'] = 'Quota';
+$wb['server_id_txt'] = 'server_id';
+$wb['password_txt'] = 'Passwort';
+$wb['maildir_txt'] = 'Maildir';
+$wb['postfix_txt'] = 'Aktiviere Empfang';
+$wb['access_txt'] = 'Aktiviere Zugriff';
+$wb['policy_txt'] = 'Spamfilter';
+$wb['no_policy'] = '- nicht aktiviert -';
+$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
+$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
+$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
+$wb['welcome_mail_message'] = 'Welcome to your new email account.';
+$wb['disableimap_txt'] = 'IMAP deaktivieren';
+$wb['disablepop3_txt'] = 'POP3 deaktivieren';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
 $wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
 $wb['welcome_mail_fromemail_txt'] = 'webmaster@ihredomain.at';
-?>
-
-
+?>
+
+

interface/web/mail/lib/lang/en_mail_user.lng

@@ -11,10 +11,10 @@ $wb["autoresponder_txt"] = 'Autoresponder';
 $wb["no_domain_perm"] = 'You have no permission for this domain.';
 $wb["error_no_pwd"] = 'Password is empty.';
 $wb["quota_error_isint"] = 'Mailbox size must be a number.';
-$wb["quota_txt"] = 'quota in MB';
-$wb["server_id_txt"] = 'server_id';
-$wb["password_txt"] = 'password';
-$wb["maildir_txt"] = 'maildir';
+$wb["quota_txt"] = 'Quota';
+$wb["server_id_txt"] = 'Aerver_id';
+$wb["password_txt"] = 'Password';
+$wb["maildir_txt"] = 'Maildir';
 $wb["postfix_txt"] = 'Enable Receiving';
 $wb["access_txt"] = 'Enable Access';
 $wb["policy_txt"] = 'Spamfilter';

interface/web/mail/templates/mail_alias_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_alias">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email Alias</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">

interface/web/mail/templates/mail_blacklist_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_blacklist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Blacklist</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">

interface/web/mail/templates/mail_content_filter_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_content_filter">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Filter</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">

interface/web/mail/templates/mail_domain_catchall_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_domain_catchall">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email Catchall</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">

interface/web/mail/templates/mail_domain_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_domain">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Domain</legend>
+    <fieldset class="inlineLabels">
       <tmpl_if name="is_admin">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>

interface/web/mail/templates/mail_forward_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_forward">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email Forward</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">

interface/web/mail/templates/mail_get_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_get">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Get Email</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="type">{tmpl_var name='type_txt'}</label>
         <select name="type" id="type" class="selectInput">

interface/web/mail/templates/mail_transport_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_transport">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Email transport</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">

interface/web/mail/templates/mail_user_autoresponder_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Autoresponder</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
         <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>

interface/web/mail/templates/mail_user_custom_rules_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Custom Rules</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="custom_mailfilter">{tmpl_var name='custom_mailfilter_txt'}</label>
         <textarea name="custom_mailfilter" id="custom_mailfilter" rows='15' cols='30'>{tmpl_var name='custom_mailfilter'}</textarea>

interface/web/mail/templates/mail_user_filter_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user_filter">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_mail_user_filter"><legend>Filter</legend>
+    <fieldset id="wf_area_mail_user_filter">
       <span class="wf_oneField">
         <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
         <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255">

interface/web/mail/templates/mail_user_mailbox_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Mailbox</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">
@@ -24,7 +24,7 @@
 			</div>
 			<div class="ctrlHolder">
       	<label for="quota">{tmpl_var name='quota_txt'}</label>
-        <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />
+        <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
 			</div>
 			<div class="ctrlHolder">
       	<label for="policy">{tmpl_var name='policy_txt'}</label>

interface/web/mail/templates/mail_user_mailfilter_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_user">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Mail Filter</legend>
+    <fieldset class="inlineLabels">
     </fieldset>
 
     <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/mail/templates/mail_whitelist_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_mail_whitelist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Witelist</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">

interface/web/mail/templates/spamfilter_blacklist_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_blacklist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Blacklist</legend>
+    <fieldset class="inlineLabels">
 <!--
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>

interface/web/mail/templates/spamfilter_config_getmail_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_config">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_spamfilter_config"><legend>Getmail</legend>
+    <fieldset id="wf_area_spamfilter_config">
       <span class="wf_oneField">
         <label for="getmail_config_dir" class="wf_preField">{tmpl_var name='getmail_config_dir_txt'}</label>
         <input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255">

interface/web/mail/templates/spamfilter_config_mail_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_config">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_spamfilter_config"><legend>Mail</legend>
+    <fieldset id="wf_area_spamfilter_config">
       <span class="wf_oneField">
         <label for="module" class="wf_preField">{tmpl_var name='module_txt'}</label>
         <select id="module" name="module">{tmpl_var name='module'}</select>

interface/web/mail/templates/spamfilter_config_server_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_config">
 
   <div class="pnl_formsarea">
-    <fieldset id="wf_area_spamfilter_config"><legend>Server</legend>
+    <fieldset id="wf_area_spamfilter_config">
       <span class="wf_oneField">
         <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
         <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255">

interface/web/mail/templates/spamfilter_other_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Other</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="addr_extension_virus">{tmpl_var name='addr_extension_virus_txt'}</label>
         <input name="addr_extension_virus" id="addr_extension_virus" value="{tmpl_var name='addr_extension_virus'}" size="30" maxlength="255" type="text" class="textInput" />

interface/web/mail/templates/spamfilter_policy_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Policy</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="policy_name">{tmpl_var name='policy_name_txt'}</label>
         <input name="policy_name" id="policy_name" value="{tmpl_var name='policy_name'}" size="30" maxlength="255" type="text" class="textInput" />

interface/web/mail/templates/spamfilter_quarantine_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Quarantine</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="virus_quarantine_to">{tmpl_var name='virus_quarantine_to_txt'}</label>
         <input name="virus_quarantine_to" id="virus_quarantine_to" value="{tmpl_var name='virus_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />

interface/web/mail/templates/spamfilter_taglevel_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_policy">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Tag-Level</legend>
+    <fieldset class="inlineLabels">
       <div class="ctrlHolder">
       	<label for="spam_tag_level">{tmpl_var name='spam_tag_level_txt'}</label>
         <input name="spam_tag_level" id="spam_tag_level" value="{tmpl_var name='spam_tag_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />

interface/web/mail/templates/spamfilter_users_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_users">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Users</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">

interface/web/mail/templates/spamfilter_whitelist_edit.htm

@@ -4,7 +4,7 @@
 <div class="panel panel_spamfilter_whitelist">
 
   <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Whitelist</legend>
+    <fieldset class="inlineLabels">
 <!--
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>