diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm
index c57aa6ffeb9a0bf9adabbf74aa631dd728cf7d3d..aab36db6cbfbaa804730f393a90e5d4823bc89ab 100644
--- a/interface/web/mail/templates/mail_get_edit.htm
+++ b/interface/web/mail/templates/mail_get_edit.htm
@@ -21,7 +21,7 @@
</div>
<div class="ctrlHolder">
<label for="source_password">{tmpl_var name='source_password_txt'}</label>
- <input name="source_password" id="source_password" value="{tmpl_var name='source_password'}" size="30" maxlength="255" type="text" class="textInput" />
+ <input name="source_password" id="source_password" value="{tmpl_var name='source_password'}" size="30" maxlength="255" type="password" class="textInput" />
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='source_delete_txt'}</p>
diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm
index 1bfb88af1e4e3263a5bd91c11fcf30bbd1f4be80..9250082658476f5d328122287a53b697f8bb0f57 100644
--- a/interface/web/mail/templates/mail_transport_edit.htm
+++ b/interface/web/mail/templates/mail_transport_edit.htm
@@ -17,7 +17,7 @@
</div>
<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>
@@ -33,7 +33,7 @@
</div>
<div class="ctrlHolder">
<label for="sort_order">{tmpl_var name='sort_order_txt'}</label>
- <select name="sort_order" id="sort_order" class="selectInput">
+ <select name="sort_order" id="sort_order" class="selectInput formLengthHalf">
{tmpl_var name='sort_order'}
</select>
</div>
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 9bd676d623d8d0d0e1bfcba233b7bf5a5529abef..9045dbf0a0ee1403c330130141f0f721a80e14b8 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -8,9 +8,9 @@
<div class="ctrlHolder">
<p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
<div class="multiField">
- <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+ <label for="email_local_part" class="blockLabel formLengthEmailDomain">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
<label for="email_at" class="blockLabel email_at"> <span id="email_at" name="email_at" />@</label>
- <label for="email_domain" class="blockLabel">Domain<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+ <label for="email_domain" class="blockLabel formLengthEmailDomain">Domain<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
</div>
</div>
<div class="ctrlHolder">
@@ -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" />
+ <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="policy">{tmpl_var name='policy_txt'}</label>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
index 9ba650e6d798fb9ae2c17ad458c31960a0b3ec44..fc1d5d12a9cbc8bb3df8e460ab3d092d445748ca 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
@@ -25,7 +25,7 @@
</div>
<div class="ctrlHolder">
<label for="priority">{tmpl_var name='priority_txt'}</label>
- <select name="priority" id="priority" class="selectInput">
+ <select name="priority" id="priority" class="selectInput formLengthHalf">
{tmpl_var name='priority'}
</select>
</div>
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm
index a4cd26044ed6466fe26dbba70e25a1ef1d23c378..a85aec04246f2ca0947090ef93be67b192c30644 100644
--- a/interface/web/mail/templates/spamfilter_other_edit.htm
+++ b/interface/web/mail/templates/spamfilter_other_edit.htm
@@ -23,19 +23,19 @@
</div>
<div class="ctrlHolder">
<label for="warnvirusrecip">{tmpl_var name='warnvirusrecip_txt'}</label>
- <select name="warnvirusrecip" id="warnvirusrecip" class="selectInput">
+ <select name="warnvirusrecip" id="warnvirusrecip" class="selectInput formLengthBool">
{tmpl_var name='warnvirusrecip'}
</select>
</div>
<div class="ctrlHolder">
<label for="warnbannedrecip">{tmpl_var name='warnbannedrecip_txt'}</label>
- <select name="warnbannedrecip" id="warnbannedrecip" class="selectInput">
+ <select name="warnbannedrecip" id="warnbannedrecip" class="selectInput formLengthBool">
{tmpl_var name='warnbannedrecip'}
</select>
</div>
<div class="ctrlHolder">
<label for="warnbadhrecip">{tmpl_var name='warnbadhrecip_txt'}</label>
- <select name="warnbadhrecip" id="warnbadhrecip" class="selectInput">
+ <select name="warnbadhrecip" id="warnbadhrecip" class="selectInput formLengthBool">
{tmpl_var name='warnbadhrecip'}
</select>
</div>
@@ -61,7 +61,7 @@
</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="255" type="text" class="textInput" />
+ <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="banned_rulenames">{tmpl_var name='banned_rulenames_txt'}</label>
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm
index c2cf6f01680615f07fab3c29e78b551979782097..47802440c0f333e4d790828b6c31d68bbe54ab4d 100644
--- a/interface/web/mail/templates/spamfilter_policy_edit.htm
+++ b/interface/web/mail/templates/spamfilter_policy_edit.htm
@@ -11,43 +11,43 @@
</div>
<div class="ctrlHolder">
<label for="virus_lover">{tmpl_var name='virus_lover_txt'}</label>
- <select name="virus_lover" id="virus_lover" class="selectInput">
+ <select name="virus_lover" id="virus_lover" class="selectInput formLengthBool">
{tmpl_var name='virus_lover'}
</select>
</div>
<div class="ctrlHolder">
<label for="spam_lover">{tmpl_var name='spam_lover_txt'}</label>
- <select name="spam_lover" id="spam_lover" class="selectInput">
+ <select name="spam_lover" id="spam_lover" class="selectInput formLengthBool">
{tmpl_var name='spam_lover'}
</select>
</div>
<div class="ctrlHolder">
<label for="banned_files_lover">{tmpl_var name='banned_files_lover_txt'}</label>
- <select name="banned_files_lover" id="banned_files_lover" class="selectInput">
+ <select name="banned_files_lover" id="banned_files_lover" class="selectInput formLengthBool">
{tmpl_var name='banned_files_lover'}
</select>
</div>
<div class="ctrlHolder">
<label for="bad_header_lover">{tmpl_var name='bad_header_lover_txt'}</label>
- <select name="bad_header_lover" id="bad_header_lover" class="selectInput">
+ <select name="bad_header_lover" id="bad_header_lover" class="selectInput formLengthBool">
{tmpl_var name='bad_header_lover'}
</select>
</div>
<div class="ctrlHolder">
<label for="bypass_virus_checks">{tmpl_var name='bypass_virus_checks_txt'}</label>
- <select name="bypass_virus_checks" id="bypass_virus_checks" class="selectInput">
+ <select name="bypass_virus_checks" id="bypass_virus_checks" class="selectInput formLengthBool">
{tmpl_var name='bypass_virus_checks'}
</select>
</div>
<div class="ctrlHolder">
<label for="bypass_banned_checks">{tmpl_var name='bypass_banned_checks_txt'}</label>
- <select name="bypass_banned_checks" id="bypass_banned_checks" class="selectInput">
+ <select name="bypass_banned_checks" id="bypass_banned_checks" class="selectInput formLengthBool">
{tmpl_var name='bypass_banned_checks'}
</select>
</div>
<div class="ctrlHolder">
<label for="bypass_header_checks">{tmpl_var name='bypass_header_checks_txt'}</label>
- <select name="bypass_header_checks" id="bypass_header_checks" class="selectInput">
+ <select name="bypass_header_checks" id="bypass_header_checks" class="selectInput formLengthBool">
{tmpl_var name='bypass_header_checks'}
</select>
</div>
diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
index 1707457f34da90752b07b600c3f93fc41ac01f79..45fa36adfd955c3ba2487c79daf9e727e4b0b85f 100644
--- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm
+++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
@@ -7,27 +7,27 @@
<fieldset class="inlineLabels"><legend>Tag-Level</legend>
<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" />
+ <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" />
</div>
<div class="ctrlHolder">
<label for="spam_tag2_level">{tmpl_var name='spam_tag2_level_txt'}</label>
- <input name="spam_tag2_level" id="spam_tag2_level" value="{tmpl_var name='spam_tag2_level'}" size="10" maxlength="255" type="text" class="textInput" />
+ <input name="spam_tag2_level" id="spam_tag2_level" value="{tmpl_var name='spam_tag2_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="spam_kill_level">{tmpl_var name='spam_kill_level_txt'}</label>
- <input name="spam_kill_level" id="spam_kill_level" value="{tmpl_var name='spam_kill_level'}" size="10" maxlength="255" type="text" class="textInput" />
+ <input name="spam_kill_level" id="spam_kill_level" value="{tmpl_var name='spam_kill_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="spam_dsn_cutoff_level">{tmpl_var name='spam_dsn_cutoff_level_txt'}</label>
- <input name="spam_dsn_cutoff_level" id="spam_dsn_cutoff_level" value="{tmpl_var name='spam_dsn_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput" />
+ <input name="spam_dsn_cutoff_level" id="spam_dsn_cutoff_level" value="{tmpl_var name='spam_dsn_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="spam_quarantine_cutoff_level">{tmpl_var name='spam_quarantine_cutoff_level_txt'}</label>
- <input name="spam_quarantine_cutoff_level" id="spam_quarantine_cutoff_level" value="{tmpl_var name='spam_quarantine_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput" />
+ <input name="spam_quarantine_cutoff_level" id="spam_quarantine_cutoff_level" value="{tmpl_var name='spam_quarantine_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="spam_modifies_subj">{tmpl_var name='spam_modifies_subj_txt'}</label>
- <select name="spam_modifies_subj" id="spam_modifies_subj" class="selectInput">
+ <select name="spam_modifies_subj" id="spam_modifies_subj" class="selectInput formLengthBool">
{tmpl_var name='spam_modifies_subj'}
</select>
</div>
diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm
index 6fc90e17a75eec2224f74824cfa76036fc6ab2b5..10b2e533f57353ad56032b7f76838908bab44a4f 100644
--- a/interface/web/mail/templates/spamfilter_users_edit.htm
+++ b/interface/web/mail/templates/spamfilter_users_edit.htm
@@ -13,7 +13,7 @@
</div>
<div class="ctrlHolder">
<label for="priority">{tmpl_var name='priority_txt'}</label>
- <select name="priority" id="priority" class="selectInput">
+ <select name="priority" id="priority" class="selectInput formLengthLimit">
{tmpl_var name='priority'}
</select>
</div>
@@ -33,7 +33,7 @@
</div>
<div class="ctrlHolder">
<label for="local">{tmpl_var name='local_txt'}</label>
- <select name="local" id="local" class="selectInput">
+ <select name="local" id="local" class="selectInput formLengthBool">
{tmpl_var name='local'}
</select>
</div>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
index eead71c97998ee39dc52c4d6fefe37a9e1825162..4887c441e2a25a3a614cf4bf683cd71a7d8b8d75 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
@@ -25,7 +25,7 @@
</div>
<div class="ctrlHolder">
<label for="priority">{tmpl_var name='priority_txt'}</label>
- <select name="priority" id="priority" class="selectInput">
+ <select name="priority" id="priority" class="selectInput formLengthHalf">
{tmpl_var name='priority'}
</select>
</div>
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css
index 8026c56eee724aa5ef786e24c5b4ef3206899f38..783bb331c89636cf110eb447e6a53156286ae199 100644
--- a/interface/web/themes/default/css/screen/content_ispc.css
+++ b/interface/web/themes/default/css/screen/content_ispc.css
@@ -293,9 +293,27 @@
}
.textDisplay { display: block; }
- select#language { width: 100px; }
- .panel_dns_soa * input#refresh, .panel_dns_soa * input#retry, .panel_dns_soa * input#expire, .panel_dns_soa * input#minimum, .panel_dns_soa * input#ttl { width: 100px; }
-
+ /* Form Length Classes */
+ .textInput.formLengthBool { width: 25px !important; }
+ .selectInput.formLengthBool { width: 60px !important; }
+ .textInput.formLengthLimit { width: 50px !important; }
+ .selectInput.formLengthLimit { width: 85px !important; }
+ .formLengthDate { width: 75px !important; }
+ .formLengthIPv4 { width: 125px !important; }
+ .formLengthIPv6 { width: 100% !important; }
+ .formLengthEmailUser { width: 30% !important; }
+ .formLengthEmailDomain { width: 30% !important; }
+ .formLengthHalf { width: 15% !important; }
+ .formLengthDouble { width: 50% !important; }
+
+ /* Individual Form Lengths */
+ .textInput#username, .textInput#password, .textInput#passwort, .textInput#source_password { width: 100px; }
+ .selectInput#language { width: 75px; }
+ .selectInput#client_group_id { width: 125px; }
+ input#refresh, input#retry, input#expire, input#minimum, input#ttl { width: 50px !important; }
+
+ /* --- */
+
a[href $='#logout'] { padding-right: 18px; background: transparent url("../../icons/x16/logout.png") no-repeat right top !important; }
/* Select Menu with Images */
diff --git a/interface/web/themes/default/css/screen/uni-form.css b/interface/web/themes/default/css/screen/uni-form.css
index aa6e306d39b041282552dff97af5cf21f89312d2..c3f167d4e469bab12fc2b9f397fd61ec60e2dc71 100644
--- a/interface/web/themes/default/css/screen/uni-form.css
+++ b/interface/web/themes/default/css/screen/uni-form.css
@@ -38,20 +38,20 @@
.uniForm .textInput,
.uniForm .blockLabels .textInput,
- .uniForm .blockLabels .fileUpload{ width: 53%; /* <- Required property */ }
+ .uniForm .blockLabels .fileUpload{ width: 43%; /* <- Required property */ }
.uniForm .selectInput,
.uniForm select,
.uniForm .blockLabels .selectInput,
- .uniForm .blockLabels select{ width: 53.5%; /* <- Required property */ }
+ .uniForm .blockLabels select{ width: 43.5%; /* <- Required property */ }
.uniForm textarea,
- .uniForm .blockLabels textarea{ width: 53%; /* <- Required property */ height: 12em; }
+ .uniForm .blockLabels textarea{ width: 43%; /* <- Required property */ height: 12em; }
.uniForm .formHint,
- .uniForm .blockLabels .formHint{ width: 45%; /* <- Required property */ font-size: .9em; color: #777; position: relative; top: -.5em; }
+ .uniForm .blockLabels .formHint{ width: 35%; /* <- Required property */ font-size: .9em; color: #777; position: relative; top: -.5em; }
.uniForm .multiField,
- .uniForm .blockLabels .multiField{ width: 53%; }
+ .uniForm .blockLabels .multiField{ width: 43%; }
.uniForm .multiField .inlineLabel,
.uniForm .blockLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
.uniForm .multiField .blockLabel,
@@ -69,19 +69,19 @@
.uniForm .inlineLabels .ctrlHolder{}
.uniForm .inlineLabels label,
- .uniForm .inlineLabels .label{ width: 45%; /* <- Required property */ margin: .3em 2% 0 0; /* <- Required property */ }
+ .uniForm .inlineLabels .label{ width: 35%; /* <- Required property */ margin: .3em 2% 0 0; /* <- Required property */ }
.uniForm .inlineLabels .textInput,
- .uniForm .inlineLabels .fileUpload{ width: 45%; /* <- Required property */ }
+ .uniForm .inlineLabels .fileUpload{ width: 35%; /* <- Required property */ }
.uniForm .inlineLabels .selectInput,
- .uniForm .inlineLabels select{ width: 45%; /* <- Required property */ }
+ .uniForm .inlineLabels select{ width: 35%; /* <- Required property */ }
- .uniForm .inlineLabels textarea{ width: 45%; /* <- Required property */ height: 12em; }
+ .uniForm .inlineLabels textarea{ width: 35%; /* <- Required property */ height: 12em; }
- .uniForm .inlineLabels .formHint{ margin-top: 0; margin-left: 47%; font-size: .9em; color: #777; position: static; }
+ .uniForm .inlineLabels .formHint{ margin-top: 0; margin-left: 37%; font-size: .9em; color: #777; position: static; }
- .uniForm .inlineLabels .multiField{ width: 45%; /* <- Required property */ margin: 0 0 .3em 0; }
+ .uniForm .inlineLabels .multiField{ width: 60%; /* <- Required property */ margin: 0 0 .3em 0; }
.uniForm .inlineLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
.uniForm .inlineLabels .multiField .blockLabel{ float: left; width: 26%; margin: 0 3% 0 0; }
.uniForm .inlineLabels .multiField .blockLabel .textInput,
@@ -94,10 +94,10 @@
.uniForm div.focused .formHint{ color: #333; }
/* Columns (they are floated left by default) */
-.uniForm .col{ width: 47.9%; /* <- Required property */ margin: 0 2% 20px 0; }
+.uniForm .col{ width: 37.9%; /* <- Required property */ margin: 0 2% 20px 0; }
/* Use .first and .last classes to control the layout/spacing of your columns */
-.uniForm .col.first{ width: 49%; /* <- Required property */ float: left; clear: none; }
-.uniForm .col.last{ width: 49%; /* <- Required property */ float: right; clear: none; margin-right: 0; }
+.uniForm .col.first{ width: 39%; /* <- Required property */ float: left; clear: none; }
+.uniForm .col.last{ width: 39%; /* <- Required property */ float: right; clear: none; margin-right: 0; }
/* Messages */
.uniForm #errorMsg{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; }