import ceph quincy 17.2.6

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

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
index 852866a86db2c4fa0961ae7321081e2cfc5fb6e4..5e641926955adc7e6f11fa84b1a8fb783756b908 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
@@ -22,15 +22,13 @@
                      name="target_iqn"
                      formControlName="target_iqn"
                      cdTrim />
-              <span class="input-group-append">
-                <button class="btn btn-light"
-                        id="ecp-info-button"
-                        type="button"
-                        (click)="targetSettingsModal()">
-                  <i [ngClass]="[icons.deepCheck]"
-                     aria-hidden="true"></i>
-                </button>
-              </span>
+              <button class="btn btn-light"
+                      id="ecp-info-button"
+                      type="button"
+                      (click)="targetSettingsModal()">
+                <i [ngClass]="[icons.deepCheck]"
+                   aria-hidden="true"></i>
+              </button>
             </div>
 
             <span class="invalid-feedback"
@@ -73,14 +71,12 @@
                        type="text"
                        [value]="portal"
                        disabled />
-                <span class="input-group-append">
-                  <button class="btn btn-light"
-                          type="button"
-                          (click)="removePortal(i, portal)">
-                    <i [ngClass]="[icons.destroy]"
-                       aria-hidden="true"></i>
-                  </button>
-                </span>
+                <button class="btn btn-light"
+                        type="button"
+                        (click)="removePortal(i, portal)">
+                  <i [ngClass]="[icons.destroy]"
+                     aria-hidden="true"></i>
+                </button>
               </div>
             </ng-container>
 
@@ -90,7 +86,7 @@
                            [options]="portalsSelections"
                            [messages]="messages.portals"
                            (selection)="onPortalSelection($event)"
-                           elemClass="btn btn-light float-right">
+                           elemClass="btn btn-light float-end">
                   <i [ngClass]="[icons.add]"></i>
                   <ng-container i18n>Add portal</ng-container>
                 </cd-select>
@@ -123,22 +119,20 @@
                        type="text"
                        [value]="image"
                        disabled />
-                <span class="input-group-append">
-                  <div class="input-group-text"
-                       *ngIf="api_version >= 1">lun: {{ imagesSettings[image]['lun'] }}</div>
-                  <button class="btn btn-light"
-                          type="button"
-                          (click)="imageSettingsModal(image)">
-                    <i [ngClass]="[icons.deepCheck]"
-                       aria-hidden="true"></i>
-                  </button>
-                  <button class="btn btn-light"
-                          type="button"
-                          (click)="removeImage(i, image)">
-                    <i [ngClass]="[icons.destroy]"
-                       aria-hidden="true"></i>
-                  </button>
-                </span>
+                <div class="input-group-text"
+                     *ngIf="api_version >= 1">lun: {{ imagesSettings[image]['lun'] }}</div>
+                <button class="btn btn-light"
+                        type="button"
+                        (click)="imageSettingsModal(image)">
+                  <i [ngClass]="[icons.deepCheck]"
+                     aria-hidden="true"></i>
+                </button>
+                <button class="btn btn-light"
+                        type="button"
+                        (click)="removeImage(i, image)">
+                  <i [ngClass]="[icons.destroy]"
+                     aria-hidden="true"></i>
+                </button>
 
               </div>
 
@@ -171,7 +165,7 @@
                            [options]="imagesSelections"
                            [messages]="messages.images"
                            (selection)="onImageSelection($event)"
-                           elemClass="btn btn-light float-right">
+                           elemClass="btn btn-light float-end">
                   <i [ngClass]="[icons.add]"></i>
                   <ng-container i18n>Add image</ng-container>
                 </cd-select>
@@ -243,14 +237,12 @@
                        id="target_password"
                        name="target_password"
                        formControlName="password" />
-                <span class="input-group-append">
-                  <button type="button"
-                          class="btn btn-light"
-                          cdPasswordButton="target_password">
-                  </button>
-                  <cd-copy-2-clipboard-button source="target_password">
-                  </cd-copy-2-clipboard-button>
-                </span>
+                <button type="button"
+                        class="btn btn-light"
+                        cdPasswordButton="target_password">
+                </button>
+                <cd-copy-2-clipboard-button source="target_password">
+                </cd-copy-2-clipboard-button>
               </div>
 
               <span class="invalid-feedback"
@@ -304,14 +296,12 @@
                        name="target_mutual_password"
                        formControlName="mutual_password" />
 
-                <span class="input-group-append">
-                  <button type="button"
-                          class="btn btn-light"
-                          cdPasswordButton="target_mutual_password">
-                  </button>
-                  <cd-copy-2-clipboard-button source="target_mutual_password">
-                  </cd-copy-2-clipboard-button>
-                </span>
+                <button type="button"
+                        class="btn btn-light"
+                        cdPasswordButton="target_mutual_password">
+                </button>
+                <cd-copy-2-clipboard-button source="target_mutual_password">
+                </cd-copy-2-clipboard-button>
               </div>
 
               <span class="invalid-feedback"
@@ -341,9 +331,8 @@
               <div class="card-header">
                 <ng-container i18n>Initiator</ng-container>: {{ initiator.getValue('client_iqn') }}
                 <button type="button"
-                        class="close"
+                        class="btn-close float-end"
                         (click)="removeInitiator(ii)">
-                  <i [ngClass]="[icons.destroy]"></i>
                 </button>
               </div>
               <div class="card-body">
@@ -409,14 +398,12 @@
                                autocomplete="new-password"
                                type="password">
 
