diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 7e228d78..4f1dc6a1 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -72,7 +72,7 @@ -
+
@@ -90,7 +90,7 @@
-
+
-
-
+
+
@@ -477,7 +477,7 @@
    -
  • +
  • Overview
  • diff --git a/landingPages/landing-utils/showTitle.component.ts b/landingPages/landing-utils/showTitle.component.ts index 09e0dab2..dd688386 100644 --- a/landingPages/landing-utils/showTitle.component.ts +++ b/landingPages/landing-utils/showTitle.component.ts @@ -4,7 +4,7 @@ import {ActivatedRoute} from '@angular/router'; @Component({ selector: 'showTitle', template: ` -

    +

    diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 7f1fd9b7..6b4d1454 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -1,5 +1,6 @@ -
    -
    + +
    +
    @@ -267,6 +268,80 @@
    + +
    + +
    + + +
    +
    + +
    + Funding / {{openaireEntities.PROJECTS}} + +
    +
    +     + +
    + {{openaireEntities.DATASOURCES}} + +
    +
    +     + +
    + {{openaireEntities.PUBLICATIONS}} + +
    +
    +     + +
    + {{openaireEntities.DATASETS}} + +
    +
    +     + +
    + {{openaireEntities.SOFTWARE}} + +
    +
    +     + +
    + {{openaireEntities.OTHER}} + +
    +
    +     +
    +
    +
    +
    + + +
    +
    +     +
    + diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index 60a148d0..a073a54c 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -26,6 +26,7 @@ import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; import {OpenaireEntities} from '../../utils/properties/searchFields'; import {Option} from '../../sharedComponents/input/input.component'; +import {LayoutService} from '../../dashboard/sharedComponents/sidebar/layout.service'; declare var ResizeObserver; @@ -121,7 +122,7 @@ export class OrganizationComponent { // @ViewChild('projectsModal') projectsModal; public deleteByInferenceOpened: boolean = false; - + public isMobile: boolean = false; constructor(private element: ElementRef, private _organizationService: OrganizationService, @@ -138,7 +139,8 @@ export class OrganizationComponent { private seoService: SEOService, private _location: Location, private indexInfoService: IndexInfoService, - private cdr: ChangeDetectorRef) { + private cdr: ChangeDetectorRef, + private layoutService: LayoutService) { this.fetchProjects = new FetchProjects(this._searchProjectsService); this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); this.fetchPublications = new FetchResearchResults(this._searchResearchResultsService); @@ -148,19 +150,21 @@ export class OrganizationComponent { } ngOnInit() { - - this.properties = properties; - if (typeof document !== 'undefined') { - this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => { - if (lastIndexUpdate) { - this.indexUpdateDate = new Date(lastIndexUpdate); - } - })); - } - //this.getDivContents(); - this.getPageContents(); - this.updateUrl(this.properties.domain + this.properties.baseLink + this._router.url); - this.seoService.createLinkForCanonicalURL(this.properties.domain +this.properties.baseLink + this._router.url); + this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => { + this.isMobile = isMobile; + })); + this.properties = properties; + if (typeof document !== 'undefined') { + this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => { + if (lastIndexUpdate) { + this.indexUpdateDate = new Date(lastIndexUpdate); + } + })); + } + //this.getDivContents(); + this.getPageContents(); + this.updateUrl(this.properties.domain + this.properties.baseLink + this._router.url); + this.seoService.createLinkForCanonicalURL(this.properties.domain +this.properties.baseLink + this._router.url); this.subscriptions.push(this.route.queryParams.subscribe(params => { this.organizationInfo = null; diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index 19f96a96..8bff20a9 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -110,7 +110,7 @@
    -
    +
    @@ -153,7 +153,7 @@
    -
    +
    -
    -
    +
    +
    @@ -512,7 +512,7 @@