diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index 64671e3c25c63b32fb0828aadf657bc682ba9deb..9e485ba0c7a68f2657644fe0e14bda10bf53feca 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -13,9 +13,8 @@
<input type="password" id="passwort" name="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" onkeyup="pass_check(this.value)">
</span>
<span class="wf_oneField">
- <label class="wf_preField" style="float:left;">{tmpl_var name='password_strength_txt'}</label>
- <div id="passBar" style="border: 1px solid rgb(0, 0, 0); width: 100px; height: 10px; float:left;"></div>
- <span id="passText" style="margin-left: 10px;"> </span>
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
</span>
<span class="wf_oneField" style="clear:left">
<span class="wf_label wf_preField">{tmpl_var name='modules_txt'}</span>
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 8adaeb1dbdf65487c750828d9cca2e40efb735c3..a767d82dc1b9852434032ff446c5490c0ca389dc 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -21,9 +21,8 @@
<input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" class="wf_required" onkeyup="pass_check(this.value)"><span class="wf_reqMark">*</span><br>
</span>
<span class="wf_oneField">
- <label class="wf_preField" style="float:left;">{tmpl_var name='password_strength_txt'}</label>
- <div id="passBar" style="border: 1px solid rgb(0, 0, 0); width: 100px; height: 10px; float:left;"></div>
- <span id="passText" style="margin-left: 10px;"> </span>
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
</span>
<span class="wf_oneField">
<label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 4ac4b120c7b23aad4d5f8e4bdc1de190294718d9..310deb708d39cb62dab38043b2821e9502e561e7 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -14,9 +14,8 @@
<input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
</span>
<span class="wf_oneField">
- <label class="wf_preField" style="float:left;">{tmpl_var name='password_strength_txt'}</label>
- <div id="passBar" style="border: 1px solid rgb(0, 0, 0); width: 100px; height: 10px; float:left;"></div>
- <span id="passText" style="margin-left: 10px;"> </span>
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
</span>
<span class="wf_oneField">
<label for="quota" class="wf_preField">{tmpl_var name='quota_txt'}</label>
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 757755b6947e0e9a4f3152378fadd48a23f99ac2..671edee73240803cb582ec29527ade918785f7ea 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -37,9 +37,8 @@
<input type="password" id="database_password" name="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" class="wf_required" onkeyup="pass_check(this.value)"><span class="wf_reqMark">*</span><br>
</span>
<span class="wf_oneField">
- <label class="wf_preField" style="float:left;">{tmpl_var name='password_strength_txt'}</label>
- <div id="passBar" style="border: 1px solid rgb(0, 0, 0); width: 100px; height: 10px; float:left;"></div>
- <span id="passText" style="margin-left: 10px;"> </span>
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
</span>
<span class="wf_oneField">
<label for="database_charset" class="wf_preField">{tmpl_var name='database_charset_txt'}</label>
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index 151cb7db4271ee6df705278aa8595b60ebaeb628..0b61bb4c5cc9b8d2b7265e1b907e135df1ae04e6 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -17,9 +17,8 @@
<input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
</span>
<span class="wf_oneField">
- <label class="wf_preField" style="float:left;">{tmpl_var name='password_strength_txt'}</label>
- <div id="passBar" style="border: 1px solid rgb(0, 0, 0); width: 100px; height: 10px; float:left;"></div>
- <span id="passText" style="margin-left: 10px;"> </span>
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
</span>
<span class="wf_oneField">
<label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 1cf37e7a0256cab0a996efb90a46f7882b0bcb80..bcca605be38e57b16554d04104aa172a3cf173c1 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -17,9 +17,8 @@
<input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" onkeyup="pass_check(this.value)">
</span>
<span class="wf_oneField">
- <label class="wf_preField" style="float:left;">{tmpl_var name='password_strength_txt'}</label>
- <div id="passBar" style="border: 1px solid rgb(0, 0, 0); width: 100px; height: 10px; float:left;"></div>
- <span id="passText" style="margin-left: 10px;"> </span>
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
</span>
<span class="wf_oneField">
<label for="chroot" class="wf_preField">{tmpl_var name='chroot_txt'}</label>
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css
index c97a3640074e95ab45b7728259b01373ebff4151..19f911b15004d70a6aa70fd5744b135371b132bb 100644
--- a/interface/web/themes/default/css/screen/content_ispc.css
+++ b/interface/web/themes/default/css/screen/content_ispc.css
@@ -82,6 +82,18 @@
font-size: 0.9em;
}
+ /* Password Strength */
+ #passBar {
+ width: 101px; height: 10px;
+ background: url(../../images/meter_bg.gif) repeat-x bottom left;
+ margin: 2px 0;
+ float: left;
+ }
+ #passText {
+ padding: 0 8px;
+ float: left;
+ }
+
/* Lists */
table.list {
width: 100%;
diff --git a/interface/web/themes/default/css/screen/wforms.css b/interface/web/themes/default/css/screen/wforms.css
index 06c9b61dc6e88aee2c0423d19291bf0870865d9c..b0edb1ec840fc534d6b9ab80f1f458b8af91cf7d 100644
--- a/interface/web/themes/default/css/screen/wforms.css
+++ b/interface/web/themes/default/css/screen/wforms.css
@@ -126,7 +126,25 @@
padding-left: 1em;
vertical-align: top;
}
-
+
+ /* SPANS ======================================================================= */
+ .pnl_formsarea span.wf_preField {
+ display: -moz-inline-box;
+ display: inline-block;
+ margin: 0 8px 0 0;
+ padding: 0 4px;
+ width: 30%;
+ text-align: right;
+ font-size: 90%;
+ float: left;
+ }
+ .wf_passwordStrength {
+ font-size: 1.0em;
+ margin: 0 2px 0 0;
+ padding: 1px 0;
+ vertical-align: top;
+ }
+
/* Buttons ======================================================================= */
form .pnl_formsarea .wf_actions {
diff --git a/interface/web/themes/default/images/meter_bg.gif b/interface/web/themes/default/images/meter_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6b38c6e9592c2624c5f2d763ec9892ed550108ab
Binary files /dev/null and b/interface/web/themes/default/images/meter_bg.gif differ
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index cf9b5240a45618db51aefb17941631c12a6deb09..7d751ab9482acc03e8ae65c3158564e2ea171583 100644
--- a/interface/web/tools/templates/user_settings.htm
+++ b/interface/web/tools/templates/user_settings.htm
@@ -9,9 +9,8 @@
<input type="password" id="passwort" name="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" onkeyup="pass_check(this.value)">
</span>
<span class="wf_oneField">
- <label class="wf_preField" style="float:left;">{tmpl_var name='password_strength_txt'}</label>
- <div id="passBar" style="border: 1px solid rgb(0, 0, 0); width: 100px; height: 10px; float:left;"></div>
- <span id="passText" style="margin-left: 10px;"> </span>
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
</span>
<span class="wf_oneField">
<label for="passwort2" class="wf_preField">{tmpl_var name='passwort_txt'}</label>