diff --git a/projects/aca-about/src/lib/about.component.html b/projects/aca-about/src/lib/about.component.html index 42c338d1a..d08f64213 100644 --- a/projects/aca-about/src/lib/about.component.html +++ b/projects/aca-about/src/lib/about.component.html @@ -1,5 +1,8 @@ +

{{ 'APP.BROWSE.ABOUT.TITLE' | translate }}

diff --git a/projects/aca-about/src/lib/about.component.ts b/projects/aca-about/src/lib/about.component.ts index 82a9cd9b0..f877381a9 100644 --- a/projects/aca-about/src/lib/about.component.ts +++ b/projects/aca-about/src/lib/about.component.ts @@ -27,7 +27,7 @@ import { Component, Inject, OnInit, Optional } from '@angular/core'; import { DEV_MODE_TOKEN } from './dev-mode.tokens'; import { Observable } from 'rxjs'; import { AppExtensionService, ExtensionRef } from '@alfresco/adf-extensions'; -import { AuthenticationService, RepositoryInfo } from '@alfresco/adf-core'; +import { AppConfigService, AuthenticationService, RepositoryInfo } from '@alfresco/adf-core'; import { DiscoveryApiService } from '@alfresco/adf-content-services'; import { PACKAGE_JSON } from './package-json.token'; @@ -47,6 +47,7 @@ export class AboutComponent implements OnInit { dev = false; extensions$: Observable; repository: RepositoryInfo = null; + landingPage: string; constructor( @Inject(DEV_MODE_TOKEN) devMode, @@ -55,10 +56,12 @@ export class AboutComponent implements OnInit { public packageJson, private authService: AuthenticationService, private appExtensions: AppExtensionService, - private discovery: DiscoveryApiService + private discovery: DiscoveryApiService, + appConfigService: AppConfigService ) { this.dev = !devMode; this.extensions$ = this.appExtensions.references$; + this.landingPage = appConfigService.get('landingPage', '/personal-files'); } ngOnInit(): void { diff --git a/projects/aca-about/src/lib/aca-about.module.ts b/projects/aca-about/src/lib/aca-about.module.ts index 2f0550fe7..6337617cf 100644 --- a/projects/aca-about/src/lib/aca-about.module.ts +++ b/projects/aca-about/src/lib/aca-about.module.ts @@ -32,9 +32,10 @@ import { SharedModule, PageLayoutModule } from '@alfresco/aca-shared'; import { ExtensionService, provideExtensionConfig } from '@alfresco/adf-extensions'; import { DEV_MODE_TOKEN } from './dev-mode.tokens'; import { PACKAGE_JSON } from './package-json.token'; +import { RouterModule } from '@angular/router'; @NgModule({ - imports: [CommonModule, CoreModule.forChild(), SharedModule, PageLayoutModule], + imports: [CommonModule, RouterModule, CoreModule.forChild(), SharedModule, PageLayoutModule], declarations: [AboutComponent], providers: [provideExtensionConfig(['about.plugin.json'])] }) diff --git a/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html b/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html index da7265677..382fed305 100644 --- a/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html +++ b/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html @@ -18,7 +18,7 @@
- arrow_back -

{{'APP.EDIT_PROFILE.MY_PROFILE' | translate}}

+ +

{{'APP.EDIT_PROFILE.MY_PROFILE' | translate}}

diff --git a/projects/aca-shared/src/lib/services/app.service.ts b/projects/aca-shared/src/lib/services/app.service.ts index 66c0c4db0..b2c591a51 100644 --- a/projects/aca-shared/src/lib/services/app.service.ts +++ b/projects/aca-shared/src/lib/services/app.service.ts @@ -64,7 +64,8 @@ export class AppService { toggleAppNavBar$ = new Subject(); hideSidenavConditions = ['/preview/']; - minimizeSidenavConditions = ['search']; + minimizeSidenavConditions = ['search', 'about', 'profile']; + onDestroy$ = new Subject(); /**