From: Tiago Melo Date: Fri, 24 Aug 2018 11:04:00 +0000 (+0100) Subject: mgr/dashboard: Remove fieldsets when using CdTable X-Git-Tag: v13.2.3~85^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24478%2Fhead;p=ceph.git mgr/dashboard: Remove fieldsets when using CdTable Fixes: https://tracker.ceph.com/issues/26999 Signed-off-by: Tiago Melo (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 --- 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 a76047d431f6..5479eec6341e 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 @@
-
- Daemons + Daemons - - -
+ +
-
- Pools + Pools - - -
+ +
-
- Images - - - - - - - - - - - - - - -
+ Images + + + + + + + + + + + + + +
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 9da4446f39bd..f2ee88d2fb4f 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 @@
-
- Ranks + Ranks - - -
+ +
-
- Pools + Pools - - - -
+ +
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 7832a38744f0..fe8f9f5b7ef2 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 @@ -
- + - - -
+ + 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 615228b7e68b..8f03288bce16 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 @@ -
- {{ serviceType }}.{{ serviceId }} - - -
+{{ serviceType }}.{{ serviceId }} + +