diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts index 916b55b2..d18b7688 100644 --- a/landingPages/landing-utils/availableOn.component.ts +++ b/landingPages/landing-utils/availableOn.component.ts @@ -1,53 +1,60 @@ import {Component, ElementRef, EventEmitter, Input, Output, ViewChild} from '@angular/core'; import {HostedByCollectedFrom} from "../../utils/result-preview/result-preview"; import {properties} from "../../../../environments/environment"; +import {StringUtils} from '../../utils/string-utils.class'; declare var UIkit; @Component({ selector: 'availableOn', template: ` - - - - - {{availableOn[0].downloadNames.join("; ")}} - - - -
-
- - +
+ + + -
- - - {{instance.downloadNames.join("; ")}} - + {{sliceString(availableOn[0].downloadNames.join("; "), 20)}} + + + + + + +
+
+ + -
- {{instance.types.join(" . ")}} - . - {{instance.years.join(" . ")}} -
-
- License: - - {{instance.license}} - - {{instance.license}} -
-
- Providers: - - {{collectedName}}; - +
+ + + {{instance.downloadNames.join("; ")}} + + +
+ {{instance.types.join(" . ")}} + . + {{instance.years.join(" . ")}} +
+
+ License: + + {{instance.license}} + + {{instance.license}} +
+
+ Providers: + + {{collectedName}}; + +
@@ -179,4 +186,8 @@ export class AvailableOnComponent { get isOpen() { return (typeof document !== 'undefined') && this.dropElement && UIkit.drop(this.dropElement.nativeElement).isActive(); } + + public sliceString(str: string, size: number) { + return StringUtils.sliceString(str, size) + } } diff --git a/landingPages/landing-utils/fos.component.ts b/landingPages/landing-utils/fos.component.ts index c1ffc00a..7bdbc318 100644 --- a/landingPages/landing-utils/fos.component.ts +++ b/landingPages/landing-utils/fos.component.ts @@ -12,11 +12,11 @@ import {StringUtils} from "../../utils/string-utils.class"; {{title}} - {{title}} + {{title}} - View all & feedback + View all & suggest Feedback diff --git a/landingPages/landing-utils/fundedBy.component.ts b/landingPages/landing-utils/fundedBy.component.ts index 634998e1..2d82a151 100644 --- a/landingPages/landing-utils/fundedBy.component.ts +++ b/landingPages/landing-utils/fundedBy.component.ts @@ -11,7 +11,7 @@ import {HelperFunctions} from '../../utils/HelperFunctions.class'; {{title}} - {{title}} + {{title}} View less View all diff --git a/landingPages/landing-utils/relatedTo.component.ts b/landingPages/landing-utils/relatedTo.component.ts index b9c64222..61929ab4 100644 --- a/landingPages/landing-utils/relatedTo.component.ts +++ b/landingPages/landing-utils/relatedTo.component.ts @@ -18,7 +18,7 @@ import {OpenaireEntities} from "../../utils/properties/searchFields"; {{title}} - {{title}} + {{title}} View less View all diff --git a/landingPages/landing-utils/sdg.component.ts b/landingPages/landing-utils/sdg.component.ts index c8ba6336..01ff2d60 100644 --- a/landingPages/landing-utils/sdg.component.ts +++ b/landingPages/landing-utils/sdg.component.ts @@ -13,11 +13,11 @@ import {StringUtils} from "../../utils/string-utils.class"; {{title}} - {{title}} + {{title}} - View all & feedback + View all & suggest Feedback
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index cf180b37..e91edbdf 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -108,9 +108,9 @@
- + - @@ -118,7 +118,7 @@ - + Cite - - - - +
@@ -294,7 +293,7 @@ customClass="portalTab"> - @@ -453,26 +452,27 @@
- +
-
    + -
      +
        +
      • -
        -
        +
        +
        @@ -485,6 +485,9 @@ + @@ -493,6 +496,9 @@ + @@ -501,6 +507,9 @@ + @@ -509,6 +518,9 @@ + @@ -522,7 +534,7 @@
        -
        +
        Altmetric @@ -554,11 +566,11 @@
        -
        -
        +
        +
        - usage counts + OpenAIRE UsageCounts
        Usage by UsageCounts @@ -595,14 +607,87 @@
        -
      • - 2 + +
      • +
        +
        +
        • + + Citations
        + + Popularity
        + + Influence
        + + Impulse
        + + + + + + + + + + + + + + + + + + + + + + +
        + + + Citations + + {{resultLandingInfo.measure.citations}} +
        + + + Popularity + + {{resultLandingInfo.measure.popularity}} +
        + + + Influence + + {{resultLandingInfo.measure.influence}} +
        + + + Impulse + + {{resultLandingInfo.measure.impulse}} +
        +
        +
        + Chart +
        +
        +
        + Powered by + BIP! + BIP! +
        • +
      • 3
        • -
      • - 4 + +
      • +
        +
        + Stats +
        +
        + Chart +
        +
        +
        + Powered by + OpenAIRE UsageCounts +
@@ -652,40 +737,36 @@ -
-
+
-
- +
-
Citations
-
Popularity
-
Influence
-
Downloads
-
Views
+
+
+
+
+
+
+
+
Citations
+
Popularity
+
Influence
+
Downloads
+
Views
-
{{resultLandingInfo.measure.citations}}
-
{{resultLandingInfo.measure.popularity}}
-
{{resultLandingInfo.measure.influence}}
-
{{resultLandingInfo.measure.downloads}}
-
{{resultLandingInfo.measure.views}}
+
{{resultLandingInfo.measure.citations}}
+
{{resultLandingInfo.measure.popularity}}
+
{{resultLandingInfo.measure.influence}}
+
{{resultLandingInfo.measure.downloads}}
+
{{resultLandingInfo.measure.views}}
-
- +
+ Metrics badge
@@ -721,7 +802,7 @@
+ (viewAllClicked)="viewAll=$event" (noCommunities)="noCommunities = true">
diff --git a/utils/dataTransfer/transferData.module.ts b/utils/dataTransfer/transferData.module.ts index d78dd6d2..a8b6a44d 100644 --- a/utils/dataTransfer/transferData.module.ts +++ b/utils/dataTransfer/transferData.module.ts @@ -4,18 +4,18 @@ import {FormsModule} from '@angular/forms'; import {EGIDataTransferComponent} from "./transferData.component"; import {InputModule} from "../../sharedComponents/input/input.module"; import {AlertModalModule} from "../modal/alertModal.module"; +import {IconsModule} from '../icons/icons.module'; @NgModule({ imports: [ - CommonModule, FormsModule, InputModule, AlertModalModule - + CommonModule, FormsModule, InputModule, AlertModalModule, IconsModule ], declarations: [ EGIDataTransferComponent - ], + ], exports: [ EGIDataTransferComponent - ] + ] }) export class EGIDataTransferModule { } diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts index 0c020ffa..c8786e9a 100644 --- a/utils/icons/icons.ts +++ b/utils/icons/icons.ts @@ -127,4 +127,19 @@ export const versions = { name: 'versions', data: ' ' } + +export const rocket = { + name: 'rocket', + data: '' +} + +export const fire = { + name: 'fire', + data: '' +} + +export const landmark = { + name: 'landmark', + data: '' +} /** Add new icon under this line to be sure that it will be added on preview */