Fix password streng container in form to add user - refs BT#18449

main/admin/user_add.php

@@ -16,7 +16,7 @@ api_protect_limit_for_session_admin();
 $is_platform_admin = api_is_platform_admin() ? 1 : 0;
 
 $message = null;
-$htmlHeadXtra[] = api_get_password_checker_js('#username', '#add-user__input-password');
+$htmlHeadXtra[] = api_get_password_checker_js('#username', '#password');
 $htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
 $htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 $htmlHeadXtra[] = '

main/inc/lib/api.lib.php

@@ -8487,8 +8487,19 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
     $(function() {
         var lang = ".json_encode($translations).";
         var options = {
-            onLoad : function () {
-                //$('#messages').text('Start typing password');
+            common: {
+                onLoad: function () {
+                    //$('#messages').text('Start typing password');
+
+                    var inputGroup = $('".$passwordInputId."').parents('.input-group');
+
+                    if (inputGroup.length > 0) {
+                        inputGroup.find('.progress').insertAfter(inputGroup);
+                    }
+                }
+            },
+            ui: {
+                showVerdictsInsideProgressBar: true
             },
             onKeyUp: function (evt) {
                 $(evt.target).pwstrength('outputErrorList');