From 7b6c2ac00e91606f22dd556abc2609b1e3d197b6 Mon Sep 17 00:00:00 2001
From: Ishan Rai <ishanrai05@gmail.com>
Date: Tue, 31 Mar 2020 16:55:14 +0530
Subject: [PATCH] mgr/dashboard: Clean up HTML

cleaned up BootstrapCreateModalComponent and footers

Fixes: https://tracker.ceph.com/issues/44848

Signed-off-by: Ishan Rai <ishanrai05@gmail.com>
---
 ...scsi-target-discovery-modal.component.html | 18 ++++++++----------
 .../iscsi-target-form.component.html          |  2 +-
 ...target-image-settings-modal.component.html | 16 +++++++---------
 ...i-target-iqn-settings-modal.component.html | 16 +++++++---------
 .../bootstrap-create-modal.component.html     | 19 ++++++++-----------
 .../bootstrap-import-modal.component.html     | 16 +++++++---------
 .../edit-site-name-modal.component.html       | 16 +++++++---------
 .../pool-edit-mode-modal.component.html       | 16 +++++++---------
 .../pool-edit-peer-modal.component.html       | 16 +++++++---------
 .../block/rbd-form/rbd-form.component.html    |  2 +-
 .../rbd-namespace-form-modal.component.html   | 16 +++++++---------
 .../rbd-snapshot-form-modal.component.html    | 18 ++++++++----------
 .../rbd-trash-move-modal.component.html       | 16 +++++++---------
 .../rbd-trash-purge-modal.component.html      | 18 ++++++++----------
 .../rbd-trash-restore-modal.component.html    | 16 +++++++---------
 .../configuration-form.component.html         |  2 +-
 .../hosts/host-form/host-form.component.html  |  2 +-
 .../mgr-module-form.component.html            |  2 +-
 .../osd-flags-modal.component.html            | 18 ++++++++----------
 .../osd/osd-form/osd-form.component.html      |  2 +-
 .../osd-pg-scrub-modal.component.html         | 14 ++++++--------
 .../osd-recv-speed-modal.component.html       | 18 ++++++++----------
 .../silence-form/silence-form.component.html  |  2 +-
 .../ceph/nfs/nfs-form/nfs-form.component.html |  2 +-
 .../pool/pool-form/pool-form.component.html   |  2 +-
 .../rgw-bucket-form.component.html            |  2 +-
 .../rgw-user-form.component.html              |  2 +-
 .../auth/role-form/role-form.component.html   |  2 +-
 .../auth/user-form/user-form.component.html   |  2 +-
 .../user-password-form.component.html         | 13 ++++++-------
 .../alert-panel/alert-panel.component.html    |  2 +-
 .../confirmation-modal.component.html         | 18 ++++++++----------
 .../form-modal/form-modal.component.html      | 12 +++++-------
 33 files changed, 150 insertions(+), 188 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
index 8ebdb7d6e067a..605f1682928e2 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
@@ -122,16 +122,14 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button (submitAction)="submitAction()"
-                            [form]="discoveryForm"
-                            *ngIf="hasPermission"
-                            i18n>Submit</cd-submit-button>
-          <cd-back-button [back]="bsModalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button (submitAction)="submitAction()"
+                          [form]="discoveryForm"
+                          *ngIf="hasPermission"
+                          i18n>Submit</cd-submit-button>
+        <cd-back-button [back]="bsModalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
index fea6d30f18e9c..217ec33a32d17 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
@@ -684,7 +684,7 @@
 
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="submit()"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             [form]="formDir">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
index c5582a6c5fd44..8bd8d45975ed0 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
@@ -83,15 +83,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="settingsForm"
-                            (submitAction)="save()">Confirm</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button i18n
+                          [form]="settingsForm"
+                          (submitAction)="save()">Confirm</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
index 6671d84bd1756..7eeacef4f5583 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
@@ -23,15 +23,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="settingsForm"
-                            (submitAction)="save()">Confirm</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button i18n
+                          [form]="settingsForm"
+                          (submitAction)="save()">Confirm</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.html
index db5f824f87667..a22d7f6092e84 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.html
@@ -53,11 +53,10 @@
                 i18n>At least one pool is required.</span>
         </div>
 
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="createBootstrapForm"
-                            (submitAction)="generate()">Generate</cd-submit-button>
-        </div>
+        <cd-submit-button class="mb-4 float-right"
+                          i18n
+                          [form]="createBootstrapForm"
+                          (submitAction)="generate()">Generate</cd-submit-button>
 
         <div class="form-group">
           <label class="col-form-label"
