Merge pull request #24478 from tspmelo/wip-27851-mimic

mimic: mgr/dashboard: Remove fieldsets when using CdTable Reviewed-by: Lenz Grimmer <lgrimmer@suse.com> Reviewed-by: Stephan Müller <smueller@suse.com>
ceph · Oct 29, 2018 · 60793af · 60793af
2 parents 61e715d + f7da2ea
commit 60793af
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 90 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
@@ -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
@@ -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
@@ -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/cluster/monitor/monitor.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.html
@@ -54,19 +54,17 @@
   </div>
 
   <div class="col-md-8">
-    <fieldset>
-      <legend i18n
-              class="in-quorum">In Quorum</legend>
-      <cd-table [data]="inQuorum.data"
-                [columns]="inQuorum.columns">
-      </cd-table>
+    <legend i18n
+            class="in-quorum">In Quorum</legend>
+    <cd-table [data]="inQuorum.data"
+              [columns]="inQuorum.columns">
+    </cd-table>
 
-      <legend i18n
-              class="in-quorum">Not In Quorum</legend>
-      <cd-table [data]="notInQuorum.data"
-                (fetchData)="refresh()"
-                [columns]="notInQuorum.columns">
-      </cd-table>
-    </fieldset>
+    <legend i18n
+            class="in-quorum">Not In Quorum</legend>
+    <cd-table [data]="notInQuorum.data"
+              (fetchData)="refresh()"
+              [columns]="notInQuorum.columns">
+    </cd-table>
   </div>
 </div>
diff --git a/...d/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html b/...d/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>