diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index aa6ec280..12902252 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -4,7 +4,7 @@
-
+
    • - + -->
    @@ -70,8 +69,22 @@
    -
    +
    +
    +
    +
    + + + + Share + +
    +
    +
    +
    +
    @@ -99,18 +112,21 @@ [subTitle]="(dataProviderInfo.officialName && dataProviderInfo.title.name !== dataProviderInfo.officialName)?dataProviderInfo.officialName:null" [types]="dataProviderInfo.type ? [dataProviderInfo.type] : null" - [entityType]="getTypeName()"> + [entityType]="getTypeName()" + [compatibility]="dataProviderInfo.compatibility" [aggregationStatus]="dataProviderInfo.aggregationStatus" + [thematic]="dataProviderInfo.thematic" [type]="type"> -
    + +
    - - + {{sliceString(availableOn[0].downloadNames.join("; "), 20)}} @@ -26,7 +26,7 @@ declare var UIkit;
    - +
    diff --git a/landingPages/landing-utils/landing-header/landing-header.component.ts b/landingPages/landing-utils/landing-header/landing-header.component.ts index d68d6d12..a7ddf8ba 100644 --- a/landingPages/landing-utils/landing-header/landing-header.component.ts +++ b/landingPages/landing-utils/landing-header/landing-header.component.ts @@ -2,6 +2,7 @@ import {Component, Input} from "@angular/core"; import {EnvProperties} from "../../../utils/properties/env-properties"; import {Author} from "../../../utils/result-preview/result-preview"; import {AlertModal} from "../../../utils/modal/alert"; +import {OpenaireEntities} from "src/app/openaireLibrary/utils/properties/searchFields"; @Component({ selector: 'landing-header', @@ -14,6 +15,23 @@ import {AlertModal} from "../../../utils/modal/alert";
    + + + + + + + Open Access Mandate for {{openaireEntities.PUBLICATIONS}} and {{openaireEntities.DATASETS}} + + + Open Access Mandate for {{openaireEntities.PUBLICATIONS}} + + + Open Access Mandate for {{openaireEntities.DATASETS}} + + • + + @@ -32,35 +50,41 @@ import {AlertModal} from "../../../utils/modal/alert"; {{removeUnknown(types, true).join(' , ')}} - - - {{' . '}} - - - {{'from '}} - - - {{'until '}} - - - {{startDate | date: 'yyyy'}} - - - {{' - '}} - - - {{endDate | date: 'yyyy'}} - - - - {{' . ' + status}} - - - {{' . ' + year}} - - - . Embargo end date: {{embargoEndDate | date: 'dd MMM yyyy'}} - + + + • + From + {{startDate | date: 'dd MMM yyyy'}} + + + • + Until + {{endDate | date: 'dd MMM yyyy'}} + + + • + + {{startDate | date: 'dd MMM yyyy'}} + (Started) + + - + + {{endDate | date: 'dd MMM yyyy'}} + {{currentDate >= endDate ? '(Ended)' : '(Ending)'}} + + + + • + {{status}} + + + • + {{date | date: 'dd MMM yyyy': 'UTC'}} + + + • + Embargo end date: {{embargoEndDate | date: 'dd MMM yyyy'}} + . - + + + + • + + + + {{compatibility.info}} + {{compatibility.name}} + + + {{compatibility.info}} + + {{compatibility.info}} in OpenAIRE + + + + {{compatibility.name}} + + + + + • + OpenAIRE Text Mining + + + • + Thematic +
    @@ -95,8 +148,11 @@ export class LandingHeaderComponent { @Input() types: string[]; @Input() startDate: number; // project landing @Input() endDate: number; // project landing + @Input() currentDate: number; // project landing @Input() status: string; // project landing - @Input() year: string; + @Input() openAccessMandatePublications: boolean // project landing + @Input() openAccessMandateDatasets: boolean // project landing + @Input() date: Date; @Input() embargoEndDate: Date; @Input() title: string; @Input() subTitle: string; @@ -109,10 +165,15 @@ export class LandingHeaderComponent { @Input() isTitleH1:boolean =true; @Input() isSticky: boolean = false; @Input() publisher; // showPublisher component - @Input() publishDate: Date; // showPublisher component @Input() journal; // showPublisher component @Input() languages; @Input() programmingLanguages; + @Input() compatibility; // data provider landing + @Input() aggregationStatus; // data provider landing + @Input() thematic: boolean; // data provider landing + @Input() type; // data provider landing + + public openaireEntities = OpenaireEntities; public removeUnknown(array: string[], type: boolean = false): string[] { if (type) { diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index 23592e3f..0111e941 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -20,8 +20,8 @@ export class ParsingFunctions { private notebook_label: string = "EOSC"; private notebook_value: string = "EOSC Jupyter Notebook"; - public open = 'lock_open'; - public closed = 'lock'; + public open = 'open_access'; + public closed = 'closed_access'; public unknown = 'question_mark'; private instanceWithDoiExists: boolean = false; diff --git a/landingPages/landing-utils/showPublisher.component.ts b/landingPages/landing-utils/showPublisher.component.ts index 08e86591..5aaf623c 100644 --- a/landingPages/landing-utils/showPublisher.component.ts +++ b/landingPages/landing-utils/showPublisher.component.ts @@ -4,12 +4,8 @@ import {EnvProperties} from "../../utils/properties/env-properties"; @Component({ selector: 'showPublisher, [showPublisher]', template: ` - - - • - {{publishDate | date: 'dd MMM yyyy' : 'UTC'}} - • @@ -77,7 +73,6 @@ import {EnvProperties} from "../../utils/properties/env-properties"; ` }) export class ShowPublisherComponent { - @Input() publishDate: Date; @Input() publisher; @Input() journal; //@Input() sherpaUrl = 'http://www.sherpa.ac.uk/romeo/search.php?issn='; diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 95cdc3f7..0a1502fc 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -3,13 +3,12 @@
    -
    +
  • @@ -18,7 +17,6 @@
    • -
  • @@ -31,7 +29,8 @@
    • -
    +
    --> +
    @@ -63,11 +62,43 @@
    +
    + +
    +
    +
    +
    + + + + + View all {{organizationInfo.deletedByInferenceIds.length}} versions + + + + + + + + Share + + + + Download + +
    +
    +
    +
    +
    @@ -100,12 +131,12 @@ - + -
    +
    • -
  • @@ -57,7 +55,6 @@ -
    • -
    +
    -->
    @@ -109,6 +106,45 @@
    + +
    +
    +
    +
    + + + + Link to + + + + Share + + + + Deposit + + + + Embed + + + + Download + +
    +
    +
    +
    +
    @@ -171,12 +207,14 @@ + [startDate]="projectInfo.startDate" [endDate]="projectInfo.endDate" + [currentDate]="projectInfo.currentDate" [status]="projectInfo.status" + [openAccessMandatePublications]="projectInfo.openAccessMandatePublications" + [openAccessMandateDatasets]="projectInfo.openAccessMandateDatasets"> -
    + + - - - - -
    +
    -->
    @@ -245,13 +278,13 @@
    -
    + +
    {{projectInfo.urlInfo}} diff --git a/landingPages/project/project.module.ts b/landingPages/project/project.module.ts index 496a07af..5e4c6762 100644 --- a/landingPages/project/project.module.ts +++ b/landingPages/project/project.module.ts @@ -31,7 +31,7 @@ import {LoadingModule} from "../../utils/loading/loading.module"; import {IconsModule} from "../../utils/icons/icons.module"; import {InputModule} from "../../sharedComponents/input/input.module"; import {IconsService} from "../../utils/icons/icons.service"; -import {graph, link} from "../../utils/icons/icons"; +import {graph, link, link_to, open_access} from "../../utils/icons/icons"; @NgModule({ imports: [ @@ -55,6 +55,6 @@ import {graph, link} from "../../utils/icons/icons"; }) export class ProjectModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([link, graph]) + this.iconsService.registerIcons([link, graph, link_to, open_access]) } } diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index e91edbdf..b23d4e7b 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -217,10 +217,9 @@ [authors]="resultLandingInfo.authors" [underCuration]="resultLandingInfo.underCurationMessage" [entityType]="getTypeName()" [types]="resultLandingInfo.types" - [year]="resultLandingInfo.date" [embargoEndDate]="resultLandingInfo.embargoEndDate" - [publisher]="resultLandingInfo.publisher" [publishDate]="resultLandingInfo.dateofacceptance" - [journal]="resultLandingInfo.journal" [languages]="resultLandingInfo.languages" - [programmingLanguages]="resultLandingInfo.programmingLanguages"> + [date]="resultLandingInfo.dateofacceptance" [embargoEndDate]="resultLandingInfo.embargoEndDate" + [publisher]="resultLandingInfo.publisher" [journal]="resultLandingInfo.journal" + [languages]="resultLandingInfo.languages" [programmingLanguages]="resultLandingInfo.programmingLanguages"> @@ -271,7 +270,7 @@ [authors]="resultLandingInfo.authors" [underCuration]="resultLandingInfo.underCurationMessage" [entityType]="getTypeName()" [types]="resultLandingInfo.types" - [year]="resultLandingInfo.date" [embargoEndDate]="resultLandingInfo.embargoEndDate" + [date]="resultLandingInfo.dateofacceptance" [embargoEndDate]="resultLandingInfo.embargoEndDate" isSticky="true"> @@ -292,8 +291,7 @@ [tabTitle]="'Enermaps Tool'" [tabId]="'enermaps'" customClass="portalTab"> - - @@ -452,7 +450,7 @@
    - +
    -
    -
    -
    -
    - Altmetric -
    - Social by - Altmetric -
    -
    - - - - - - - - - - - -
    - Facebook - - 1 -
    - Twitter - - 4 -
    -
    -
    +
    +
    @@ -671,8 +639,8 @@
    -
  • - 3 +
  • +
  • @@ -680,8 +648,16 @@
    Stats
    -
    - Chart +
    +
    + + +
    +
    + +
    @@ -747,21 +723,21 @@
    -
    +
    Citations
    Popularity
    Influence
    Downloads
    -
    Views
    +
    Views
    {{resultLandingInfo.measure.citations}}
    {{resultLandingInfo.measure.popularity}}
    {{resultLandingInfo.measure.influence}}
    {{resultLandingInfo.measure.downloads}}
    -
    {{resultLandingInfo.measure.views}}
    +
    {{resultLandingInfo.measure.views}}
    • diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts index 6620f0e6..32743312 100644 --- a/landingPages/result/resultLanding.module.ts +++ b/landingPages/result/resultLanding.module.ts @@ -33,7 +33,7 @@ import {MatFormFieldModule} from "@angular/material/form-field"; import {MatSelectModule} from "@angular/material/select"; import {IconsModule} from "../../utils/icons/icons.module"; import {IconsService} from "../../utils/icons/icons.service"; -import {graph, link, quotes, cite, link_to, versions, rocket, fire, landmark} from "../../utils/icons/icons"; +import {graph, link, quotes, cite, link_to, versions, rocket, fire, landmark, open_access, closed_access} from "../../utils/icons/icons"; import {InputModule} from "../../sharedComponents/input/input.module"; import {EGIDataTransferModule} from "../../utils/dataTransfer/transferData.module"; @@ -58,6 +58,6 @@ import {EGIDataTransferModule} from "../../utils/dataTransfer/transferData.modul }) export class ResultLandingModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([link, graph, quotes, cite, link_to, versions, rocket, fire, landmark]) + this.iconsService.registerIcons([link, graph, quotes, cite, link_to, versions, rocket, fire, landmark, open_access, closed_access]) } } diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts index 26c2ff25..72212d64 100644 --- a/landingPages/result/resultLanding.service.ts +++ b/landingPages/result/resultLanding.service.ts @@ -127,7 +127,6 @@ export class ResultLandingService { parseResultLandingInfo (data: any, subjectsVocabulary: any, properties: EnvProperties): any { this.resultLandingInfo = new ResultLandingInfo(); - // res this.resultLandingInfo.record = data[15]; this.resultLandingInfo.objIdentifier = data[15]["result"]["header"]["dri:objIdentifier"]; diff --git a/utils/altmetrics.component.ts b/utils/altmetrics.component.ts index 71104099..ceab92dd 100644 --- a/utils/altmetrics.component.ts +++ b/utils/altmetrics.component.ts @@ -6,12 +6,13 @@ declare var loadAltmetrics:any; @Component({ selector: 'altmetrics', template: ` -
    +
    ` }) export class AltMetricsComponent { - @Input() id ; + @Input() id; @Input() type = 'doi'; // doi or arxiv + @Input() size: string = 'donut'; // public doi="10.7717/peerj.1150"; public altmetrics:string; @@ -26,9 +27,9 @@ export class AltMetricsComponent { ngOnInit() { this.sub = this.route.queryParams.subscribe(data => { if(this.type == "doi"){ - this.altmetrics='
    '; + this.altmetrics='
    '; }else{ - this.altmetrics='
    '; + this.altmetrics='
    '; } if (typeof document !== 'undefined') { // let yourModule = require('../utils/altmetrics.js'); diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts index c8786e9a..686cabfa 100644 --- a/utils/icons/icons.ts +++ b/utils/icons/icons.ts @@ -142,4 +142,14 @@ export const landmark = { name: 'landmark', data: '' } + +export const open_access = { + name: 'open_access', + data: ' image/svg+xml art designer at PLoS, modified by Wikipedia users Nina, Beao, JakobVoss, and AnonMoos Open Access logo, converted into svg, designed by PLoS. This version with transparent background. http://commons.wikimedia.org/wiki/File:Open_Access_logo_PLoS_white.svg art designer at PLoS, modified by Wikipedia users Nina, Beao, JakobVoss, and AnonMoos http://www.plos.org/ ' +} + +export const closed_access = { + name: 'closed_access', + data: ' image/svg+xml Jakob Voss, based on art designer at PLoS, modified by Wikipedia users Nina and Beao Closed Access logo, derived from PLoS Open Access logo. This version with transparent background. http://commons.wikimedia.org/wiki/File:Closed_Access_logo_transparent.svg Jakob Voss, based on art designer at PLoS, modified by Wikipedia users Nina and Beao ' +} /** Add new icon under this line to be sure that it will be added on preview */