From f7da2eada74b513c25eb463d15a7aff360251c8f Mon Sep 17 00:00:00 2001
From: Tiago Melo <tspmelo@gmail.com>
Date: Fri, 24 Aug 2018 12:04:00 +0100
Subject: [PATCH] mgr/dashboard: Remove fieldsets when using CdTable

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

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit a33949b1d0da409b51b38e3423f70e04cc291a06)

Conflicts:
  (all paths are relative to src/pybind/mgr/dashboard/frontend/src/app/ceph/)
  performance-counter/performance-counter/performance-counter.component.html
    Kept the breadcrumb section
  cephfs/cephfs-detail/cephfs-detail.component.html
    File doesn't exist in mimic,
    changes were applied to cephfs/cephfs/cephfs.component.html
  cephfs/clients/clients.component.html
    File was modified in a unrelated PR, but changes needed to be included
---
 .../block/mirroring/mirroring.component.html  | 91 +++++++++----------
 .../ceph/cephfs/cephfs/cephfs.component.html  | 27 +++---
 .../cephfs/clients/clients.component.html     | 14 ++-
 .../performance-counter.component.html        | 10 +-
 4 files changed, 65 insertions(+), 77 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html
index a76047d431f..5479eec6341 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html
@@ -10,63 +10,60 @@
 
 <div class="row">
   <div class="col-sm-6">
-    <fieldset>
-      <legend i18n>Daemons</legend>
+    <legend i18n>Daemons</legend>
 
-      <cd-table [data]="daemons.data"
-                columnMode="flex"
-                [columns]="daemons.columns"
-                [autoReload]="30000"
-                (fetchData)="refresh()">
-      </cd-table>
-    </fieldset>
+    <cd-table [data]="daemons.data"
+              columnMode="flex"
+              [columns]="daemons.columns"
+              [autoReload]="30000"
+              (fetchData)="refresh()">
+    </cd-table>
   </div>
 
   <div class="col-sm-6">
-    <fieldset>
-      <legend i18n>Pools</legend>
+    <legend i18n>Pools</legend>
 
-      <cd-table [data]="pools.data"
-                columnMode="flex"
-                [autoReload]="0"
-                (fetchData)="refresh()"
-                [columns]="pools.columns">
-      </cd-table>
-    </fieldset>
+    <cd-table [data]="pools.data"
+              columnMode="flex"
+              [autoReload]="0"
+              (fetchData)="refresh()"
+              [columns]="pools.columns">
+    </cd-table>
   </div>
 </div>
 
 <div class="row">
   <div class="col-md-12">
-    <fieldset>
-      <legend i18n>Images</legend>
-      <tabset>
-        <tab heading="Issues" i18n-heading>
-          <cd-table [data]="image_error.data"
-                    columnMode="flex"
-                    [autoReload]="0"
-                    (fetchData)="refresh()"
-                    [columns]="image_error.columns">
-          </cd-table>
-        </tab>
-        <tab heading="Syncing" i18n-heading>
-          <cd-table [data]="image_syncing.data"
-                    columnMode="flex"
-                    [autoReload]="0"
-                    (fetchData)="refresh()"
-                    [columns]="image_syncing.columns">
-          </cd-table>
-        </tab>
-        <tab heading="Ready" i18n-heading>
-          <cd-table [data]="image_ready.data"
-                    columnMode="flex"
-                    [autoReload]="0"
-                    (fetchData)="refresh()"
-                    [columns]="image_ready.columns">
-          </cd-table>
-        </tab>
-      </tabset>
-    </fieldset>
+    <legend i18n>Images</legend>
+    <tabset>
+      <tab heading="Issues"
+           i18n-heading>
+        <cd-table [data]="image_error.data"
+                  columnMode="flex"
+                  [autoReload]="0"
+                  (fetchData)="refresh()"
+                  [columns]="image_error.columns">
+        </cd-table>
+      </tab>
+      <tab heading="Syncing"
+           i18n-heading>
+        <cd-table [data]="image_syncing.data"
+                  columnMode="flex"
+                  [autoReload]="0"
+                  (fetchData)="refresh()"
+                  [columns]="image_syncing.columns">
+        </cd-table>
+      </tab>
+      <tab heading="Ready"
+           i18n-heading>
+        <cd-table [data]="image_ready.data"
+                  columnMode="flex"
+                  [autoReload]="0"
+                  (fetchData)="refresh()"
+                  [columns]="image_ready.columns">
+        </cd-table>
+      </tab>
+    </tabset>
   </div>
 </div>
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html
index 9da4446f39b..f2ee88d2fb4 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html
@@ -20,30 +20,25 @@
 
 <div class="row">
   <div class="col-sm-6">
-    <fieldset>
-      <legend i18n>Ranks</legend>
+    <legend i18n>Ranks</legend>
 
-      <cd-table [data]="ranks.data"
-                [columns]="ranks.columns"
-                (fetchData)="refresh()"
-                [toolHeader]="false">
-      </cd-table>
-    </fieldset>
+    <cd-table [data]="ranks.data"
+              [columns]="ranks.columns"
+              (fetchData)="refresh()"
+              [toolHeader]="false">
+    </cd-table>
 
     <cd-table-key-value [data]="standbys">
     </cd-table-key-value>
   </div>
 
   <div class="col-sm-6">
-    <fieldset>
-      <legend i18n>Pools</legend>
+    <legend i18n>Pools</legend>
 
-      <cd-table [data]="pools.data"
-                [columns]="pools.columns"
-                [toolHeader]="false">
-      </cd-table>
-
-    </fieldset>
+    <cd-table [data]="pools.data"
+              [columns]="pools.columns"
+              [toolHeader]="false">
+    </cd-table>
   </div>
 </div>
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
index 7832a38744f..fe8f9f5b7ef 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
@@ -11,12 +11,10 @@
   </ol>
 </nav>
 
-<fieldset>
-  <cd-view-cache [status]="viewCacheStatus"></cd-view-cache>
+<cd-view-cache [status]="viewCacheStatus"></cd-view-cache>
 
-  <cd-table [data]="clients.data"
-            [columns]="clients.columns"
-            (fetchData)="refresh()"
-            [header]="false">
-  </cd-table>
-</fieldset>
+<cd-table [data]="clients.data"
+          [columns]="clients.columns"
+          (fetchData)="refresh()"
+          [header]="false">
+</cd-table>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html
index 615228b7e68..8f03288bce1 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html
@@ -12,9 +12,7 @@
   </ol>
 </nav>
 
-<fieldset>
-  <legend>{{ serviceType }}.{{ serviceId }}</legend>
-  <cd-table-performance-counter [serviceType]="serviceType"
-                                [serviceId]="serviceId">
-  </cd-table-performance-counter>
-</fieldset>
+<legend>{{ serviceType }}.{{ serviceId }}</legend>
+<cd-table-performance-counter [serviceType]="serviceType"
+                              [serviceId]="serviceId">
+</cd-table-performance-counter>
-- 
2.47.3