diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html
index 762b7149a2..7344a14310 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html
@@ -56,6 +56,8 @@
[syncStateWithQueryParam]="syncStateWithQueryParam"
[states]="dashboardConfiguration.states">
+
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss
index c7d2367975..6ace69d312 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss
@@ -54,6 +54,11 @@ div.tb-dashboard-page {
z-index: 13;
pointer-events: none;
+ .dashboard_logo{
+ height: 75%;
+ margin-right: 16px;
+ }
+
&.tb-dashboard-toolbar-opened {
right: 0;
// transition: right .3s cubic-bezier(.55, 0, .55, .2);
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
index f8770b9adc..738304cf64 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
@@ -191,6 +191,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
addingLayoutCtx: DashboardPageLayoutContext;
+ logo = 'assets/logo_title_white.svg';
dashboardCtx: DashboardContext = {
instanceId: this.utils.guid(),
@@ -484,6 +485,19 @@ 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;
+ } else {
+ return false;
+ }
+ }
+
+ public get dashboardLogo(): string {
+ return this.dashboard.configuration.settings.dashboardLogoUrl || this.logo;
+ }
+
public showRightLayoutSwitch(): boolean {
return this.isMobile && this.layouts.right.show;
}
@@ -605,7 +619,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: {
settings: deepClone(this.dashboard.configuration.settings),
- gridSettings
+ gridSettings,
}
}).afterClosed().subscribe((data) => {
if (data) {
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-settings-dialog.component.html b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-settings-dialog.component.html
index ede8052c68..3a20d146dd 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-settings-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-settings-dialog.component.html
@@ -52,7 +52,8 @@
formControlName="titleColor">
-
+
{{ 'dashboard.display-dashboards-selection' | translate }}
@@ -69,6 +70,13 @@
{{ 'dashboard.display-dashboard-export' | translate }}
+
+ {{ 'dashboard.display-dashboard-toolbar-logo' | translate }}
+
+
+