diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0d3a5c2..0bb65b0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -19,6 +19,7 @@ import {EmailService} from "./openaireLibrary/utils/email/email.service";
import {StringUtils} from "./openaireLibrary/utils/string-utils.class";
import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.component";
import {AlertModal} from "./openaireLibrary/utils/modal/alert";
+import {StakeholderEntities} from './openaireLibrary/monitor/entities/stakeholder';
@Component({
selector: 'app-root',
@@ -90,6 +91,7 @@ export class AppComponent {
@ViewChild('modal') modal: AlertModal;
@ViewChild('quickContact') quickContact: QuickContactComponent;
private subscriptions: any[] = [];
+ public stakeholderEntities = StakeholderEntities;
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
private router: Router, private stakeholderService: StakeholderService, private smoothScroll: SmoothScroll,
@@ -152,7 +154,7 @@ export class AppComponent {
items: []
});
this.menuItems.push({
- rootItem: new MenuItem("stakeholders", "Browse Dashboards", "", "/browse", false, [], null, {}),
+ rootItem: new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {}),
items: []
});
this.bottomMenuItems = [
@@ -171,7 +173,7 @@ export class AppComponent {
this.userMenuItems.push(new MenuItem("", "Manage profiles",
this.properties.domain + properties.baseLink + "/dashboard/admin", "", false, [], [], {}))
}
- this.userMenuItems.push(new MenuItem("", "My Dashboards", "", "/my-dashboards", false, [], [], {}));
+ this.userMenuItems.push(new MenuItem("", "My " + this.stakeholderEntities.STAKEHOLDERS, "", "/my-dashboards", false, [], [], {}));
this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
}
}
diff --git a/src/app/get-started/get-started.component.html b/src/app/get-started/get-started.component.html
index 93a7930..b7d24e4 100644
--- a/src/app/get-started/get-started.component.html
+++ b/src/app/get-started/get-started.component.html
@@ -9,7 +9,7 @@
Get started with
OpenAIRE Monitor Dashboard .
The OpenAIRE Monitor Dashboard is an open tracking platform with all the tools you need
- to understand and make insightful decisions — whether you are a funder, a research institution
+ to understand and make insightful decisions — whether you are a {{stakeholderEntities.FUNDER | lowercase}}, a {{stakeholderEntities.RI | lowercase}}
or a community, and want to measure or increase uptake
of Open Science, understand your costs, gaps and strengths, or build a community around it.
diff --git a/src/app/get-started/get-started.component.ts b/src/app/get-started/get-started.component.ts
index d7d755d..ad6a805 100644
--- a/src/app/get-started/get-started.component.ts
+++ b/src/app/get-started/get-started.component.ts
@@ -13,6 +13,7 @@ import {properties} from "../../environments/environment";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
import {NotificationHandler} from "../openaireLibrary/utils/notification-handler";
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
+import {StakeholderEntities} from '../openaireLibrary/monitor/entities/stakeholder';
@Component({
selector: 'get-started',
@@ -36,6 +37,7 @@ export class GetStartedComponent implements OnInit {
public contactForm: FormGroup;
@ViewChild('modal') modal;
private subscriptions = [];
+ public stakeholderEntities = StakeholderEntities;
constructor(private route: ActivatedRoute,
private _router: Router,
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index b2cb5a3..a42222e 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -54,7 +54,7 @@
- Funders. Universities. Research Institutions. Communities.
+ {{stakeholderEntities.FUNDERS}}. Universities. {{stakeholderEntities.RIS | titlecase}}. Communities.
Simplify Open Science tracking & monitoring.
@@ -131,27 +131,27 @@
-
-
-
-
-
@@ -219,9 +219,9 @@
-
Dashboards in action.
+
{{stakeholderEntities.STAKEHOLDERS}} in action.
- View existing dashboards from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you.
+ View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you.
-
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 20f5794..4675f33 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -22,7 +22,7 @@ import {NumberUtils} from "../openaireLibrary/utils/number-utils.class";
import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
import {LocalStorageService} from "../openaireLibrary/services/localStorage.service";
-import {Stakeholder, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
+import {Stakeholder, StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {User} from "../openaireLibrary/login/utils/helper.class";
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {properties} from "../../environments/environment";
@@ -55,7 +55,8 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
public loading: boolean = true;
public errorCodes: ErrorCodes;
public properties: EnvProperties = properties;
- public entities = OpenaireEntities;
+ public openaireEntities = OpenaireEntities;
+ public stakeholderEntities = StakeholderEntities;
public directLink: boolean = true;
public publicationsSize: any = null;
public datasetsSize: any = null;
diff --git a/src/app/learn-how/learn-how.component.html b/src/app/learn-how/learn-how.component.html
index c28db83..d6ac3c4 100644
--- a/src/app/learn-how/learn-how.component.html
+++ b/src/app/learn-how/learn-how.component.html
@@ -27,7 +27,7 @@
Starting from the OpenAIRE RESEARCH GRAPH
-
OpenAIRE Research Graph is a comprehensive research graph (meta research) that links all types of {{entities.RESULTS | lowercase}} to funders, {{entities.ORGANIZATIONS | lowercase}}, researchers, {{entities.COMMUNITIES | lowercase}} and publishers. With information from global databases, disambiguated and interlinked using semantic AI technologies.
+
OpenAIRE Research Graph is a comprehensive research graph (meta research) that links all types of {{openaireEntities.RESULTS | lowercase}} to {{stakeholderEntities.FUNDERS | lowercase}}, {{openaireEntities.ORGANIZATIONS | lowercase}}, researchers, {{openaireEntities.COMMUNITIES | lowercase}} and publishers. With information from global databases, disambiguated and interlinked using semantic AI technologies.
@@ -40,7 +40,7 @@
Provide us some information
- You give us some simple (meta)data related to your organization function: e.g., funding database, repositories, related {{entities.PROJECTS | lowercase}}, registry of people… All under confidential agreements.
+ You give us some simple (meta)data related to your organization function: e.g., funding database, repositories, related {{openaireEntities.PROJECTS | lowercase}}, registry of people… All under confidential agreements.
diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts
index 22ccfe7..fe3cc3d 100644
--- a/src/app/learn-how/learn-how.component.ts
+++ b/src/app/learn-how/learn-how.component.ts
@@ -9,6 +9,7 @@ import {properties} from "../../environments/environment";
import {Subscriber} from "rxjs";
import {Breadcrumb} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
+import {StakeholderEntities} from '../openaireLibrary/monitor/entities/stakeholder';
@Component({
selector: 'learn-how',
@@ -23,9 +24,11 @@ export class LearnHowComponent {
public pageTitle: string = "OpenAIRE - Monitor | About";
public description: string = "Learn the process: Use the Monitor Dashboard to view your research results, open science. See how it works. Simplify research tracking & monitoring ";
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'About'}];
- public entities = OpenaireEntities;
+ public openaireEntities = OpenaireEntities;
+ public stakeholderEntities = StakeholderEntities;
public properties: EnvProperties = properties;
subscriptions = [];
+
constructor(
private route: ActivatedRoute,
private _router: Router,
@@ -44,7 +47,7 @@ export class LearnHowComponent {
this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url);
this.updateTitle(this.pageTitle);
- this.updateDescription("OpenAIRE - Monitor, Funders, Statistics, EC - Learn How");``
+ this.updateDescription("OpenAIRE - Monitor, " + this.stakeholderEntities.FUNDERS+ ", Statistics, EC - Learn How");``
//this.getDivContents();
//this.getPageContents();
diff --git a/src/app/my-stakeholders/my-stakeholders.component.html b/src/app/my-stakeholders/my-stakeholders.component.html
index 2002304..4a29433 100644
--- a/src/app/my-stakeholders/my-stakeholders.component.html
+++ b/src/app/my-stakeholders/my-stakeholders.component.html
@@ -92,7 +92,7 @@
- You are not yet member in any Dashboards.
+ You are not yet member in any {{stakeholderEntities.STAKEHOLDERS}}.
Start by browsing and subscribing in those that you are interested in.
diff --git a/src/app/my-stakeholders/my-stakeholders.component.ts b/src/app/my-stakeholders/my-stakeholders.component.ts
index 758ee6b..30195bb 100644
--- a/src/app/my-stakeholders/my-stakeholders.component.ts
+++ b/src/app/my-stakeholders/my-stakeholders.component.ts
@@ -16,7 +16,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
import {properties} from "../../environments/environment";
import {Subscriber} from "rxjs";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
-import {StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
+import {StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
@Component({
selector: 'my-stakeholders',
@@ -24,8 +24,9 @@ import {StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
})
export class MyStakeholdersComponent {
- public pageTitle = "OpenAIRE | My Dashboards";
- public description = "OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies | My managing and member of Dashboards";
+ public stakeholderEntities = StakeholderEntities;
+ public pageTitle = "OpenAIRE | My " + this.stakeholderEntities.STAKEHOLDERS;
+ public description = "OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies | My managing and member of " + this.stakeholderEntities.STAKEHOLDERS;
public stakeholders: StakeholderInfo[] = [];
public pageContents = null;
public divContents = null;
@@ -35,7 +36,7 @@ export class MyStakeholdersComponent {
public subscriberErrorMessage: string = "";
public errorCodes: ErrorCodes;
private errorMessages: ErrorMessagesComponent;
- public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'My Dashboards'}];
+ public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'My ' + this.stakeholderEntities.STAKEHOLDERS}];
public properties: EnvProperties = properties;
private user: User;
private subscriptions = [];
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index f9f9a6d..f3af762 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit f9f9a6d5eadbf0efb1cdb9afb74f65d074c92e83
+Subproject commit f3af762dab9b3d489dd4f78c46f3537aff840efd
diff --git a/src/app/search-stakeholders/search-stakeholders.component.ts b/src/app/search-stakeholders/search-stakeholders.component.ts
index c2af9f9..97dd205 100644
--- a/src/app/search-stakeholders/search-stakeholders.component.ts
+++ b/src/app/search-stakeholders/search-stakeholders.component.ts
@@ -11,25 +11,26 @@ import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
import {NewSearchPageComponent} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
-import {StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
+import {StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {properties} from "../../environments/environment";
import {Subscriber} from "rxjs";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
+import {TitleCasePipe} from "@angular/common";
@Component({
selector: 'search-stakeholders',
template: `
-
1)?'dashboards':'dashboard'" entityType="stakeholder"
- [results]="results" [searchUtils]="searchUtils"
- [showResultCount]=true
- [disableForms]="disableForms"
- [showIndexInfo]=false
- [simpleView]="true"
- [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [showBreadcrumb]="true" [breadcrumbs]="breadcrumbs"
- [simpleSearchLink]="searchLink" [entitiesSelection]="false">
+ 1) ? this.stakeholderEntities.STAKEHOLDERS:this.stakeholderEntities.STAKEHOLDER" entityType="stakeholder"
+ [results]="results" [searchUtils]="searchUtils"
+ [showResultCount]=true
+ [disableForms]="disableForms"
+ [showIndexInfo]=false
+ [simpleView]="true"
+ [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [showBreadcrumb]="true" [breadcrumbs]="breadcrumbs"
+ [simpleSearchLink]="searchLink" [entitiesSelection]="false">
`
})
@@ -60,14 +61,16 @@ export class SearchStakeholdersComponent {
};
public keyword = "";
public searchLink;
- public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Browse Dashboards'}];
+ public stakeholderEntities = StakeholderEntities;
+ public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Browse ' + this.stakeholderEntities.STAKEHOLDERS}];
properties: EnvProperties = properties;
@ViewChild(NewSearchPageComponent, {static: true}) searchPage: NewSearchPageComponent;
private user: User;
constructor(private route: ActivatedRoute,
private _stakeholderService: StakeholderService,
- private userManagementService: UserManagementService) {
+ private userManagementService: UserManagementService,
+ public titleCasePipe: TitleCasePipe) {
this.errorCodes = new ErrorCodes();
this.errorMessages = new ErrorMessagesComponent();
this.searchUtils.status = this.errorCodes.LOADING;
@@ -438,7 +441,7 @@ export class SearchStakeholdersComponent {
let value_original_ids = [];
filter_names.push("Type");
filter_ids.push("type");
- value_names.push(["Funders", "Research Initiatives", "Institutions"]);
+ value_names.push([this.stakeholderEntities.FUNDERS, this.titleCasePipe.transform(this.stakeholderEntities.RIS), this.titleCasePipe.transform(this.stakeholderEntities.ORGANIZATIONS)]);
value_original_ids.push(["funder", "ri", "organization"]);
filter_names.push("Accessibility");
filter_ids.push("access");
diff --git a/src/app/search-stakeholders/search-stakeholders.module.ts b/src/app/search-stakeholders/search-stakeholders.module.ts
index b3da92a..c025376 100644
--- a/src/app/search-stakeholders/search-stakeholders.module.ts
+++ b/src/app/search-stakeholders/search-stakeholders.module.ts
@@ -1,5 +1,5 @@
import {NgModule} from "@angular/core";
-import {CommonModule} from "@angular/common";
+import {CommonModule, TitleCasePipe} from "@angular/common";
import {FormsModule} from "@angular/forms";
import {SearchStakeholdersComponent} from "./search-stakeholders.component";
import {SearchFormModule} from "../openaireLibrary/searchPages/searchUtils/searchForm.module";
@@ -16,7 +16,7 @@ import {NewSearchPageModule} from "../openaireLibrary/searchPages/searchUtils/ne
declarations: [
SearchStakeholdersComponent
],
- providers:[ PreviousRouteRecorder],
+ providers:[ PreviousRouteRecorder, TitleCasePipe],
exports: [
SearchStakeholdersComponent
]
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index b2911ee..accd757 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit b2911eeaaf5f1a04a55353a3df5bf4d42a5fa7ca
+Subproject commit accd757bca96e58296a5ab4863bddae73e650aba