From 8cf506780346fa63be59df8bd0b16daa772bf8e9 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Fri, 8 Feb 2019 12:19:26 +0000 Subject: [PATCH] Update meta descriptions in landing pages git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54737 d315682c-612b-4755-9ff5-7f18f6832af3 --- landingPages/dataProvider/dataProvider.component.ts | 4 ++-- landingPages/dataset/dataset.component.ts | 4 ++-- landingPages/organization/organization.component.ts | 4 ++-- landingPages/orp/orp.component.ts | 4 ++-- landingPages/project/project.component.ts | 4 ++-- landingPages/publication/publication.component.ts | 4 ++-- landingPages/software/software.component.ts | 2 +- searchPages/searchUtils/searchPaging.component.ts | 8 +++++++- utils/pagingFormatter.component.ts | 2 +- 9 files changed, 21 insertions(+), 15 deletions(-) diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index 3574faff..abbe7f2f 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -135,7 +135,7 @@ export class DataProviderComponent { }); this.sub = this.route.queryParams.subscribe(data => { this.updateTitle("Content provider"); - this.updateDescription("Content provider, search, repositories, open access"); + this.updateDescription(""); this.seoService.createLinkForCanonicalURL(); this.datasourceId = data['datasourceId']; if(this.datasourceId){ @@ -186,7 +186,7 @@ export class DataProviderComponent { this.initTabs(); this.showTabs = true ; this.updateTitle(this.dataProviderInfo.title.name); - this.updateDescription("Content provider, search, repositories, open access,"+this.dataProviderInfo.title.name); + this.updateDescription("Content provider, "+this.dataProviderInfo.title.name); if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.properties, this.dataProviderInfo.title.name, this.piwikSiteId).subscribe(); } diff --git a/landingPages/dataset/dataset.component.ts b/landingPages/dataset/dataset.component.ts index 9246b907..ec87a119 100644 --- a/landingPages/dataset/dataset.component.ts +++ b/landingPages/dataset/dataset.component.ts @@ -74,7 +74,7 @@ export class DatasetComponent { this.sub = this.route.queryParams.subscribe(params => { this.datasetInfo = null; this.updateTitle("Dataset"); - this.updateDescription("Dataset, search, open access"); + this.updateDescription(""); this.seoService.createLinkForCanonicalURL(); this.datasetId = params['datasetId']; @@ -133,7 +133,7 @@ export class DatasetComponent { */ if(this.datasetInfo.title){ this.updateTitle(this.datasetInfo.title); - this.updateDescription("Dataset, search, repositories, open access,"+this.datasetInfo.title); + this.updateDescription((this.datasetInfo.description?(this.datasetInfo.description):(","+this.datasetInfo.title))); } if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.properties, this.datasetInfo.title/*.name*/, this.piwikSiteId).subscribe(); diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index d1f2e4a5..95288ba2 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -130,7 +130,7 @@ export class OrganizationComponent { this.sub = this.route.queryParams.subscribe(params => { this.organizationInfo=null; this.updateTitle("Organization"); - this.updateDescription("Organization, country, projects, search, repositories, open access"); + this.updateDescription(""); this.seoService.createLinkForCanonicalURL(); this.projectsClicked = false; @@ -206,7 +206,7 @@ export class OrganizationComponent { } else { this.organizationInfo = data; this.updateTitle(this.organizationInfo.title.name); - this.updateDescription("Organization, country, projects, search, repositories, open access"+this.organizationInfo.title.name); + this.updateDescription("Organization, country, "+this.organizationInfo.title.name +((this.organizationInfo.title.name && this.organizationInfo.title.name != this.organizationInfo.name)?(", "+this.organizationInfo.name):"") ); if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.properties, this.organizationInfo.title.name, this.piwikSiteId).subscribe(); } diff --git a/landingPages/orp/orp.component.ts b/landingPages/orp/orp.component.ts index 4ac63f67..aa7952ab 100644 --- a/landingPages/orp/orp.component.ts +++ b/landingPages/orp/orp.component.ts @@ -74,7 +74,7 @@ export class OrpComponent { this.sub = this.route.queryParams.subscribe(params => { this.orpInfo = null; this.updateTitle("Other Research Product"); - this.updateDescription("Other Research Product, search, open access"); + this.updateDescription(""); this.seoService.createLinkForCanonicalURL(); this.orpId = params['orpId']; console.info("Id is :"+this.orpId); @@ -123,7 +123,7 @@ export class OrpComponent { this.orpInfo = data; if(this.orpInfo.title){ this.updateTitle(this.orpInfo.title); - this.updateDescription("Other Research Product, search, repositories, open access,"+this.orpInfo.title); + this.updateDescription((this.orpInfo.description?(this.orpInfo.description):(","+this.orpInfo.title))); } if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.properties, this.orpInfo.title, this.piwikSiteId).subscribe(); diff --git a/landingPages/project/project.component.ts b/landingPages/project/project.component.ts index 23e04ba3..f858a577 100644 --- a/landingPages/project/project.component.ts +++ b/landingPages/project/project.component.ts @@ -132,7 +132,7 @@ properties:EnvProperties; this.fetchOrps = new FetchOrps(this._searchOrpsService); var title = "Project"; - var description = "project, funding, open access, publications, research data, software, other research products"; + var description = ""; this.updateTitle(title); this.updateDescription(description); @@ -358,7 +358,7 @@ actionsAfterGettingProjectInfo(){ this.projectName = this.projectInfo.title; } this.updateTitle(this.projectName); - this.updateDescription("project, funding, open access, publications, research data, "+this.projectName+ ","+this.projectInfo.funder); + this.updateDescription("project, "+this.projectName+ ","+this.projectInfo.funder+","+this.projectInfo.acronym); if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.properties, this.projectName, this.piwikSiteId).subscribe(); } diff --git a/landingPages/publication/publication.component.ts b/landingPages/publication/publication.component.ts index 9700278d..96277c34 100644 --- a/landingPages/publication/publication.component.ts +++ b/landingPages/publication/publication.component.ts @@ -90,7 +90,7 @@ export class PublicationComponent { this.sub = this.route.queryParams.subscribe(data => { this.publicationInfo = null; this.updateTitle("Publication"); - this.updateDescription("Publication, open access, collected from"); + this.updateDescription(""); this.seoService.createLinkForCanonicalURL(); this.articleId = data['articleId']; @@ -166,7 +166,7 @@ export class PublicationComponent { }*/ if(this.publicationInfo.title){ this.updateTitle(this.publicationInfo.title); - this.updateDescription("Dataset, search, repositories, open access,"+this.publicationInfo.title); + this.updateDescription((this.publicationInfo.description?(this.publicationInfo.description):(","+this.publicationInfo.title))); } if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.properties, this.publicationInfo.title/*.name*/, this.piwikSiteId).subscribe(); diff --git a/landingPages/software/software.component.ts b/landingPages/software/software.component.ts index 3bacf052..616c08da 100644 --- a/landingPages/software/software.component.ts +++ b/landingPages/software/software.component.ts @@ -130,7 +130,7 @@ export class SoftwareComponent { }*/ if(this.softwareInfo.title){ this.updateTitle(this.softwareInfo.title); - this.updateDescription("Software, search, repositories, open access,"+this.softwareInfo.title); + this.updateDescription("Software, "+this.softwareInfo.title); } if( this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ this.piwiksub = this._piwikService.trackView(this.properties, this.softwareInfo.title/*.name*/, this.piwikSiteId).subscribe(); diff --git a/searchPages/searchUtils/searchPaging.component.ts b/searchPages/searchUtils/searchPaging.component.ts index f67bb739..cd16da41 100644 --- a/searchPages/searchUtils/searchPaging.component.ts +++ b/searchPages/searchUtils/searchPaging.component.ts @@ -5,7 +5,13 @@ import {ErrorCodes} from '../../utils/properties/errorCodes'; @Component({ selector: 'search-paging', template: ` -
+
+
{{searchUtils.totalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(searchUtils.totalResults)|number)}}
diff --git a/utils/pagingFormatter.component.ts b/utils/pagingFormatter.component.ts index 4f8c926e..e148136f 100644 --- a/utils/pagingFormatter.component.ts +++ b/utils/pagingFormatter.component.ts @@ -9,7 +9,7 @@ import {EnvProperties} from './properties/env-properties'; template: ` -
    +