@@ -75,12 +74,10 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-back-button [back]="modalRef.hide"
-                          name="Close"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Close"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
index 680865459a157..a1998a1211842 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
@@ -87,15 +87,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="importBootstrapForm"
-                            (submitAction)="import()">Import</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Close"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button i18n
+                          [form]="importBootstrapForm"
+                          (submitAction)="import()">Import</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Close"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.html
index bb41453c59be5..9aacaa43cb091 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.html
@@ -30,15 +30,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="editSiteNameForm"
-                            (submitAction)="update()">Update</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button i18n
+                          [form]="editSiteNameForm"
+                          (submitAction)="update()">Update</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
index a35eda7ad0775..1be453beed0bc 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
@@ -34,15 +34,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="editModeForm"
-                            (submitAction)="update()">Update</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button i18n
+                          [form]="editModeForm"
+                          (submitAction)="update()">Update</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html
index 64403ac48cae6..4d70ad7e8a13c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html
@@ -92,15 +92,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="editPeerForm"
-                            (submitAction)="update()">Submit</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button i18n
+                          [form]="editPeerForm"
+                          (submitAction)="update()">Submit</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
index 776e6ecb5038c..3b4315df1b139 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
@@ -324,7 +324,7 @@
 
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="submit()"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             [form]="formDir">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html
index fb0d3650d0d0a..a7f173bfd3c3f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.html
@@ -70,15 +70,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button [form]="namespaceForm"
-                            (submitAction)="submit()"
-                            i18n>Create Namespace</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Close"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button [form]="namespaceForm"
+                          (submitAction)="submit()"
+                          i18n>Create Namespace</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Close"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html
index 9a32a3ce887d6..7a4fc37c4ca88 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html
@@ -29,16 +29,14 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button [form]="snapshotForm"
-                            i18n="form action button|Example: Create rbdSnapshot@@formActionButton"
-                            (submitAction)="submit()">{{ action | titlecase }}
-            {{ resource | upperFirst }}</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Close"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button [form]="snapshotForm"
+                          i18n="form action button|Example: Create rbdSnapshot@@formActionButton"
+                          (submitAction)="submit()">{{ action | titlecase }}
+          {{ resource | upperFirst }}</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Close"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
index cb1ee7f89dc3a..b6103e6502bcd 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
@@ -41,15 +41,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button i18n
-                            [form]="moveForm"
-                            (submitAction)="moveImage()">Move Image</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button i18n
+                          [form]="moveForm"
+                          (submitAction)="moveImage()">Move Image</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
index 12be959c755b8..fa68cdf987c43 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
@@ -39,16 +39,14 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button id="purgeFormButton"
-                            [form]="purgeForm"
-                            (submitAction)="purge()"
-                            i18n>Purge Trash</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button id="purgeFormButton"
+                          [form]="purgeForm"
+                          (submitAction)="purge()"
+                          i18n>Purge Trash</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
index c1964e0be7309..17929b792f023 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
@@ -34,15 +34,13 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button [form]="restoreForm"
-                            (submitAction)="restore()"
-                            i18n>Restore Image</cd-submit-button>
-          <cd-back-button [back]="modalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button [form]="restoreForm"
+                          (submitAction)="restore()"
+                          i18n>Restore Image</cd-submit-button>
+        <cd-back-button [back]="modalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
index 3be3ac9789a55..eff515223017c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
@@ -149,7 +149,7 @@
       </div>
       <!-- Footer -->
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button [form]="formDir"
                             (submitAction)="submit()">
             <span i18n>Save</span>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.html
index 54aa0875c30ac..c224c71318046 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.html
@@ -37,7 +37,7 @@
       </div>
 
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button [form]="formDir"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             (submitAction)="submit()">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html
index 2d555b395923d..f246824f08447 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.html
@@ -106,7 +106,7 @@
         </div>
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="onSubmit()"
                             [form]="mgrModuleForm">
             <ng-container i18n>Update</ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html
index 8b769a4ad5654..fa4245327988d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html
@@ -30,16 +30,14 @@
       </div>
 
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button *ngIf="permissions.osd.update"
-                            (submitAction)="submitAction()"
-                            [form]="osdFlagsForm"
-                            i18n>Submit</cd-submit-button>
-          <cd-back-button [back]="bsModalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button *ngIf="permissions.osd.update"
+                          (submitAction)="submitAction()"
+                          [form]="osdFlagsForm"
+                          i18n>Submit</cd-submit-button>
+        <cd-back-button [back]="bsModalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html
index f2dc381c5c218..b3f02dcf16099 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html
@@ -121,7 +121,7 @@
         </fieldset>
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button #previewButton
                             (submitAction)="submit()"
                             i18n
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html
index 054a9c5c0cc29..a0216f72a23fc 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html
@@ -33,14 +33,12 @@
         </div>
       </div>
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button *ngIf="permissions.configOpt.update"
-                            (submitAction)="submitAction()"
-                            i18n="form action button|Example: Create Pool@@formActionButton"
-                            [form]="osdPgScrubForm">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
-          <cd-back-button [back]="bsModalRef.hide">
-          </cd-back-button>
-        </div>
+        <cd-submit-button *ngIf="permissions.configOpt.update"
+                          (submitAction)="submitAction()"
+                          i18n="form action button|Example: Create Pool@@formActionButton"
+                          [form]="osdPgScrubForm">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
+        <cd-back-button [back]="bsModalRef.hide">
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
index 1444e88588bf2..26fb412c686c6 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
@@ -81,16 +81,14 @@
         </div>
       </div>
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button *ngIf="permissions.configOpt.update"
-                            (submitAction)="submitAction()"
-                            [form]="osdRecvSpeedForm"
-                            i18n>Submit</cd-submit-button>
-          <cd-back-button [back]="bsModalRef.hide"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button *ngIf="permissions.configOpt.update"
+                          (submitAction)="submitAction()"
+                          [form]="osdRecvSpeedForm"
+                          i18n>Submit</cd-submit-button>
+        <cd-back-button [back]="bsModalRef.hide"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.html
index e1d0b2a3cb0ea..cd491bf67f5c2 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.html
@@ -202,7 +202,7 @@
       </div>
 
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="submit()"
                             [form]="formDir"
                             i18n="@@formTitle">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
