import ceph quincy 17.2.6

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / core / auth / user-form / user-form.component.html

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html b/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
index df97face81a3f215f2f02669375975ef2ab6668f..ddb0e6ab8aeb6bb1f22b3eae43283a98c71ab19b 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
@@ -53,12 +53,10 @@
                      name="password"
                      autocomplete="new-password"
                      formControlName="password">
-              <span class="input-group-append">
-                <button type="button"
-                        class="btn btn-light"
-                        cdPasswordButton="password">
-                </button>
-              </span>
+              <button type="button"
+                      class="btn btn-light"
+                      cdPasswordButton="password">
+              </button>
             </div>
             <div class="password-strength-level">
               <div class="{{ passwordStrengthLevelClass }}"
@@ -91,12 +89,10 @@
                      name="confirmpassword"
                      autocomplete="new-password"
                      formControlName="confirmpassword">
-              <span class="input-group-append">
-                <button type="button"
-                        class="btn btn-light"
-                        cdPasswordButton="confirmpassword">
-                </button>
-              </span>
+              <button type="button"
+                      class="btn btn-light"
+                      cdPasswordButton="confirmpassword">
+              </button>
               <span class="invalid-feedback"
                     *ngIf="userForm.showError('confirmpassword', formDir, 'match')"
                     i18n>Password confirmation doesn't match the password.</span>
@@ -142,13 +138,11 @@
                      #p="ngbPopover"
                      (click)="p.open()"
                      (keypress)="p.close()">
-              <span class="input-group-append">
-                <button type="button"
-                        class="btn btn-light"
-                        (click)="clearExpirationDate()">
-                  <i class="icon-prepend {{ icons.destroy }}"></i>
-                </button>
-              </span>
+              <button type="button"
+                      class="btn btn-light"
+                      (click)="clearExpirationDate()">
+                <i class="icon-prepend {{ icons.destroy }}"></i>
+              </button>
               <span class="invalid-feedback"
                     *ngIf="userForm.showError('pwdExpirationDate', formDir, 'required')"
                     i18n>This field is required.</span>