diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bad1f33..508c36c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -9,17 +9,17 @@ const routes: Routes = [ { path: 'reload', loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule), - data: {hasSidebar: false, hasHeader: false} + data: {hasSidebar: false} }, { path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule), - data: {hasSidebar: false, isFrontPage: true} + data: {hasSidebar: false} }, { path: 'error', component: OpenaireErrorPageComponent, - data: {hasSidebar: false, isFrontPage: true} + data: {hasSidebar: false} }, { path: 'admin', @@ -54,7 +54,7 @@ const routes: Routes = [ path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent, - data: {hasSidebar: false, hasAdminMenu: false, isFrontPage: true} + data: {hasSidebar: false} } ]; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d6d0a4e..6cdfeb1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -17,7 +17,6 @@ import {Option} from "./openaireLibrary/sharedComponents/input/input.component"; import {StakeholderUtils} from "./utils/indicator-utils"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {ConnectHelper} from "./openaireLibrary/connect/connectHelper"; -import {StringUtils} from "./openaireLibrary/utils/string-utils.class"; @Component({ @@ -279,8 +278,8 @@ export class AppComponent implements OnInit, OnDestroy { route: "/" + this.stakeholder.alias, url: null, title: this.stakeholder.name, - logoUrl: StringUtils.getLogoUrl(this.stakeholder), - logoSmallUrl: StringUtils.getLogoUrl(this.stakeholder), + logoUrl: 'assets/common-assets/logo-services/monitor/small-inverted.svg', + logoSmallUrl: "assets/common-assets/logo-services/monitor/small-inverted.svg", position: 'center', badge: true, stickyAnimation: true, diff --git a/src/app/manageStakeholders/manageStakeholders.module.ts b/src/app/manageStakeholders/manageStakeholders.module.ts index 213b497..d49b319 100644 --- a/src/app/manageStakeholders/manageStakeholders.module.ts +++ b/src/app/manageStakeholders/manageStakeholders.module.ts @@ -11,7 +11,7 @@ import {ReactiveFormsModule} from "@angular/forms"; import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholder.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; -import {add, bullet, earth, group, lock, search} from "../openaireLibrary/utils/icons/icons"; +import {add, bullet, earth, incognito, restricted, search} from "../openaireLibrary/utils/icons/icons"; import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; @@ -39,6 +39,6 @@ import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-inpu }) export class ManageStakeholdersModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([bullet, search, earth, group, lock, add]); + this.iconsService.registerIcons([bullet, search, earth, incognito, restricted, add]); } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 6fb5cf5..53a0cd7 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 6fb5cf54ba1f0739ff956650d52adb0c1e5242be +Subproject commit 53a0cd733b074f967aa0b39749273762c6074e59 diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 8b4d319..7c34f4b 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -28,8 +28,8 @@ -
-