diff --git a/backend/web/src/main/resources/config/locale.yml b/backend/web/src/main/resources/config/locale.yml index bc862307f..95f478d8a 100644 --- a/backend/web/src/main/resources/config/locale.yml +++ b/backend/web/src/main/resources/config/locale.yml @@ -1,4 +1,4 @@ locale: timezone: UTC language: en - culture: en-001 + culture: en diff --git a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts index 2b0f1dd36..e6b1e2cc4 100644 --- a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts +++ b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts @@ -45,6 +45,11 @@ export class ConfigurationService extends BaseComponent { return this._defaultTimezone || 'UTC'; } + private _navLogoExtension: string; + get navLogoExtension(): string { + return this._navLogoExtension || '.svg'; + } + private _defaultBlueprintId: Guid; get defaultBlueprintId(): Guid { return this._defaultBlueprintId; @@ -230,6 +235,7 @@ export class ConfigurationService extends BaseComponent { this._logging = Logging.parseValue(config.logging); this._lockInterval = config.lockInterval; this._guideAssets = config.guideAssets; + this._navLogoExtension = config.navLogoExtension; this._allowOrganizationCreator = config.allowOrganizationCreator; this._orcidPath = config.orcidPath; if (config.matomo) { diff --git a/dmp-frontend/src/app/ui/description/editor/description-base-fields-editor/description-base-fields-editor.component.ts b/dmp-frontend/src/app/ui/description/editor/description-base-fields-editor/description-base-fields-editor.component.ts index 646e98346..494a8f311 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-base-fields-editor/description-base-fields-editor.component.ts +++ b/dmp-frontend/src/app/ui/description/editor/description-base-fields-editor/description-base-fields-editor.component.ts @@ -52,8 +52,6 @@ export class DescriptionBaseFieldsEditorComponent extends BaseComponent { } else { this.availableDescriptionTemplates.push(this.description.descriptionTemplate); } - } else { - this.availableDescriptionTemplates.push(this.description.descriptionTemplate); } } } diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html index 71e677795..d297d713a 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.html +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html @@ -7,7 +7,7 @@
- + diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts index 2c6459f96..fd5b5d288 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts @@ -62,7 +62,7 @@ export class NavbarComponent extends BaseComponent implements OnInit { private sidenavService: SideNavService, private tenantConfigurationService: TenantConfigurationService, private inappNotificationService: InAppNotificationService, - private configurationService: ConfigurationService, + public configurationService: ConfigurationService, private storageFileService: StorageFileService, private sanitizer: DomSanitizer, private analyticsService: AnalyticsService, diff --git a/dmp-frontend/src/assets/images/nav-logo.png b/dmp-frontend/src/assets/images/nav-logo.png deleted file mode 100644 index 090476796..000000000 Binary files a/dmp-frontend/src/assets/images/nav-logo.png and /dev/null differ diff --git a/dmp-frontend/src/assets/images/nav-logo.svg b/dmp-frontend/src/assets/images/nav-logo.svg new file mode 100644 index 000000000..bf70c2942 --- /dev/null +++ b/dmp-frontend/src/assets/images/nav-logo.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + +