MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 13 Wiki Activity

Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/connect into new-theme

This commit is contained in:
Konstantinos Triantafyllou 2022-08-02 13:39:56 +03:00
parent c94e850c2d 43a5dbab3b
commit 7fefaf531a
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/community/community.component.html
View File

@ -1,12 +1,11 @@
<div> <div>
<ng-template #tab_content <ng-template #tab_content
let-resultType="resultType" let-fetch="fetch" let-searchLinkToAdvancedPage="searchLinkToAdvancedPage" let-resultType="resultType" let-fetch="fetch" let-searchLinkToAdvancedPage="searchLinkToAdvancedPage"
let-params="params" let-type="type" let-typeName="typeName" let-showImpactFactors="showImpactFactors"> let-params="params" let-type="type" let-typeName="typeName">
<div class="uk-grid uk-margin-remove"> <div class="uk-grid uk-margin-remove">
<div class="uk-width-expand uk-padding uk-padding-remove-horizontal"> <div class="uk-width-expand uk-padding uk-padding-remove-horizontal">
<search-tab [fetch]="fetch" [resultType]="resultType" [params]="params" <search-tab [fetch]="fetch" [resultType]="resultType" [params]="params"
[searchLinkToAdvancedPage]="searchLinkToAdvancedPage" [properties]="properties" [searchLinkToAdvancedPage]="searchLinkToAdvancedPage" [properties]="properties">
[showImpactFactors]="showImpactFactors">
</search-tab> </search-tab>
</div> </div>
</div> </div>
@ -661,8 +660,7 @@
resultType: 'publication', fetch: fetchPublications, resultType: 'publication', fetch: fetchPublications,
searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults, searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults,
params: getParamsForSearchLink('publications'), params: getParamsForSearchLink('publications'),
type: 'publication', typeName: 'publication', type: 'publication', typeName: 'publication'}">
showImpactFactors:(community.communityId == 'elixir-gr' || community.communityId == 'inspired-ris' )}">
</ng-container> </ng-container>
</div> </div>
<div *ngIf="activeTab == 'dataset' && fetchDatasets.searchUtils.totalResults > 0 && isEntityEnabled('dataset')"> <div *ngIf="activeTab == 'dataset' && fetchDatasets.searchUtils.totalResults > 0 && isEntityEnabled('dataset')">
@ -670,8 +668,7 @@
resultType: 'dataset', fetch: fetchDatasets, resultType: 'dataset', fetch: fetchDatasets,
searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults, searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults,
params: getParamsForSearchLink('datasets'), params: getParamsForSearchLink('datasets'),
type: 'dataset', typeName: 'research data', type: 'dataset', typeName: 'research data'}">
showImpactFactors:(community.communityId == 'elixir-gr' || community.communityId == 'inspired-ris')}">
</ng-container> </ng-container>
</div> </div>
<div *ngIf="activeTab == 'software' && fetchSoftware.searchUtils.totalResults > 0 && isEntityEnabled('software')"> <div *ngIf="activeTab == 'software' && fetchSoftware.searchUtils.totalResults > 0 && isEntityEnabled('software')">
@ -679,8 +676,7 @@
resultType: 'software', fetch: fetchSoftware, resultType: 'software', fetch: fetchSoftware,
searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults, searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults,
params: getParamsForSearchLink('software'), params: getParamsForSearchLink('software'),
type: 'software', typeName: 'software', type: 'software', typeName: 'software'}">
showImpactFactors:(community.communityId == 'elixir-gr' || community.communityId == 'inspired-ris')}">
</ng-container> </ng-container>
</div> </div>
<div *ngIf="activeTab == 'orp' && fetchOrps.searchUtils.totalResults > 0 && isEntityEnabled('orp')"> <div *ngIf="activeTab == 'orp' && fetchOrps.searchUtils.totalResults > 0 && isEntityEnabled('orp')">
@ -688,8 +684,7 @@
resultType: 'other', fetch: fetchOrps, resultType: 'other', fetch: fetchOrps,
searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults, searchLinkToAdvancedPage: properties.searchLinkToAdvancedResults,
params: getParamsForSearchLink('other'), params: getParamsForSearchLink('other'),
type: 'orp', typeName: 'other products', type: 'orp', typeName: 'other products'}">
showImpactFactors:(community.communityId == 'elixir-gr' || community.communityId == 'inspired-ris')}">
</ng-container> </ng-container>
</div> </div>
<div *ngIf="activeTab == 'twitter' && properties.environment == 'development' && communityInfo.twitterAccount"> <div *ngIf="activeTab == 'twitter' && properties.environment == 'development' && communityInfo.twitterAccount">
@ -726,7 +721,7 @@
<div class="uk-width-expand uk-padding uk-padding-remove-horizontal"> <div class="uk-width-expand uk-padding uk-padding-remove-horizontal">
<search-tab [fetch]="fetchFeaturedDatasets" [resultType]="'dataset'" <search-tab [fetch]="fetchFeaturedDatasets" [resultType]="'dataset'"
[properties]="properties" customTitle="Featured Datasets" [currentPage]="page" [properties]="properties" customTitle="Featured Datasets" [currentPage]="page"
[showImpactFactors]="false" [showEnermaps]="true"> [showEnermaps]="true">
<div class="uk-margin-top uk-margin-medium-bottom uk-text-meta"> <div class="uk-margin-top uk-margin-medium-bottom uk-text-meta">
<div>Here are listed some of the most important energy datasets as selected by energy experts.</div> <div>Here are listed some of the most important energy datasets as selected by energy experts.</div>
<div> <div>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 39ddba0eba6ac377012d9324cf0e9a3b20324579 Subproject commit 05ca7c7eea11967ec5b54c5bd0776dbb8aa4637e