#325877 by alpritt: Fixed Password checker breaks if no description.

2 files changed, 7 insertions, 8 deletions

diff --git a/modules/system/system-behavior.css b/modules/system/system-behavior.css
index e8ba0fe1a..7850a56b8 100644
--- a/modules/system/system-behavior.css
+++ b/modules/system/system-behavior.css
@@ -240,7 +240,7 @@ div.password-confirm {
   display: inline;
   padding-left: 1em;
 }
-div.password-suggestions {
+div.form-item div.password-suggestions {
   padding: 0.2em 0.5em;
   margin: 0.7em 0;
   width: 38.5em;
diff --git a/modules/user/user.js b/modules/user/user.js
index 41d3d8d65..eab73495e 100644
--- a/modules/user/user.js
+++ b/modules/user/user.js
@@ -18,19 +18,18 @@ Drupal.behaviors.password = {
       var passwordResult = $('span.password-result', passwordStrength);
       innerWrapper.addClass('password-parent');
 
-      // Add the description box.
-      var passwordMeter = '<div id="password-strength"><div id="password-strength-text" aria-live="assertive"></div><div class="password-strength-title">' + translate.strengthTitle + '</div><div id="password-indicator"><div id="indicator"></div></div></div>';
-
-      $('div.description', outerWrapper).prepend('<div class="password-suggestions"></div>');
-      $(innerWrapper).prepend(passwordMeter);
-      var passwordDescription = $('div.password-suggestions', outerWrapper).hide();
-
       // Add the password confirmation layer.
       $('input.password-confirm', outerWrapper).after('<div class="password-confirm">' + translate['confirmTitle'] + ' <span></span></div>').parent().addClass('confirm-parent');
       var confirmInput = $('input.password-confirm', outerWrapper);
       var confirmResult = $('div.password-confirm', outerWrapper);
       var confirmChild = $('span', confirmResult);
 
+      // Add the description box.
+      var passwordMeter = '<div id="password-strength"><div id="password-strength-text" aria-live="assertive"></div><div class="password-strength-title">' + translate.strengthTitle + '</div><div id="password-indicator"><div id="indicator"></div></div></div>';
+      $(confirmInput).parent().after('<div class="password-suggestions description"></div>');
+      $(innerWrapper).prepend(passwordMeter);
+      var passwordDescription = $("div.password-suggestions", outerWrapper).hide();
+
       // Check the password strength.
       var passwordCheck = function () {