diff --git a/src/app/affiliations/affiliations.component.html b/src/app/affiliations/affiliations.component.html index 78538ee..b1b8719 100644 --- a/src/app/affiliations/affiliations.component.html +++ b/src/app/affiliations/affiliations.component.html @@ -26,7 +26,7 @@ -
-
@@ -88,6 +88,6 @@
- + diff --git a/src/app/affiliations/affiliations.component.ts b/src/app/affiliations/affiliations.component.ts index 35a5509..f964335 100644 --- a/src/app/affiliations/affiliations.component.ts +++ b/src/app/affiliations/affiliations.component.ts @@ -15,7 +15,7 @@ import {PiwikHelper} from "../utils/piwikHelper"; }) export class AffiliationsComponent { @Input() getAffiliationsFromAPI: boolean = false; - @Input() fullView: boolean = false; + @Input() longView: boolean = false; @Input() communityFirstPage: boolean = false; @Input() affiliationsInSlider: number = 5; @Input() affiliations: Affiliation[] = []; @@ -49,16 +49,16 @@ export class AffiliationsComponent { } this.properties = data.envSpecific; - - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId,this.properties.environment)).subscribe(); + if(this.longView) { + if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { + this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe(); + } + this.url = this.properties.baseLink + this._router.url; + this.seoService.createLinkForCanonicalURL(this.url); + this.updateUrl(this.url); + this.updateTitle(this.pageTitle); + this.updateDescription("OpenAIRE - Connect, Community Gateway, research community, organizations"); } - this.url = this.properties.baseLink + this._router.url; - this.seoService.createLinkForCanonicalURL(this.url); - this.updateUrl(this.url); - this.updateTitle(this.pageTitle); - this.updateDescription("OpenAIRE - Connect, Community Gateway, research community, organizations"); - if(this.getAffiliationsFromAPI) { this.showLoading = true; this.affiliationService.initAffiliations(this.properties, this.properties.communityAPI + this.communityId + "/organizations"); diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 31cca3e..0302617 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -521,7 +521,7 @@
- +
@@ -532,7 +532,7 @@
- +
diff --git a/src/app/curators/curators.component.html b/src/app/curators/curators.component.html index 15034cf..f496d6f 100644 --- a/src/app/curators/curators.component.html +++ b/src/app/curators/curators.component.html @@ -1,6 +1,6 @@ - +
@@ -46,7 +46,7 @@
Affiliations
-
@@ -56,7 +56,7 @@
Affiliations
- +
@@ -88,7 +88,7 @@
- + Curators diff --git a/src/app/curators/curators.component.ts b/src/app/curators/curators.component.ts index 42402d0..c3667be 100644 --- a/src/app/curators/curators.component.ts +++ b/src/app/curators/curators.component.ts @@ -21,7 +21,7 @@ import {PiwikHelper} from "../utils/piwikHelper"; export class CuratorsComponent { @Input() managers: string[]; @Input() communityId = null; - @Input() main = true; + @Input() longView = true; public downloadUrl = null; public showLoading = true; @@ -52,18 +52,18 @@ export class CuratorsComponent { this.route.data.subscribe((data: { envSpecific: EnvProperties }) => { this.showLoading = true; this.properties = data.envSpecific; - - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId,this.properties.environment)).subscribe(); + if(this.longView) { + if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { + this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe(); + } + this.url = this.properties.baseLink + this._router.url; + this.seoService.createLinkForCanonicalURL(this.url); + this.updateUrl(this.url); + this.updateTitle(this.pageTitle); + this.updateDescription("OpenAIRE - Connect, Community Gateway, research community"); } - this.url = this.properties.baseLink + this._router.url; - this.seoService.createLinkForCanonicalURL(this.url); - this.updateUrl(this.url); - this.updateTitle(this.pageTitle); - this.updateDescription("OpenAIRE - Connect, Community Gateway, research community"); - this.downloadUrl = this.properties.utilsService + '/download/'; - if(!this.main) { + if(!this.longView) { let emails = this.managers.join(); this.curatorsService.getCurators(this.properties, this.properties.adminToolsAPIURL + '/curator?emails=' + emails).subscribe(curators => { diff --git a/src/app/htmlPages/organizations/organizationsPage.component.ts b/src/app/htmlPages/organizations/organizationsPage.component.ts index ad11a6d..c2da0f6 100644 --- a/src/app/htmlPages/organizations/organizationsPage.component.ts +++ b/src/app/htmlPages/organizations/organizationsPage.component.ts @@ -10,12 +10,14 @@ import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper"; template: `
-
Organizations related to the community
- - +
Organizations related to the community +
+ +
- ` + ` }) export class OrganizationsPageComponent { properties:EnvProperties; diff --git a/src/app/utils/subscribe/invite/invite.component.ts b/src/app/utils/subscribe/invite/invite.component.ts index a68edea..b5cdb6f 100644 --- a/src/app/utils/subscribe/invite/invite.component.ts +++ b/src/app/utils/subscribe/invite/invite.component.ts @@ -100,15 +100,16 @@ export class InviteComponent implements OnInit { this.communityId = communityId['communityId']; } - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId,this.properties.environment)).subscribe(); + if(this.longView) { + if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { + this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe(); + } + this.url = this.properties.baseLink + this._router.url; + this.seoService.createLinkForCanonicalURL(this.url); + this.updateUrl(this.url); + this.updateTitle(this.pageTitle); + this.updateDescription("OpenAIRE - Connect, Community Gateway, research community, invite"); } - this.url = this.properties.baseLink + this._router.url; - this.seoService.createLinkForCanonicalURL(this.url); - this.updateUrl(this.url); - this.updateTitle(this.pageTitle); - this.updateDescription("OpenAIRE - Connect, Community Gateway, research community, invite"); - this.communityIdParam = (this.properties.environment != "development") ? {} : {communityId: this.communityId}; if (this.communityId != null && this.communityId != '') { //this.getDivContents();