mgr/dashboard: Remove fieldsets when using CdTable

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

Signed-off-by: Tiago Melo <tmelo@suse.com>
This commit is contained in:
Tiago Melo 2018-08-24 12:04:00 +01:00
parent 9bef451aa7
commit a33949b1d0
3 changed files with 59 additions and 68 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>