diff --git a/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html b/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html index 1699d816..9fd61ae9 100644 --- a/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html +++ b/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html @@ -18,7 +18,7 @@

Through linking functioanilty you are able to create links from research results to projects and/ or communities. You have to select at least one research result and one project or community in order to be able to proceed.

-

You can search for reasearch results (publication and/ or datasets) to link, in openaire, crossref, and/ or Datacite.

+

You can search for reasearch results (publication and/ or research data) to link, in openaire, crossref, and/ or Datacite.

Projects: Search and add projects using keyword search. Limit the search space by specifying project Funder.

Communities: Search and add communities/ concepts by selecting community, category and using keyword search for . Or browse through the categories and add communities.

@@ -134,7 +134,7 @@ export class LinkingGenericComponent { linkType:string ="project"; // link type (selected in home page) : project, context, software, etc /* url Parameters for inline linking */ id:string = null; //entity id - type:string = null; // entity type (publication or dataset) + type:string = null; // entity type (publication or research data) linkTo:string = null; // entity type (project or context or result) entityTypes=["dataset", "publication", "project","context"]; diff --git a/portal-2/src/app/claims/linking/selected/selectedResults.component.ts b/portal-2/src/app/claims/linking/selected/selectedResults.component.ts index dce8b2be..1259a456 100644 --- a/portal-2/src/app/claims/linking/selected/selectedResults.component.ts +++ b/portal-2/src/app/claims/linking/selected/selectedResults.component.ts @@ -69,7 +69,7 @@ import {Dates} from '../../../utils/string-utils.class';
diff --git a/portal-2/src/app/deposit/datasets/depositBySubject.component.ts b/portal-2/src/app/deposit/datasets/depositBySubject.component.ts index a88d98a8..45172fe4 100644 --- a/portal-2/src/app/deposit/datasets/depositBySubject.component.ts +++ b/portal-2/src/app/deposit/datasets/depositBySubject.component.ts @@ -10,7 +10,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro template: `
-

Or search for Data providers via Classifications

+

Or search for content providers via Classifications

diff --git a/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts b/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts index 32b1df35..c27a90f0 100644 --- a/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts +++ b/portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts @@ -53,7 +53,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
- {{fetchDataproviders.searchUtils.totalResults}} data providers, page {{fetchDataproviders.searchUtils.page}} of {{(totalPages())}} + {{fetchDataproviders.searchUtils.totalResults}} content providers, page {{fetchDataproviders.searchUtils.page}} of {{(totalPages())}}
- No Data providers found with classification "{{subject}}". + No content providers found with classification "{{subject}}".
An error occured. @@ -116,7 +116,7 @@ export class DepositBySubjectResultComponent { this.status = this.errorCodes.LOADING; this.updateTitle("Deposit "+this.requestFor); - this.updateDescription("Openaire, repositories, open access, data provider, compatibility, organization, deposit "+ this.requestFor); + this.updateDescription("Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor); this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url); if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe(); @@ -146,7 +146,7 @@ export class DepositBySubjectResultComponent { this.searchDataproviders(); }); } - + totalPages(): number { let totalPages:any = this.fetchDataproviders.searchUtils.totalResults/(this.fetchDataproviders.searchUtils.size); if(!(Number.isInteger(totalPages))) { diff --git a/portal-2/src/app/deposit/deposit.component.ts b/portal-2/src/app/deposit/deposit.component.ts index fa23389d..0ab74d76 100644 --- a/portal-2/src/app/deposit/deposit.component.ts +++ b/portal-2/src/app/deposit/deposit.component.ts @@ -32,7 +32,7 @@ import {PiwikService} from '../utils/piwik/piwik.service'; ask a question () to OpenAIRE’s national representative.

-

Locate data provider via your institution

+

Locate content provider via your institution

@@ -77,7 +77,7 @@ export class DepositComponent { this.ercGuidlines = OpenaireProperties.getERCGuidlines(); this.helpdesk = OpenaireProperties.getHelpdesk(); this.updateTitle("Deposit "+this.requestFor); - this.updateDescription("Openaire, repositories, open access, data provider, compatibility, organization, deposit "+ this.requestFor); + this.updateDescription("Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor); this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url); this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe(); } diff --git a/portal-2/src/app/deposit/deposit.module.ts b/portal-2/src/app/deposit/deposit.module.ts index fa06f812..5f1b7933 100644 --- a/portal-2/src/app/deposit/deposit.module.ts +++ b/portal-2/src/app/deposit/deposit.module.ts @@ -1,4 +1,4 @@ -/* Common Component of deposit for both datasets & ppublications*/ +/* Common Component of deposit for both research data & ppublications*/ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; diff --git a/portal-2/src/app/deposit/depositResult.component.ts b/portal-2/src/app/deposit/depositResult.component.ts index 2466e5c5..e87f0fc9 100644 --- a/portal-2/src/app/deposit/depositResult.component.ts +++ b/portal-2/src/app/deposit/depositResult.component.ts @@ -32,7 +32,7 @@ import {PiwikService} from '../utils/piwik/piwik.service';
-

Locate data provider via your institution

+

Locate content provider via your institution

@@ -51,7 +51,7 @@ import {PiwikService} from '../utils/piwik/piwik.service';

- Data providers for institution: + content providers for institution: {{organization['name']}} () @@ -92,7 +92,7 @@ import {PiwikService} from '../utils/piwik/piwik.service'; An error occured. - No data providers found for institution: + No content providers found for institution: {{organization['name']}} () @@ -153,7 +153,7 @@ export class DepositResultComponent { this.status = this.errorCodes.LOADING; this.updateTitle("Deposit "+this.requestFor); - this.updateDescription("Openaire, repositories, open access, data provider, compatibility, organization, deposit "+ this.requestFor); + this.updateDescription("Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor); this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url); this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe(); } diff --git a/portal-2/src/app/deposit/publications/depositPublications.component.ts b/portal-2/src/app/deposit/publications/depositPublications.component.ts index dde26e07..75c9341d 100644 --- a/portal-2/src/app/deposit/publications/depositPublications.component.ts +++ b/portal-2/src/app/deposit/publications/depositPublications.component.ts @@ -9,7 +9,7 @@ import {Component} from '@angular/core';
-

Or locate data provider in map

+

Or locate content provider in map

diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html index 2ae1306d..eeae0a45 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html @@ -39,7 +39,7 @@
  • - Detailed data provider information (OpenDOAR) + Detailed content provider information (OpenDOAR) @@ -47,7 +47,7 @@
  • - Detailed data provider information (Re3data) + Detailed content provider information (Re3data) @@ -163,7 +163,7 @@ [organizations]="dataProviderInfo.organizations"> - @@ -193,7 +193,7 @@
    -

    Funders in Data Providers Publications

    +

    Funders in content providers Publications

    Projects with most Publications

    diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts index 861a7931..88fc7c5a 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts @@ -98,13 +98,13 @@ export class DataProviderComponent { ngOnInit() { this.sub = this.route.queryParams.subscribe(data => { - this.updateTitle("Data provider"); - this.updateDescription("Data provider, search, repositories, open access"); + this.updateTitle("Content provider"); + this.updateDescription("Content provider, search, repositories, open access"); this.datasourceId = data['datasourceId']; if(this.datasourceId){ this.getDataProviderInfo(this.datasourceId); }else{ - // console.info("Datasource id not found"); + // console.info("Content Provider id not found"); } if (typeof document !== 'undefined') { @@ -136,7 +136,7 @@ export class DataProviderComponent { this.initTabs(); this.showTabs = true ; this.updateTitle(this.dataProviderInfo.title.name); - this.updateDescription("Data provider, search, repositories, open access,"+this.dataProviderInfo.title.name); + this.updateDescription("Content provider, search, repositories, open access,"+this.dataProviderInfo.title.name); if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.dataProviderInfo.title.name).subscribe(); } @@ -197,7 +197,7 @@ export class DataProviderComponent { this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": -30, "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250'; this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250'; this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250'; - this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250'; + this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Data"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250'; this.pubsProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250'; //if({"name": "Publications", "content": "publicationsTab"} in this.dataProviderInfo.tabs) { diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts b/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts index 80e866ef..4c1fcc22 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts @@ -86,12 +86,12 @@ export class DataProviderService { this.dataProviderInfo.tabs.push({"name": "Projects", "content": "projectsTab"}); } if(this.dataProviderInfo.tabsInTypes.datasourcesTab.has(data[1].classid)) { - this.dataProviderInfo.tabs.push({"name": "Datasources", "content": "datasourcesTab"}); + this.dataProviderInfo.tabs.push({"name": "Content Providers", "content": "datasourcesTab"}); } this.dataProviderInfo.tabs.push({"name": "Organizations", "content": "organizationsTab"}); if(this.dataProviderInfo.tabsInTypes.relatedDatasourcesTab.has(data[1].classid)) { - this.dataProviderInfo.tabs.push({"name": "Related Data Providers", "content": "relatedDatasourcesTab"}); + this.dataProviderInfo.tabs.push({"name": "Related Content Providers", "content": "relatedDatasourcesTab"}); } if(this.dataProviderInfo.tabsInTypes.statisticsTab.has(data[1].classid)) { diff --git a/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts index 80a21432..61b6b537 100644 --- a/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts @@ -12,7 +12,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
    @@ -24,7 +24,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
    + type="research data" urlParam="datasetId">
    ` diff --git a/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts b/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts index fb3dffb3..770f3000 100644 --- a/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts @@ -6,13 +6,13 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro @Component({ selector: 'datasourcesTab', template: ` - +
    diff --git a/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts b/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts index 3d23b2be..f0572b8a 100644 --- a/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts @@ -9,20 +9,20 @@ import {RouterHelper} from '../../utils/routerHelper.class'; @Component({ selector: 'relatedDatasourcesTab', template: ` - +
    - + diff --git a/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts index bacc8551..1e5c834b 100644 --- a/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts @@ -29,7 +29,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
    -

    Funders in Data Providers Publications

    +

    Funders in content providers Publications

    Projects with most Publications

    diff --git a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts index 7af212ec..de68663b 100644 --- a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts @@ -93,7 +93,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
    -

    Funders in Data Providers Publications

    +

    Funders in content providers Publications

    Projects with most Publications

    diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.html b/portal-2/src/app/landingPages/dataset/dataset.component.html index 378597d2..e0eb6402 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.html +++ b/portal-2/src/app/landingPages/dataset/dataset.component.html @@ -385,7 +385,7 @@
    diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.ts b/portal-2/src/app/landingPages/dataset/dataset.component.ts index b211e755..ed36e977 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.ts +++ b/portal-2/src/app/landingPages/dataset/dataset.component.ts @@ -68,7 +68,7 @@ export class DatasetComponent { this.getDatasetInfo(this.datasetId); }else{ this.showLoading = false; - this.warningMessage="No valid dataset id"; + this.warningMessage="No valid research data id"; } this.metricsClicked = false; @@ -125,7 +125,7 @@ export class DatasetComponent { console.log(err) console.info("error"); - this.errorMessage = 'No dataset found'; + this.errorMessage = 'No research data found'; this.showLoading = false; } ); diff --git a/portal-2/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/portal-2/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts index 999ead9b..7a2f31a5 100644 --- a/portal-2/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ b/portal-2/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts @@ -78,13 +78,13 @@ export class HtmlProjectReportComponent{ this.warningMessage="Requested size is not an integer"; } - if(params['type'] && (params['type'] == "dataset" || params['type'] == "publication")){ + if(params['type'] && (params['type'] == "research data" || params['type'] == "publication")){ this.resultsType = params['type']; this.updateTitle("Project's "+this.resultsType+" report"); - this.updateDescription("project, project "+ this.resultsType +" report, funding, open access, publications, datasets, "); + this.updateDescription("project, project "+ this.resultsType +" report, funding, open access, publications, research data"); } else { this.showLoading = false; - this.warningMessage="Requested type should be publication or dataset"; + this.warningMessage="Requested type should be publication or research data"; } //showLoading is true if no warnings @@ -124,7 +124,7 @@ export class HtmlProjectReportComponent{ } ); - this.header2 = this.totalResults+((this.resultsType == "publication")?" publications":" datasets"); + this.header2 = this.totalResults+((this.resultsType == "publication")?" publications":" research data"); } createClipboard() { @@ -164,7 +164,7 @@ export class HtmlProjectReportComponent{ } createHeader1(data: {"title": string, "acronym": string, "callIdentifier": string}) { - this.header1 = ((this.resultsType == "publication")?"Publications":"Datasets") + " of Project "; + this.header1 = ((this.resultsType == "publication")?"Publications":"Research Data") + " of Project "; if(data != undefined) { if(data.title != undefined && data.title != "") { diff --git a/portal-2/src/app/landingPages/landing-utils/parsingFunctions.class.ts b/portal-2/src/app/landingPages/landing-utils/parsingFunctions.class.ts index 59073d9a..074c2632 100644 --- a/portal-2/src/app/landingPages/landing-utils/parsingFunctions.class.ts +++ b/portal-2/src/app/landingPages/landing-utils/parsingFunctions.class.ts @@ -69,7 +69,7 @@ export class ParsingFunctions { return fundedByProjects; } - // publication & dataset : for fundedByProjects | project landing : for funding + // publication & research data : for fundedByProjects | project landing : for funding public parseFundingTrees(fundingTree: any): {"funderName": string, "funderShortname": string, "stream": string} { let funding: {"funderName": string, "funderShortname": string, "stream": string} = {"funderName": "", "funderShortname": "", "stream": ""}; let length = Array.isArray(fundingTree) ? fundingTree.length : 1; diff --git a/portal-2/src/app/landingPages/organization/organization.component.html b/portal-2/src/app/landingPages/organization/organization.component.html index c645ab5b..86f9e3eb 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.html +++ b/portal-2/src/app/landingPages/organization/organization.component.html @@ -33,10 +33,10 @@ -
  • +
  • - Data Providers + Content Providers - + diff --git a/portal-2/src/app/landingPages/organization/organization.component.ts b/portal-2/src/app/landingPages/organization/organization.component.ts index 547dc116..a39e2b49 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.ts +++ b/portal-2/src/app/landingPages/organization/organization.component.ts @@ -228,7 +228,7 @@ export class OrganizationComponent { if(this.fetchDataproviders.searchUtils.totalResults > 0) { this.reloadDataproviders = false; - //this.activeTab = "Data Providers"; + //this.activeTab = "Content Providers"; } else { } diff --git a/portal-2/src/app/landingPages/project/project.component.html b/portal-2/src/app/landingPages/project/project.component.html index bd399767..2b29a32b 100644 --- a/portal-2/src/app/landingPages/project/project.component.html +++ b/portal-2/src/app/landingPages/project/project.component.html @@ -178,7 +178,7 @@
    • + type="research data" urlParam="datasetId">
    @@ -289,7 +289,7 @@
  • + href="/project-report?projectId={{projectId}}&size={{fetchDatasets.searchUtils.totalResults}}&type=research data"> Get {{projectInfo.funder}} report (HTML)
    • diff --git a/portal-2/src/app/landingPages/project/project.component.ts b/portal-2/src/app/landingPages/project/project.component.ts index 38542774..2bea0f70 100644 --- a/portal-2/src/app/landingPages/project/project.component.ts +++ b/portal-2/src/app/landingPages/project/project.component.ts @@ -84,7 +84,7 @@ export class ProjectComponent{ this.fetchDatasets = new FetchDatasets(this._searchDatasetsService); this.updateTitle("Project"); - this.updateDescription("project, funding, open access, publications, datasets, "); + this.updateDescription("project, funding, open access, publications, research data"); this.projectId = params['projectId']; if(this.projectId){ @@ -189,7 +189,7 @@ console.info(this.projectInfo.title); this.projectName = this.projectInfo.title; } this.updateTitle(this.projectName); - this.updateDescription("project, funding, open access, publications, datasets, "+this.projectName+ ","+this.projectInfo.funder); + this.updateDescription("project, funding, open access, publications, research data, "+this.projectName+ ","+this.projectInfo.funder); if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.projectName).subscribe(); } diff --git a/portal-2/src/app/landingPages/publication/publication.component.html b/portal-2/src/app/landingPages/publication/publication.component.html index b5161a56..ce78d4d0 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.html +++ b/portal-2/src/app/landingPages/publication/publication.component.html @@ -276,7 +276,7 @@
    -
    +
    There are no related organizations
    diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index dff150cf..660cf98e 100644 --- a/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -14,8 +14,8 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class'; @Component({ selector: 'advanced-search-dataprovider', template: ` - { this.searchUtils.totalResults = data[0]; - console.info("Adv Search Data providers total="+this.searchUtils.totalResults); + console.info("Adv Search Content Providers total="+this.searchUtils.totalResults); this.results = data[1]; this.searchPage.updateBaseUrlWithParameters(); var errorCodes:ErrorCodes = new ErrorCodes(); diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts index 528b8510..01aa3e85 100644 --- a/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts +++ b/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts @@ -13,8 +13,8 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class'; @Component({ selector: 'advanced-search-datasets', template: ` - { this.searchUtils.totalResults = data[0]; - console.info("search Datasets total="+this.searchUtils.totalResults); + console.info("search Research Data total="+this.searchUtils.totalResults); this.results = data[1]; this.searchPage.updateBaseUrlWithParameters(); var errorCodes:ErrorCodes = new ErrorCodes(); diff --git a/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts b/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts index d9eaff46..d4258d0e 100644 --- a/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts +++ b/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts @@ -17,7 +17,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class'; { this.searchUtils.totalResults = data[0]; - console.info("search Data Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]"); + console.info("search Content Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]"); this.results = data[1]; this.searchPage.checkSelectedFilters(this.filters); this.searchPage.updateBaseUrlWithParameters(this.filters); diff --git a/portal-2/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts b/portal-2/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts index a93bbe7b..e58db21f 100644 --- a/portal-2/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts +++ b/portal-2/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts @@ -16,7 +16,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class'; template: ` { this.searchUtils.totalResults = data[0]; - console.info("search Data Providers [total results:"+this.searchUtils.totalResults+"]"); + console.info("search Content Providers [total results:"+this.searchUtils.totalResults+"]"); this.results = data[1]; this.searchPage.checkSelectedFilters(this.filters); diff --git a/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts b/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts index 22299a53..61c0a8de 100644 --- a/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts +++ b/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts @@ -17,7 +17,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';

    - {{datasetsSize.number}} {{datasetsSize.size}} datasets + {{datasetsSize.number}} {{datasetsSize.size}} research data

    @@ -114,9 +114,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; -
  • +
  • - Datasets + Research Data {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchDatasets.searchUtils.totalResults :'')}} @@ -128,9 +128,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
    • -
  • +
  • - Data Providers + Content Providers {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchDataproviders.searchUtils.totalResults :'')}} @@ -155,9 +155,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; {{((keyword.length > 0)? fetchPublications.searchUtils.totalResults :'')}}
    • -
  • +
  • - Datasets + Research Data {{((keyword.length > 0)? fetchDatasets.searchUtils.totalResults :'')}} @@ -169,9 +169,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service'; {{((keyword.length > 0)? fetchProjects.searchUtils.totalResults :'')}}
    • -
  • +
  • - Data Providers + Content Providers {{((keyword.length > 0)? fetchDataproviders.searchUtils.totalResults :'')}} @@ -211,8 +211,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
    • -
    Data Provider NameContent Provider Name Number of {{type}}