Browse Source

Fix show dashboard logo in fullscreen mode

pull/4434/head
Igor Kulikov 6 years ago
parent
commit
3362ab37da
  1. 2
      ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html
  2. 2
      ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts

2
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html

@ -56,7 +56,7 @@
[syncStateWithQueryParam]="syncStateWithQueryParam"
[states]="dashboardConfiguration.states">
</tb-states-component>
<img *ngIf="showDashboardLogo() && isFullscreen" [src]="dashboardLogo"
<img *ngIf="showDashboardLogo()" [src]="dashboardLogo"
aria-label="dashboard_logo" class="dashboard_logo"/>
</div>
<div class="tb-dashboard-action-panel" fxFlex="1 0 auto" fxLayout="row-reverse"

2
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts

@ -488,7 +488,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
public showDashboardLogo(): boolean {
if (this.dashboard.configuration.settings &&
isDefined(this.dashboard.configuration.settings.showDashboardLogo)) {
return this.dashboard.configuration.settings.showDashboardLogo;
return this.dashboard.configuration.settings.showDashboardLogo && (this.forceFullscreen || this.singlePageMode || this.isFullscreen);
} else {
return false;
}

Loading…
Cancel
Save