[Library|Trunk]

Linking:
	openaire search filters: change the way the values are cut
	my claims:remove margins 

Deposit:
	theme/customization related issues (margins, titles)
	update routes inside the components



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56736 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-07-23 15:11:53 +00:00
parent 7ec51c1a83
commit a182429003
5 changed files with 38 additions and 20 deletions

View File

@ -113,11 +113,13 @@
<div class="searchFilterBoxValues ">
<div *ngFor="let type of openaireTypeValues" class="uk-animation-fade filterItem">
<span class="filterName"><div title="{{type.title}}">
<input [value]="type.value" [(ngModel)]="openaireResultsType" [name]=type.value
type="radio" (ngModelChange)="openaireTypeChanged(type.value)"/>
{{type.title}}</div></span>
<span *ngIf="type.count!=null">({{type.count|number}})</span>
<div title="{{type.title}}">
<input [value]="type.value" [(ngModel)]="openaireResultsType" [name]=type.value
type="radio" (ngModelChange)="openaireTypeChanged(type.value)"/>
{{_formatName(type.title,type.count)}}
<span *ngIf="type.count!=null">{{' (' + (type.count|number) + ')'}}</span>
</div>
</div>
</div>
</div>
@ -131,12 +133,16 @@
<input class=" uk-input uk-width-small" [(ngModel)]="openaireYear" name="keyword"
placeholder="Year (e.g. 2010)"/>
<button type="submit" (click)="yearChanged()" style="cursor: pointer;" class="uk-icon"><svg width="20" height="20"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
icon="chevron-right"
ratio="1"><polyline
fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg></button>
<button type="submit" (click)="yearChanged()" style="cursor: pointer;" class="uk-icon">
<svg width="20" height="20"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
icon="chevron-right"
ratio="1">
<polyline
fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline>
</svg>
</button>
</form>
</div>
@ -259,7 +265,8 @@
</div>
<div class="uk-width-1-2 ">
<paging-no-load class="uk-float-right" [currentPage]="datacitePage" [totalResults]="dataciteResultsNum" [term]="keyword"
<paging-no-load class="uk-float-right" [currentPage]="datacitePage" [totalResults]="dataciteResultsNum"
[term]="keyword"
[size]="size" (pageChange)="datacitePageChange($event)"></paging-no-load>
</div>
</div>

View File

@ -855,4 +855,15 @@ export class ClaimResultSearchFormComponent {
}
return count;
}
public _formatName(value, number){
let maxLineLength = 29;
//1 space after checkbox
//3 space before number + parenthesis
if(number && value.length+number.toLocaleString().length +1 +3> maxLineLength){
return value.substr(0, (maxLineLength- 3 -4 - number.toLocaleString().length))+'...';
}else if(!number && value.length + 1 > maxLineLength){
return value.substr(0, (maxLineLength- 3 -1 ))+'...';
}
return value;
}
}

View File

@ -4,7 +4,7 @@
</div>
<div class="uk-grid helper-grid">
<helper position="left" styleName=" uk-width-1-5 uk-padding-left"></helper>
<div class="uk-width-expand uk-margin-large-top">
<div class="uk-width-expand uk-margin-top">
<form class="">
<div class=" ">

View File

@ -11,11 +11,11 @@ import {HelperService} from "../utils/helper/helper.service";
<div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">
<div class="communityPanelBackground uk-margin-top uk-padding-small">
<div class="uk-align-center uk-container uk-container-large uk-margin-large-top uk-margin-large-bottom">
<div class="uk-text-center font-41">
<div class="uk-text-center uk-h2">
<span class="uk-text-bold">Deposit</span> your research
</div>
<div class="uk-container uk-container-large uk-margin-large-top">
<div class="uk-container uk-container-large uk-margin-medium-top">
<div class="uk-grid-divider" uk-grid>
<div class="uk-width-1-2@m uk-width-1-1@s">
<p class="uk-margin-auto uk-text-large">How to <span class="uk-text-bold">deposit</span> your research...</p>
@ -65,7 +65,7 @@ import {HelperService} from "../utils/helper/helper.service";
</div>
<div>
<a [queryParams]="{}" routerLinkActive="router-link-active" routerLink="/search-deposit"
<a [queryParams]="{}" routerLinkActive="router-link-active" [routerLink]="depositRoute"
type="submit" class="uk-button uk-button-large uk-button-primary uk-padding uk-padding-remove-vertical">
<span><span>Browse all repositories</span><span uk-icon="arrow-right"></span></span>
</a>
@ -88,11 +88,11 @@ import {HelperService} from "../utils/helper/helper.service";
<span class="uk-text-bold">Deposit</span> your research <span class="uk-text-bold">immediately</span>
</div>
<a *ngIf="zenodoInformation.shareInZenodoUrl" href="{{zenodoInformation.shareInZenodoUrl}}" type="submit"
class="uk-button uk-button-primary uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom">
class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom">
<span><span>Related zenodo communities</span><span uk-icon="arrow-right"></span></span>
</a>
<a *ngIf="!zenodoInformation.shareInZenodoUrl" target="_blank" href="{{zenodoInformation.url}}" type="submit"
class="uk-button uk-button-primary uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom">
class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom">
<span><span>Deposit in Zenodo</span><span uk-icon="arrow-right"></span></span>
</a>
</div>
@ -154,7 +154,7 @@ export class DepositFirstPageComponent {
public divContents = null;
public keyword: string;
public depositRoute = "participate/deposit/search";
public depositRoute = "/participate/deposit/search";
public searchPlaceHolder = "Search for repositories by title, country, organization, subject...";
properties:EnvProperties;

View File

@ -20,7 +20,7 @@ import {PiwikService} from "../utils/piwik/piwik.service";
<div class="communityPanelBackground uk-margin-top uk-padding-small">
<div class="uk-container uk-container-large uk-margin-small-top uk-margin-small-bottom">
<ul class="uk-breadcrumb">
<li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="/deposit">Deposit</a></li>
<li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="/participate/deposit/learn-how">Deposit</a></li>
<li><span class="active">Browse repositories</span></li>
</ul>
</div>