index 4ade6ddbc515d..ad2cab0224698 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
@@ -484,7 +484,7 @@
       </div>
 
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button
             (submitAction)="submitAction()"
             i18n="form action button|Example: Create Pool@@formActionButton"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
index 3ccfd2a024be6..bbfd237eb0f86 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
@@ -548,7 +548,7 @@
         </div>
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button [form]="formDir"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             (submitAction)="submit()">{{ action | titlecase }} {{ resource | upperFirst }}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
index a8bf4c0d9577f..fd2228c528ab6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
@@ -294,7 +294,7 @@
 
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="submit()"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             [form]="bucketForm">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
index ce638cceb9624..a34d3f9499028 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
@@ -625,7 +625,7 @@
       </div>
 
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="onSubmit()"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             [form]="userForm">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html
index c059c3a5b2683..e7a6ee4a7e57d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html
@@ -67,7 +67,7 @@
 
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="submit()"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             [form]="formDir">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
index cee4438001041..66835259f33c8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
@@ -235,7 +235,7 @@
 
       </div>
       <div class="card-footer">
-        <div class="button-group text-right">
+        <div class="text-right">
           <cd-submit-button (submitAction)="submit()"
                             i18n="form action button|Example: Create Pool@@formActionButton"
                             [form]="formDir">{{ action | titlecase }} {{ resource | upperFirst }}</cd-submit-button>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html
index 08d1c1c75e571..cd1819af071a4 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html
@@ -111,13 +111,12 @@
       </div>
 
       <div class="card-footer">
-        <div class="button-group text-right">
-          <cd-submit-button (submitAction)="onSubmit()"
-                            [form]="userForm"
-                            i18n="form action button|Example: Create Pool@@formActionButton">
-            {{ action | titlecase }} {{ resource | upperFirst }}
-          </cd-submit-button>
-        </div>
+        <cd-submit-button (submitAction)="onSubmit()"
+                          [form]="userForm"
+                          class="float-right"
+                          i18n="form action button|Example: Create Pool@@formActionButton">
+          {{ action | titlecase }} {{ resource | upperFirst }}
+        </cd-submit-button>
       </div>
     </div>
   </form>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html
index 2b606ccdec673..a1b4c9a04b501 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html
@@ -39,7 +39,7 @@
   <ng-content></ng-content>
 </ng-template>
 
-<div class="button-group text-right"
+<div class="text-right"
      *ngIf="backAction.observers.length > 0">
   <button class="btn btn-light tc_backButton"
           type="button"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html
index bea4eb533b233..c7130ef659115 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html
@@ -12,16 +12,14 @@
         </p>
       </div>
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button [form]="confirmationForm"
-                            (submitAction)="onSubmit(confirmationForm.value)">
-            {{ buttonText }}
-          </cd-submit-button>
-          <cd-back-button [back]="boundCancel"
-                          name="Cancel"
-                          i18n-name>
-          </cd-back-button>
-        </div>
+        <cd-submit-button [form]="confirmationForm"
+                          (submitAction)="onSubmit(confirmationForm.value)">
+          {{ buttonText }}
+        </cd-submit-button>
+        <cd-back-button [back]="boundCancel"
+                        name="Cancel"
+                        i18n-name>
+        </cd-back-button>
       </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
index 651c68b926777..b7ce9aceab514 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
@@ -52,13 +52,11 @@
         </ng-container>
       </div>
       <div class="modal-footer">
-        <div class="button-group text-right">
-          <cd-submit-button [form]="formGroup"
-                            (submitAction)="onSubmitForm(formGroup.value)">
-            {{ submitButtonText }}
-          </cd-submit-button>
-          <cd-back-button [back]="bsModalRef.hide"></cd-back-button>
-        </div>
+        <cd-submit-button [form]="formGroup"
+                          (submitAction)="onSubmitForm(formGroup.value)">
+          {{ submitButtonText }}
+        </cd-submit-button>
+        <cd-back-button [back]="bsModalRef.hide"></cd-back-button>
       </div>
     </form>
   </ng-container>
-- 
2.39.5