? .DS_Store
? 270302_11_upload_type_namespace_conflict_D7.patch
? 270302_13_upload_type_namespace_conflict_D7.patch
? 270302_8_upload_type_namespace_conflict_D7.patch
? form_required_cursor_01.patch
? password_colouring_00.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: modules/system/system.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.css,v
retrieving revision 1.53
diff -u -p -r1.53 system.css
--- modules/system/system.css	5 Dec 2008 12:50:28 -0000	1.53
+++ modules/system/system.css	13 Mar 2009 18:53:39 -0000
@@ -522,14 +522,22 @@ html.js .js-hide {
 #password-indicator {
   border: 1px solid #B4B4B4;
   float: right;
-  height: 0.9em;
+  height: 1em;
   margin: 0.3em 0.80em 0 0.3em;
+  position: relative;
   width: 5em;
 }
-#password-indicator div {
+#password-indicator #indicator {
   height: 100%;
+  position: absolute;
   width: 0%;
-  background-color: #47C965;
+}
+#password-indicator #label {
+  font-size: 0.9em;
+  line-height: 1em;
+  position: absolute;
+  text-align: center;
+  width: 100%;
 }
 input.password-confirm, input.password-field {
   width: 16em;
Index: modules/user/user.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.js,v
retrieving revision 1.10
diff -u -p -r1.10 user.js
--- modules/user/user.js	18 Feb 2009 13:46:55 -0000	1.10
+++ modules/user/user.js	13 Mar 2009 18:53:39 -0000
@@ -19,7 +19,7 @@ Drupal.behaviors.password = {
       innerWrapper.addClass("password-parent");
 
       // Add the description box at the end.
-      var passwordMeter = '<div id="password-strength"><div class="password-strength-title">' + translate.strengthTitle + '</div><div id="password-indicator"><div id="indicator"></div></div></div>';
+      var passwordMeter = '<div id="password-strength"><div class="password-strength-title">' + translate.strengthTitle + '</div><div id="password-indicator"><div id="indicator"></div><div id="label"</div></div>';
       $("div.description", outerWrapper).prepend('<div class="password-suggestions"></div>');
       $(innerWrapper).append(passwordMeter);
       var passwordDescription = $("div.password-suggestions", outerWrapper).hide();
@@ -49,8 +49,16 @@ Drupal.behaviors.password = {
           passwordDescription.show();
         }
 
+        var indicator = $("#indicator");
         // Adjust the length of the strength indicator.
-        $("#indicator").css('width', result.strength + '%');
+        indicator.css('width', result.strength + '%');
+        // Adjust the color of the strength indicator.
+        var red = Math.ceil((-result.strength + 100) * 2.55).toString(16);
+        var green = Math.ceil(result.strength * 2.55).toString(16);
+        indicator.css('background-color', '#' + red + green + '00');
+        var label = result.strength < 35 ? translate.weak : result.strength < 75 ? translate.fair : translate.strong;
+        $("#label").html(label);
+        
 
         passwordCheckMatch();
       };
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.966
diff -u -p -r1.966 user.module
--- modules/user/user.module	26 Feb 2009 07:30:29 -0000	1.966
+++ modules/user/user.module	13 Mar 2009 18:53:40 -0000
@@ -2530,7 +2530,11 @@ function _user_password_dynamic_validati
         'confirmSuccess' => t('yes'),
         'confirmFailure' => t('no'),
         'confirmTitle' => t('Passwords match:'),
-        'username' => (isset($user->name) ? $user->name : ''))),
+        'username' => (isset($user->name) ? $user->name : ''),
+        'weak' => t('weak'),
+        'fair' => t('fair'),
+        'strong' => t('strong'),
+      )),
       'setting');
     $complete = TRUE;
   }