diff --git a/src/app/resources/engagement/engagement.component.ts b/src/app/resources/engagement/engagement.component.ts index a94b175..5f111e7 100644 --- a/src/app/resources/engagement/engagement.component.ts +++ b/src/app/resources/engagement/engagement.component.ts @@ -20,24 +20,24 @@ import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service
- Webinar -
1st Stakeholder Webinar
+ Webinar +
1st Stakeholder Webinar
Learn more
- Training - RFO -
RFO Training
+ Training + RFO +
RFO Training
Learn more
- Training - RPO -
RPO Training
+ Training + RPO +
RPO Training
Learn more
diff --git a/src/app/resources/how-it-works/the-five-monitors.component.html b/src/app/resources/how-it-works/the-five-monitors.component.html index 867cb1d..981b6aa 100644 --- a/src/app/resources/how-it-works/the-five-monitors.component.html +++ b/src/app/resources/how-it-works/the-five-monitors.component.html @@ -11,21 +11,21 @@
-
-
- National Monitor +
+
+ {{entities.country}} {{entities.stakeholder}}
-
- Research Performing Organisation (RPO) +
+ Research Performing Organisation ({{entities.organization}})
-
- Research Funding Organisation (RFO) +
+ Research Funding Organisation ({{entities.funder}})
-
+
Researcher
-
- Repository +
+ {{entities.datasource}}
@@ -510,4 +510,4 @@
-
--> \ No newline at end of file +
--> diff --git a/src/app/resources/how-it-works/the-five-monitors.component.less b/src/app/resources/how-it-works/the-five-monitors.component.less index fa1c04f..9117faa 100644 --- a/src/app/resources/how-it-works/the-five-monitors.component.less +++ b/src/app/resources/how-it-works/the-five-monitors.component.less @@ -1,3 +1,5 @@ +@import (reference) "~src/assets/extend-theme/less/_import-variables"; + .custom-translate-bottom-left { transform: translate(-20%, 20%); } @@ -5,4 +7,29 @@ .five-boxes { grid-gap: 20px; transform: translateY(-50%); -} \ No newline at end of file +} + +.country { + background-color: @country-color; + color: @global-inverse-color; +} + +.funder { + background: @funder-color; + color: @global-inverse-color; +} + +.organization { + background-color: @organization-color; + color: @global-inverse-color; +} + +.researcher { + background-color: @researcher-color; + color: @global-inverse-color; +} + +.datasource { + background-color: @datasource-color; + color: @global-inverse-color; +} diff --git a/src/app/resources/how-it-works/the-five-monitors.component.ts b/src/app/resources/how-it-works/the-five-monitors.component.ts index e8d8942..9ada903 100644 --- a/src/app/resources/how-it-works/the-five-monitors.component.ts +++ b/src/app/resources/how-it-works/the-five-monitors.component.ts @@ -1,22 +1,20 @@ import {ChangeDetectorRef, Component} from "@angular/core"; -import {BaseComponent} from "../../openaireLibrary/sharedComponents/base/base.component"; import {ActivatedRoute, Router} from "@angular/router"; import {PiwikService} from "src/app/openaireLibrary/utils/piwik/piwik.service"; import {Meta, Title} from "@angular/platform-browser"; import {SEOService} from "src/app/openaireLibrary/sharedComponents/SEO/SEO.service"; -import {StakeholderEntities} from "../../openaireLibrary/monitor/entities/stakeholder"; +import {StakeholderBaseComponent} from "../../openaireLibrary/monitor-admin/utils/stakeholder-base.component"; @Component({ selector: 'the-five-monitors', templateUrl: 'the-five-monitors.component.html', styleUrls: ['the-five-monitors.component.less'] }) -export class TheFiveMonitorsComponent extends BaseComponent{ +export class TheFiveMonitorsComponent extends StakeholderBaseComponent{ title = 'The 5 Monitors'; description = 'The 5 Monitors'; public sections: string[] = ['RPOs', 'RFOs', 'Researchers', 'Repositories']; public offset: number; - public stakeholderEntities = StakeholderEntities; public shouldSticky: boolean = true; constructor(protected _route: ActivatedRoute, diff --git a/src/app/resources/how-it-works/you-we.component.ts b/src/app/resources/how-it-works/you-we.component.ts index 9c29512..33ddd01 100644 --- a/src/app/resources/how-it-works/you-we.component.ts +++ b/src/app/resources/how-it-works/you-we.component.ts @@ -1,5 +1,6 @@ import { - AfterContentChecked, AfterViewInit, + AfterContentChecked, + AfterViewInit, ChangeDetectorRef, Component, ElementRef, @@ -7,7 +8,6 @@ import { OnDestroy, ViewChild } from "@angular/core"; -import {StakeholderEntities} from "../../openaireLibrary/monitor/entities/stakeholder"; declare var UIkit; @@ -57,7 +57,7 @@ declare var UIkit; }) export class YouWeComponent implements AfterViewInit, AfterContentChecked, OnDestroy { @Input() - public type: StakeholderEntities.FUNDER | StakeholderEntities.RI | StakeholderEntities.ORGANIZATION = StakeholderEntities.FUNDER; + public type: string; @Input() public id; @ViewChild('sticky') sticky: ElementRef; @@ -65,7 +65,7 @@ export class YouWeComponent implements AfterViewInit, AfterContentChecked, OnDes public offset: number public height: number; private subscriptions: any[] = []; - + constructor(private cdr: ChangeDetectorRef) { }