From e3170a151f39a7a23f67a1a6343ffa902ccdbd5b Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Mon, 24 Nov 2008 20:31:41 +0000
Subject: [PATCH] css-style police for the password strenght check ;-)

---
 .../web/admin/templates/users_user_edit.htm   |   5 ++---
 .../client/templates/client_edit_address.htm  |   5 ++---
 .../mail/templates/mail_user_mailbox_edit.htm |   5 ++---
 .../web/sites/templates/database_edit.htm     |   5 ++---
 .../web/sites/templates/ftp_user_edit.htm     |   5 ++---
 .../web/sites/templates/shell_user_edit.htm   |   5 ++---
 .../default/css/screen/content_ispc.css       |  12 +++++++++++
 .../web/themes/default/css/screen/wforms.css  |  20 +++++++++++++++++-
 .../web/themes/default/images/meter_bg.gif    | Bin 0 -> 80 bytes
 .../web/tools/templates/user_settings.htm     |   5 ++---
 10 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 interface/web/themes/default/images/meter_bg.gif

diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index 64671e3c2..9e485ba0c 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;">&nbsp;</span>
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</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 8adaeb1db..a767d82dc 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;">&nbsp;</span>
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</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 4ac4b120c..310deb708 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;">&nbsp;</span>
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</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 757755b69..671edee73 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;">&nbsp;</span>
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</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 151cb7db4..0b61bb4c5 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;">&nbsp;</span>
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</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 1cf37e7a0..bcca605be 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;">&nbsp;</span>
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</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 c97a36400..19f911b15 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 06c9b61dc..b0edb1ec8 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
GIT binary patch
literal 80
zcmZ?wbhEHb<YM4rn8?5|bLPzd|Nk?9f#OdVP6h@h1|1L&B+tO1$iT`W<FO&Zk%5g}
d$wz}>;o&v`Mvplj9~ZiI@Q54Tkq}_81^~*D5+?uv

literal 0
HcmV?d00001

diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index cf9b5240a..7d751ab94 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;">&nbsp;</span>
+        <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+        <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
       </span>
       <span class="wf_oneField">
         <label for="passwort2" class="wf_preField">{tmpl_var name='passwort_txt'}</label>
-- 
GitLab