import 15.2.0 Octopus source

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / ceph / block / iscsi-target-discovery-modal / iscsi-target-discovery-modal.component.html

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
index 9fe64e8317158a0e409091079d93f67d45743e14..3562530be92511d3e8dc17b0f0a85741ca70a087 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
@@ -4,27 +4,25 @@
 
   <ng-container class="modal-content">
     <form name="discoveryForm"
-          class="form-horizontal"
           #formDir="ngForm"
           [formGroup]="discoveryForm"
           novalidate>
       <div class="modal-body">
         <!-- User -->
-        <div class="form-group"
-             [ngClass]="{'has-error': discoveryForm.showError('user', formDir)}">
-          <label class="control-label col-sm-4"
+        <div class="form-group row">
+          <label class="cd-col-form-label"
                  for="user"
                  i18n>User</label>
-          <div class="col-sm-8">
+          <div class="cd-col-form-input">
             <input id="user"
                    class="form-control"
                    formControlName="user"
                    type="text">
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('user', formDir, 'required')"
                   i18n>This field is required.</span>
 
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('user', formDir, 'pattern')"
                   i18n>Usernames must have a length of 8 to 64 characters and
               can only contain letters, '.', '@', '-', '_' or ':'.</span>
@@ -32,34 +30,33 @@
         </div>
 
         <!-- Password -->
-        <div class="form-group"
-             [ngClass]="{'has-error': discoveryForm.showError('password', formDir)}">
-          <label class="control-label col-sm-4"
+        <div class="form-group row">
+          <label class="cd-col-form-label"
                  for="password"
                  i18n>Password</label>
-          <div class="col-sm-8">
+          <div class="cd-col-form-input">
             <div class="input-group">
               <input id="password"
                      class="form-control"
                      formControlName="password"
                      type="password">
 
-              <span class="input-group-btn">
+              <span class="input-group-append">
                 <button type="button"
-                        class="btn btn-default"
+                        class="btn btn-light"
                         cdPasswordButton="password">
                 </button>
                 <button type="button"
-                        class="btn btn-default"
+                        class="btn btn-light"
                         cdCopy2ClipboardButton="password">
                 </button>
               </span>
             </div>
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('password', formDir, 'required')"
                   i18n>This field is required.</span>
 
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('password', formDir, 'pattern')"
                   i18n>Passwords must have a length of 12 to 16 characters
               and can only contain letters, '@', '-', '_' or '/'.</span>
@@ -67,23 +64,22 @@
         </div>
 
         <!-- mutual_user -->
-        <div class="form-group"
-             [ngClass]="{'has-error': discoveryForm.showError('mutual_user', formDir)}">
-          <label class="control-label col-sm-4"
+        <div class="form-group row">
+          <label class="cd-col-form-label"
                  for="mutual_user">
             <ng-container i18n>Mutual User</ng-container>
           </label>
-          <div class="col-sm-8">
+          <div class="cd-col-form-input">
             <input id="mutual_user"
                    class="form-control"
                    formControlName="mutual_user"
                    type="text">
 
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('mutual_user', formDir, 'required')"
                   i18n>This field is required.</span>
 
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('mutual_user', formDir, 'pattern')"
                   i18n>Usernames must have a length of 8 to 64 characters and
               can only contain letters, '.', '@', '-', '_' or ':'.</span>
@@ -91,34 +87,33 @@
         </div>
 
         <!-- mutual_password -->
-        <div class="form-group"
-             [ngClass]="{'has-error': discoveryForm.showError('mutual_password', formDir)}">
-          <label class="control-label col-sm-4"
+        <div class="form-group row">
+          <label class="cd-col-form-label"
                  for="mutual_password"
                  i18n>Mutual Password</label>
-          <div class="col-sm-8">
+          <div class="cd-col-form-input">
             <div class="input-group">
               <input id="mutual_password"
                      class="form-control"
                      formControlName="mutual_password"
                      type="password">
 
-              <span class="input-group-btn">
+              <span class="input-group-append">
                 <button type="button"
-                        class="btn btn-default"
+                        class="btn btn-light"
                         cdPasswordButton="mutual_password">
                 </button>
                 <button type="button"
-                        class="btn btn-default"
+                        class="btn btn-light"
                         cdCopy2ClipboardButton="mutual_password">
                 </button>
               </span>
             </div>
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('mutual_password', formDir, 'required')"
                   i18n>This field is required.</span>
 
-            <span class="help-block"
+            <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('mutual_password', formDir, 'pattern')"
                   i18n>Passwords must have a length of 12 to 16 characters and
               can only contain letters, '@', '-', '_' or '/'.</span>