diff --git a/src/app/affiliations/affiliations.component.html b/src/app/affiliations/affiliations.component.html index 12878a5..a6831bb 100644 --- a/src/app/affiliations/affiliations.component.html +++ b/src/app/affiliations/affiliations.component.html @@ -1,24 +1,17 @@ -
+
-
- {{organization.name.slice(0, 100)}}... +
+

+ {{organization.name}} +

@@ -46,7 +39,7 @@
-
+

Supporting Organizations @@ -59,9 +52,8 @@

-
- -
+
+
@@ -72,52 +64,6 @@
- - - - - diff --git a/src/app/affiliations/affiliations.component.ts b/src/app/affiliations/affiliations.component.ts index b120481..22e49eb 100644 --- a/src/app/affiliations/affiliations.component.ts +++ b/src/app/affiliations/affiliations.component.ts @@ -17,7 +17,7 @@ import {properties} from "../../environments/environment"; styles: [` .affiliationCard { width: 260px !important; - height: 262px !important; + height: 260px !important; } .affiliation-logo img { max-height: 60px !important; @@ -84,7 +84,7 @@ export class AffiliationsComponent { this.affiliationService.initAffiliations(this.communityId); this.subscriptions.push(this.affiliationService.affiliations.subscribe( affiliations => { - this.affiliations = affiliations; + this.affiliations = affiliations.filter((affiliation) => this.longView || !!affiliation['logo_url']); this.showLoading = false; }, error => { diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 6bbd9c3..291be3e 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -1,162 +1,135 @@ -
+
+ let-resultType="resultType" let-fetch="fetch" let-searchLinkToAdvancedPage="searchLinkToAdvancedPage" + let-params="params" let-type="type" let-typeName="typeName" let-showImpactFactors="showImpactFactors">
-
+
+ [searchLinkToAdvancedPage]="searchLinkToAdvancedPage" [properties]="properties" + [showImpactFactors]="showImpactFactors">
- -
- +
-
{{typeName}}
- + && statistics.statisticsSum && statistics.statisticsDisplay && statistics.statisticsSum[type].total>0 + && (statistics.statisticsDisplay.entities[type].numbers.map['total']['showInMonitor'] + || statistics.statisticsDisplay.entities[type].numbers.map['project']['showInMonitor'] + || statistics.statisticsDisplay.entities[type].numbers.map['open']['showInMonitor'] + || statistics.statisticsDisplay.entities[type].numbers.map['closed']['showInMonitor'] + || statistics.statisticsDisplay.entities[type].numbers.map['embargo']['showInMonitor'] + || statistics.statisticsDisplay.entities[type].numbers.map['restricted']['showInMonitor'] + || (statistics.allowedEntitiesMode['showInMonitor'] && statistics.statisticsSum + && statistics.allowedChartsMode['showInMonitor'] && statistics.statisticsSum[type] + && statistics.allowedChartsMode['showInMonitor'][type] && statistics.statisticsSum[type].total > 0 + && statistics.allowedChartsMode['showInMonitor'][type].length > 0) )"> +
+ {{typeName}} +
+ entity: type, entityName: typeName, + statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, + allowedEntities: statistics.allowedEntitiesMode['showInMonitor'], + allowedCharts:statistics.allowedChartsMode['showInMonitor'], + showChartTitle: statistics.chartTitlesMode['showInMonitor'], + chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}">
+ let-statisticsDisplay="statisticsDisplay" let-allowedEntities="allowedEntities" + let-allowedCharts="allowedCharts" let-chartsInfoMap="chartsInfoMap" + let-showChartTitle="showChartTitle" + let-showIn="showIn">
+ !statisticsDisplay.entities[entity].numbers.map['total'][showIn] && !statisticsDisplay.entities[entity].numbers.map['project'][showIn] && + !statisticsDisplay.entities[entity].numbers.map['open'][showIn] && !statisticsDisplay.entities[entity].numbers.map['closed'][showIn] && + !statisticsDisplay.entities[entity].numbers.map['embargo'][showIn] && !statisticsDisplay.entities[entity].numbers.map['restricted'][showIn]" + class="uk-alert uk-alert-primary"> No graphs available
-
+ [class]="'uk-grid uk-grid-small uk-grid-match ' + (showIn == 'showInMonitor' ? ' uk-child-width-1-3@s uk-child-width-1-6@m' : ' uk-child-width-1-1@s uk-child-width-1-3@m')" + uk-grid> +
-
{{statisticsSum[entity].total|number}}
- -
Total
+
+ {{statisticsSum[entity].total|number}} +
+
+ Total +
-
+
-
{{statisticsSum[entity].projects|number}}
- -
Total linked projects
+
+ {{statisticsSum[entity].projects|number}} +
+
+ Total linked projects +
-
+
-
{{statisticsSum[entity].open_access|number}}
- -
Open access
+
+ {{statisticsSum[entity].open_access|number}} +
+
+ Open access +
-
+
-
{{statisticsSum[entity].closed_access|number}}
- -
Closed access
+
+ {{statisticsSum[entity].closed_access|number}} +
+
+ Closed access +
-
+
-
{{statisticsSum[entity].embargo|number}}
- -
Embargoed
+
+ {{statisticsSum[entity].embargo|number}} +
+
+ Embargoed +
-
+
-
{{statisticsSum[entity].restricted|number}}
- -
Restricted
+
+ {{statisticsSum[entity].restricted|number}} +
+
+ Restricted +
-
+
  • - -
    -
    +
    +
    {{chartsInfoMap[chart].title}}
    @@ -165,36 +138,25 @@
- - - - - - -
-
+
- -
-
+
+
{{chartsInfoMap[chart].title}}
- +
-
-
-
-
+
-
+
{{community.shortTitle}}

@@ -202,9 +164,9 @@

- +
@@ -217,399 +179,579 @@
-
-
-
-
-
- -
-
-
- - -
- - - - - - - - - - -
+
+
+
+
+ - - - - - -
-
- - - - - - - - - -
-
- - - -
-
- -
-
Here are listed some of the most important energy datasets as selected by energy experts.
-
- Check them if you want to easily explore and visualize the European energy landscape, - using only well-known datasets which you can trust. -
-
- -
-
- - -
- -
- Browse OpenAIRE Research Graph through a map of the main concepts linked to Coronavirus -
-
- - Powered by Opscidia and OpenAIRE Research Graph - Visit - Opscidia Tool - -
-
- - - + + + + + + + + + + + + + + + + + + +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
+
+ + + + +
+
+ + + + + + + + +
+
+ + +
+
+ +
+
Here are listed some of the most important energy datasets as selected by energy experts.
+
+ Check them if you want to easily explore and visualize the European energy landscape, + using only well-known datasets which you can trust. +
+
+ +
+
+ + +
+
+ Browse OpenAIRE Research Graph through a map of the main concepts linked to Coronavirus +
+
+ + Powered by Opscidia and OpenAIRE Research Graph + Visit + Opscidia Tool + +
+
+ + + + --> + + + +
+
+
+
+
+
+
+
+
+ +
+
+
+
+ Created: {{community.date | date:'dd-MMM-yyyy'}} +
+ + +
+
+
+ + + + +
+ +
+
+
+
+
+
+
Subjects
+ + + + {{subject}} + + , + + +
+ + View all + +
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ Browse OpenAIRE Research Graph through a map of the main concepts linked to Coronavirus +
+
+ + + Powered by + Opscidia and + OpenAIRE Research Graph + + Visit + + Opscidia Tool + + +
+
+
+
+
+ +
+
Here are listed some of the most important energy datasets as selected by energy experts.
+
+ Check them if you want to easily explore and visualize the European energy landscape, + using only well-known datasets which you can trust. +
+
+ +
+
+
+
+
+
- + + -
- -
-
- -
-
- +
+
+ class="uk-section tm-middle uk-container uk-margin-large-top ">
-
+
No community chosen
@@ -672,11 +808,9 @@
-
-
diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts index fade2b9..0a6119a 100644 --- a/src/app/community/community.component.ts +++ b/src/app/community/community.component.ts @@ -27,10 +27,35 @@ import {Subscription} from "rxjs"; import {properties} from "../../environments/environment"; import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class"; +import {OpenaireEntities} from '../openaireLibrary/utils/properties/searchFields'; @Component({ selector: 'community', templateUrl: 'community.component.html', + styles: [ + ` + #mytabs .uk-tab::before { + border-bottom: none; + } + #mytabs::before { + content: ""; + position: absolute; + bottom: 0; + left: 0; + right: 0; + border-bottom: 2px solid #eaeaea; + } + .featuredTab, .uk-active a.featuredTab{ + color:#E96439 !important; + } + .blur-background { + background-color: var(--landing-default-color); + } + .blur-background { + background: rgba(var(--landing-default-color-rgb), 0.80); + } + ` + ] }) export class CommunityComponent { @@ -91,7 +116,7 @@ export class CommunityComponent { shareInZenodoPage: string = null; public routerHelper: RouterHelper = new RouterHelper(); private user: User; - selectedEntity; + selectedEntity = 'result'; selectedEntitySimpleUrl; selectedEntityAdvancedUrl; resultTypes: Filter = { @@ -104,7 +129,12 @@ export class CommunityComponent { title: "Type", filterOperator: "or" }; - + showPublications: boolean = false; + showDatasets: boolean = false; + showSoftware: boolean = false; + showOrp: boolean = false; + showProjects: boolean = false; + showDataProviders: boolean = false; keyword: string = ""; customFilter; placeholderText = "Search by title, author, abstract, DOI, orcid... "; @@ -115,6 +145,7 @@ export class CommunityComponent { value: "Open Access" }; disableSelect: boolean = true; + openaireEntities= OpenaireEntities; constructor( private element: ElementRef, @@ -255,7 +286,47 @@ export class CommunityComponent { this.handleError("Error getting community with id: " + this.communityId, error); } )); - + this.subs.push(this.config.communityInformationState.subscribe(data => { + if (data) { + var showEntity = {}; + for (var i = 0; i < data['entities'].length; i++) { + showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"]; + } + this.showPublications = !!showEntity["publication"]; + this.showDatasets = !!showEntity["dataset"]; + this.showSoftware = !!showEntity["software"]; + this.showOrp = !!showEntity["orp"]; + this.showProjects = !!showEntity["project"]; + this.showDataProviders = !!showEntity["datasource"]; + if (this.showPublications) { + this.resultTypes.values.push({ + name: this.openaireEntities.PUBLICATIONS, + id: "publications", + selected: false, + number: 0 + }); + } + if (this.showDatasets) { + this.resultTypes.values.push({ + name: this.openaireEntities.DATASETS, + id: "datasets", + selected: false, + number: 0 + }); + } + if (this.showSoftware) { + this.resultTypes.values.push({ + name: this.openaireEntities.SOFTWARE, + id: "software", + selected: false, + number: 0 + }); + } + if (this.showOrp) { + this.resultTypes.values.push({name: this.openaireEntities.OTHER, id: "other", selected: false, number: 0}); + } + } + })); } private searchPublications(page: number, size: number) { @@ -440,16 +511,22 @@ export class CommunityComponent { } } - public buildProjectsAndContentProvidesTooltip(): string { - let tooltipContent: string = "
"; + public buildProjectsTooltip(): string { + let tooltipContent: string = "
"; if (this.projectTotal != null && this.projectTotal > 0 && this.isEntityEnabled('project') && this.isRouteEnabled(this.searchLinkToProjects)) { tooltipContent += "Projects"; } - if (this.projectTotal != null && this.projectTotal > 0 && this.isEntityEnabled('project') && this.isRouteEnabled(this.searchLinkToProjects) - && (this.contentProviderTotal != null && this.contentProviderTotal > 0 && this.isEntityEnabled('datasource') && this.isRouteEnabled(this.searchLinkToDataProviders))) { - tooltipContent += " and "; - } + + tooltipContent += " have been selected as relevant for your community by the gateway curators."; + tooltipContent += "
"; + + return tooltipContent; + } + + public buildContentProvidersTooltip(): string { + let tooltipContent: string = "
"; + if (this.contentProviderTotal != null && this.contentProviderTotal > 0 && this.isEntityEnabled('datasource') && this.isRouteEnabled(this.searchLinkToDataProviders)) { tooltipContent += "Content Providers"; } @@ -461,11 +538,12 @@ export class CommunityComponent { } public buildZenodoCommunitiesTooltip(): string { - let tooltipContent: string = "
"; + let tooltipContent: string = "
"; tooltipContent += "Zenodo is a catch-all repository for OpenAIRE."; tooltipContent += "
A Zenodo Community is created and curated by Zenodo users.
"; tooltipContent += "
"; + return tooltipContent; } @@ -567,8 +645,12 @@ export class CommunityComponent { this.activeTab = 'mapping'; } else if (activeTabId == 'enermaps') { this.show = 'enermaps'; + this.activeTab = 'enermaps'; this.searchFeaturedDatasets(1, this.fetchFeaturedDatasets.searchUtils.totalResults); - } + } else if (activeTabId == 'twitter') { + this.show = 'twitter'; + this.activeTab = 'twitter'; + } } } isPrivate(){ diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index dfbe8ec..bf88048 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -32,6 +32,7 @@ import {ErrorModule} from "../openaireLibrary/error/error.module"; import {AdvancedSearchInputModule} from '../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module'; import {InputModule} from '../openaireLibrary/sharedComponents/input/input.module'; import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module'; +import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; @NgModule({ imports: [ @@ -41,7 +42,7 @@ import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/ SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule, SEOServiceModule, MatSelectModule, EntitiesSelectionModule, TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule, - AdvancedSearchInputModule, InputModule, QuickSelectionsModule + AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule ], declarations: [ CommunityComponent diff --git a/src/app/curators/curators.component.html b/src/app/curators/curators.component.html index 7e2c54c..e9b4588 100644 --- a/src/app/curators/curators.component.html +++ b/src/app/curators/curators.component.html @@ -34,34 +34,18 @@

{{curator.name}}

- Biography + Biography
{{_format(curator.bio)}}
{{curator.bio}}
- View details
-
@@ -94,73 +78,29 @@
+ +
- + Curated by:
-
- - - - - - - - - {{curator.name}} - - - - - - Curator Photo - Curator Photo - -
- {{curator.name}} -
- - -
- - Affiliations - - ({{curator.affiliations.length}}) - - - - - - - View more details - - - - - , - - ... +
+ + + {{curator.name}} + , + + + +{{curators.length-curatorsLimit}} more + +
-
- - View all {{curators.length | number}} curators - -
-
- View less curators -
+
@@ -211,39 +151,6 @@
-
- - -
diff --git a/src/app/deposit/zenodo/shareInZenodo.component.html b/src/app/deposit/zenodo/shareInZenodo.component.html index e425933..9effde1 100644 --- a/src/app/deposit/zenodo/shareInZenodo.component.html +++ b/src/app/deposit/zenodo/shareInZenodo.component.html @@ -1,146 +1,145 @@ -
-
-
- - -
+
+
+
-
-
- -
-
- Deposit in Zenodo -
-
-
- Main Zenodo community -
- -
+
+ +
+

Deposit your research in Zenodo.

+
+
Main Zenodo community
+
+
+
+
+
+
+ + {{masterZenodoCommunity.title}} + +
+
+

+ + {{masterZenodoCommunity.title}} + [no name available] + + + {{masterZenodoCommunity.title}} + [no name available] + +

+
+ Last update: {{masterZenodoCommunity.date | date:'yyyy/MM/dd'}} +
+
+
+
+

+
+ +
+
+
+
+
+ +
+ OpenAIRE logo + + OpenAIRE Compliant Repositories + +
+
+
+
+
-
- - - -
-
-

- - - - {{masterZenodoCommunity.title}} - [no name available] - - - {{masterZenodoCommunity.title}} - [no name available] - -

-
- last update: {{masterZenodoCommunity.date | date:'yyyy/MM/dd'}} -
- -
- - - - - - - - - - New upload - - -
-
-

-
-
-
- -
- - -
Other related Zenodo communities ({{communityIds.length}})
- - - -
- -
+ + +
+
Other related Zenodo communities
+ + +
+ +
+
+
+
+
+ + {{communities[this.communityIds[i]['zenodoid']].title}} + +
+
+

+ + {{communities[this.communityIds[i]['zenodoid']].title}} + [no name available] + +

+
+ Last update: {{communities[this.communityIds[i]['zenodoid']].date | date:'yyyy/MM/dd'}} +
+
+
+
+

+
+ +
+
+
+ +
+
+
+
diff --git a/src/app/deposit/zenodo/shareInZenodo.module.ts b/src/app/deposit/zenodo/shareInZenodo.module.ts index 415b4ad..7de4c02 100644 --- a/src/app/deposit/zenodo/shareInZenodo.module.ts +++ b/src/app/deposit/zenodo/shareInZenodo.module.ts @@ -16,12 +16,14 @@ import {Schema2jsonldModule} from "../../openaireLibrary/sharedComponents/schema import {SEOServiceModule} from "../../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; import {NoLoadPaging} from "../../openaireLibrary/searchPages/searchUtils/no-load-paging.module"; +import {IconsModule} from 'src/app/openaireLibrary/utils/icons/icons.module'; +import {LoadingModule} from 'src/app/openaireLibrary/utils/loading/loading.module'; @NgModule({ imports: [ CommonModule, ShareInZenodoRoutingModule, ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule, - RouterModule, HelperModule, - PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, NoLoadPaging + RouterModule, HelperModule, LoadingModule, + PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, NoLoadPaging, IconsModule ], declarations: [ ShareInZenodoComponent diff --git a/src/app/htmlPages/organizations/organizationsPage.component.ts b/src/app/htmlPages/organizations/organizationsPage.component.ts index 88914a7..e026e02 100644 --- a/src/app/htmlPages/organizations/organizationsPage.component.ts +++ b/src/app/htmlPages/organizations/organizationsPage.component.ts @@ -9,7 +9,7 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
-
+

Supporting Organizations

diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index bbbb711..ffd997d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit bbbb7118654014845d71fd90e6545c6c3338c25f +Subproject commit ffd997dfcb94725c1a17097fe2c6224f0c272cca diff --git a/src/app/utils/subscribe/subscribe.component.ts b/src/app/utils/subscribe/subscribe.component.ts index 18b806f..2fe7b06 100644 --- a/src/app/utils/subscribe/subscribe.component.ts +++ b/src/app/utils/subscribe/subscribe.component.ts @@ -53,7 +53,7 @@ declare var UIkit: any; - Members: {{members}} + Members: {{members}} diff --git a/src/assets/common-assets b/src/assets/common-assets index 1c7b422..052d94e 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 1c7b42284c58024e7d51cb0ae7c5c27f997c646d +Subproject commit 052d94e27ce698a119755973e0b7285d2b64370b diff --git a/src/assets/connect-assets/deposit/suggested-repositories.svg b/src/assets/connect-assets/deposit/suggested-repositories.svg new file mode 100644 index 0000000..918423a --- /dev/null +++ b/src/assets/connect-assets/deposit/suggested-repositories.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5edc3ac..25f7f7d 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5edc3ac713d4e2b78ad81d060c0c3f8a1ce3fafe +Subproject commit 25f7f7dd34fae80d1e2e25935c2f2772c5800e70