update ceph source to reef 18.1.2

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / ceph / dashboard / dashboard / dashboard.component.html

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html
index feea20883efeb6c6bff69152511170ead290fa3a..87b8c3376dc8114e5cd9f9202d348fe49a2c59d7 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.html
@@ -1,32 +1,15 @@
-<main aria-label="Dashboard" >
+<main aria-label="Dashboard">
   <a href="#main"
      class="sr-only">skip to content</a>
 
-  <cd-refresh-selector></cd-refresh-selector>
+  <ng-container *ngIf="(enabledFeature$ | async)?.dashboard === false; else dashboardV3"
+                class="main-padding">
+    <cd-refresh-selector></cd-refresh-selector>
 
-  <ng-container *ngIf="hasGrafana">
-    <nav ngbNav
-         #nav="ngbNav"
-         class="nav-tabs">
-      <ng-container ngbNavItem>
-        <a ngbNavLink
-           i18n>Health</a>
-        <ng-template ngbNavContent>
-          <cd-health></cd-health>
-        </ng-template>
-      </ng-container>
-      <ng-container ngbNavItem>
-        <a ngbNavLink
-           i18n>Statistics</a>
-        <ng-template ngbNavContent>
-        </ng-template>
-      </ng-container>
-
-    </nav>
-
-    <div [ngbNavOutlet]="nav"></div>
+    <cd-health id="main"></cd-health>
   </ng-container>
 
-  <cd-health id="main"
-             *ngIf="!hasGrafana"></cd-health>
+  <ng-template #dashboardV3>
+    <cd-dashboard-v3></cd-dashboard-v3>
+  </ng-template>
 </main>