From a33949b1d0da409b51b38e3423f70e04cc291a06 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>
---
 .../block/mirroring/mirroring.component.html  | 91 +++++++++----------
 .../cephfs-detail.component.html              | 26 +++---
 .../performance-counter.component.html        | 10 +-
 3 files changed, 59 insertions(+), 68 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 0c17084f9ab..a4e61dc5b12 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
@@ -2,63 +2,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-detail/cephfs-detail.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
index b19ab9f8e13..f3129cd0fb2 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
@@ -3,29 +3,25 @@
        heading="Details">
     <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/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 87e4bfe0d5c..988a8a25219 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
@@ -1,6 +1,4 @@
-<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>