MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Trunk | Library]: availableOn.component.ts & result-preview.component.html: Improve view for hostedby elements (Download from section in landing page & result preview - e.g. in versions). 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59039 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2020-07-02 09:54:36 +00:00
parent 71c1206619
commit 09fa6aa94b
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
landingPages/landing-utils/availableOn.component.ts
View File

@ -15,8 +15,8 @@ import {HostedByCollectedFrom} from "../../utils/result-preview/result-preview";
</span> </span>
<div class="uk-width-expand uk-padding-small uk-padding-remove-left uk-padding-remove-vertical"> <div class="uk-width-expand uk-padding-small uk-padding-remove-left uk-padding-remove-vertical">
<span *ngIf="available.downloadUrl.length > 1" class="title"> <span *ngIf="available.downloadUrl.length > 1" class="title">
<span class="uk-text-bold">{{available.downloadName}}</span> <span>{{available.downloadName}}</span>
<a *ngFor="let url of available.downloadUrl; let i=index;"> <a *ngFor="let url of available.downloadUrl; let i=index;"
[href]="url" target="_blank"> [href]="url" target="_blank">
[{{(i + 1) | number}}] [{{(i + 1) | number}}]
</a> </a>
@ -26,6 +26,9 @@ import {HostedByCollectedFrom} from "../../utils/result-preview/result-preview";
{{available.downloadName}} {{available.downloadName}}
<span class="custom-external custom-icon space"></span> <span class="custom-external custom-icon space"></span>
</a> </a>
<span *ngIf="!available.downloadUrl || available.downloadUrl.length === 0" class="title">
{{available.downloadName}}
</span>
<div *ngIf="removeUnknown(available.type) || available.year"> <div *ngIf="removeUnknown(available.type) || available.year">
<span *ngIf="removeUnknown(available.type)" class="uk-text-capitalize">{{available.type}}</span> <span *ngIf="removeUnknown(available.type)" class="uk-text-capitalize">{{available.type}}</span>
<span *ngIf="removeUnknown(available.type) && available.year"> . </span> <span *ngIf="removeUnknown(available.type) && available.year"> . </span>

52
utils/result-preview/result-preview.component.html
View File

@ -215,31 +215,41 @@
<div *ngIf="result.hostedBy_collectedFrom && result.hostedBy_collectedFrom.length > 0" <div *ngIf="result.hostedBy_collectedFrom && result.hostedBy_collectedFrom.length > 0"
class="uk-margin-small-bottom download-from"> class="uk-margin-small-bottom download-from">
<div *ngFor="let from of result.hostedBy_collectedFrom" <div *ngFor="let from of result.hostedBy_collectedFrom"
[title]="from.bestAccessMode ? from.bestAccessMode : 'Not available'"> [title]="from.bestAccessMode ? from.bestAccessMode : 'Not available'"
class="uk-flex">
<span class="uk-margin-small-right"> <span class="uk-margin-small-right">
<img [src]="from.icon"> <img [src]="from.icon">
</span> </span>
<span class="uk-margin-right uk-display-inline-block"> <span class="uk-width-expand">
<span class="uk-text-muted">Download from: </span> <span class="uk-margin-right uk-display-inline-block">
<a *ngIf="from.downloadUrl && from.downloadUrl.length === 1" <span class="uk-text-muted">Download from: </span>
[href]="from.downloadUrl[0]" target="_blank" class="title"> <span *ngIf="from.downloadUrl.length > 1" class="title">
{{from.downloadName}} <span>{{from.downloadName}}</span>
<span class="custom-external space"></span> <a *ngFor="let url of from.downloadUrl; let i=index;"
</a> [href]="url" target="_blank">
<span *ngIf="!from.downloadUrl || from.downloadUrl.length === 0" class="title"> [{{(i + 1) | number}}]
{{from.downloadName}} </a>
</span>
<a *ngIf="from.downloadUrl && from.downloadUrl.length === 1"
[href]="from.downloadUrl[0]" target="_blank" class="title">
{{from.downloadName}}
<span class="custom-external space"></span>
</a>
<span *ngIf="!from.downloadUrl || from.downloadUrl.length === 0" class="title">
{{from.downloadName}}
</span>
</span> </span>
</span> <span class="provider uk-display-inline-block">
<span class="provider uk-display-inline-block"> <span class="uk-text-muted">Provider: </span>
<span class="uk-text-muted">Provider: </span> <!-- target="_blank"-->
<!-- target="_blank"--> <a *ngIf="from.collectedId" routerLink="/search/dataprovider" [queryParams]="{datasourceId: from.collectedId}"
<a *ngIf="from.collectedId" routerLink="/search/dataprovider" [queryParams]="{datasourceId: from.collectedId}" [href]="from.downloadUrl[0]" (click)="onClick();">
[href]="from.downloadUrl[0]" (click)="onClick();"> {{from.collectedName}}
{{from.collectedName}} <!-- <span class="custom-external space"></span>-->
<!-- <span class="custom-external space"></span>--> </a>
</a> <span *ngIf="!from.collectedId">
<span *ngIf="!from.collectedId"> {{from.collectedName}}
{{from.collectedName}} </span>
</span> </span>
</span> </span>
</div> </div>