-                        <span class="input-group-append">
-                          <button type="button"
-                                  class="btn btn-light"
-                                  [cdPasswordButton]="'password' + ii">
-                          </button>
-                          <cd-copy-2-clipboard-button [source]="'password' + ii">
-                          </cd-copy-2-clipboard-button>
-                        </span>
+                        <button type="button"
+                                class="btn btn-light"
+                                [cdPasswordButton]="'password' + ii">
+                        </button>
+                        <cd-copy-2-clipboard-button [source]="'password' + ii">
+                        </cd-copy-2-clipboard-button>
                       </div>
                       <span class="invalid-feedback"
                             *ngIf="initiator.showError('password', formDir, 'required')"
@@ -467,14 +454,12 @@
                                autocomplete="new-password"
                                type="password">
 
-                        <span class="input-group-append">
-                          <button type="button"
-                                  class="btn btn-light"
-                                  [cdPasswordButton]="'mutual_password' + ii">
-                          </button>
-                          <cd-copy-2-clipboard-button [source]="'mutual_password' + ii">
-                          </cd-copy-2-clipboard-button>
-                        </span>
+                        <button type="button"
+                                class="btn btn-light"
+                                [cdPasswordButton]="'mutual_password' + ii">
+                        </button>
+                        <cd-copy-2-clipboard-button [source]="'mutual_password' + ii">
+                        </cd-copy-2-clipboard-button>
                       </div>
                       <span class="invalid-feedback"
                             *ngIf="initiator.showError('mutual_password', formDir, 'required')"
@@ -500,14 +485,12 @@
                                type="text"
                                [value]="image"
                                disabled />
-                        <span class="input-group-append">
-                          <button class="btn btn-light"
-                                  type="button"
-                                  (click)="removeInitiatorImage(initiator, li, ii, image)">
-                            <i [ngClass]="[icons.destroy]"
-                               aria-hidden="true"></i>
-                          </button>
-                        </span>
+                        <button class="btn btn-light"
+                                type="button"
+                                (click)="removeInitiatorImage(initiator, li, ii, image)">
+                          <i [ngClass]="[icons.destroy]"
+                             aria-hidden="true"></i>
+                        </button>
                       </div>
                     </ng-container>
 
@@ -520,7 +503,7 @@
                         <cd-select [data]="initiator.getValue('luns')"
                                    [options]="imagesInitiatorSelections[ii]"
                                    [messages]="messages.initiatorImage"
-                                   elemClass="btn btn-light float-right">
+                                   elemClass="btn btn-light float-end">
                           <i [ngClass]="[icons.add]"></i>
                           <ng-container i18n>Add image</ng-container>
                         </cd-select>
@@ -538,7 +521,7 @@
                       i18n>No items added.</span>
 
                 <button (click)="addInitiator(); false"
-                        class="btn btn-light float-right">
+                        class="btn btn-light float-end">
                   <i [ngClass]="[icons.add]"></i>
                   <ng-container i18n>Add initiator</ng-container>
                 </button>
@@ -563,9 +546,8 @@
               <div class="card-header">
                 <ng-container i18n>Group</ng-container>: {{ group.getValue('group_id') }}
                 <button type="button"
-                        class="close"
+                        class="btn-close float-end"
                         (click)="removeGroup(gi)">
-                  <i [ngClass]="[icons.destroy]"></i>
                 </button>
               </div>
               <div class="card-body">
@@ -594,14 +576,12 @@
                                type="text"
                                [value]="member"
                                disabled />
-                        <span class="input-group-append">
-                          <button class="btn btn-light"
-                                  type="button"
-                                  (click)="removeGroupInitiator(group, i, gi)">
-                            <i [ngClass]="[icons.destroy]"
-                               aria-hidden="true"></i>
-                          </button>
-                        </span>
+                        <button class="btn btn-light"
+                                type="button"
+                                (click)="removeGroupInitiator(group, i, gi)">
+                          <i [ngClass]="[icons.destroy]"
+                             aria-hidden="true"></i>
+                        </button>
                       </div>
                     </ng-container>
 
@@ -611,7 +591,7 @@
                                    [options]="groupMembersSelections[gi]"
                                    [messages]="messages.groupInitiator"
                                    (selection)="onGroupMemberSelection($event, gi)"
-                                   elemClass="btn btn-light float-right">
+                                   elemClass="btn btn-light float-end">
                           <i [ngClass]="[icons.add]"></i>
                           <ng-container i18n>Add initiator</ng-container>
                         </cd-select>
@@ -635,14 +615,12 @@
                                type="text"
                                [value]="disk"
                                disabled />
-                        <span class="input-group-append">
-                          <button class="btn btn-light"
-                                  type="button"
-                                  (click)="removeGroupDisk(group, i, gi)">
-                            <i [ngClass]="[icons.destroy]"
-                               aria-hidden="true"></i>
-                          </button>
-                        </span>
+                        <button class="btn btn-light"
+                                type="button"
+                                (click)="removeGroupDisk(group, i, gi)">
+                          <i [ngClass]="[icons.destroy]"
+                             aria-hidden="true"></i>
+                        </button>
                       </div>
                     </ng-container>
 
@@ -651,7 +629,7 @@
                         <cd-select [data]="group.getValue('disks')"
                                    [options]="groupDiskSelections[gi]"
                                    [messages]="messages.initiatorImage"
-                                   elemClass="btn btn-light float-right">
+                                   elemClass="btn btn-light float-end">
                           <i [ngClass]="[icons.add]"></i>
                           <ng-container i18n>Add image</ng-container>
                         </cd-select>
@@ -671,7 +649,7 @@
                       i18n>No items added.</span>
 
                 <button (click)="addGroup(); false"
-                        class="btn btn-light float-right">
+                        class="btn btn-light float-end">
                   <i [ngClass]="[icons.add]"></i>
                   <ng-container i18n>Add group</ng-container>
                 </button>