diff --git a/claims/claim-utils/claimResultSearchForm.component.html b/claims/claim-utils/claimResultSearchForm.component.html index eabb65c5..7880cb75 100644 --- a/claims/claim-utils/claimResultSearchForm.component.html +++ b/claims/claim-utils/claimResultSearchForm.component.html @@ -113,11 +113,13 @@
-
- - {{type.title}}
- ({{type.count|number}}) +
+ + {{_formatName(type.title,type.count)}} + {{' (' + (type.count|number) + ')'}} +
+
@@ -131,12 +133,16 @@ - + @@ -259,7 +265,8 @@
-
diff --git a/claims/claim-utils/claimResultSearchForm.component.ts b/claims/claim-utils/claimResultSearchForm.component.ts index 737acfb2..a02e8148 100644 --- a/claims/claim-utils/claimResultSearchForm.component.ts +++ b/claims/claim-utils/claimResultSearchForm.component.ts @@ -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; + } } diff --git a/claims/claim-utils/displayClaims/displayClaims.component.html b/claims/claim-utils/displayClaims/displayClaims.component.html index 5e64770a..696e2955 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/claims/claim-utils/displayClaims/displayClaims.component.html @@ -4,7 +4,7 @@
-
+
diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts index 5d839529..ad705ef9 100644 --- a/deposit/depositFirstPage.component.ts +++ b/deposit/depositFirstPage.component.ts @@ -11,11 +11,11 @@ import {HelperService} from "../utils/helper/helper.service";
-
+
Deposit your research
-
+

How to deposit your research...

@@ -65,7 +65,7 @@ import {HelperService} from "../utils/helper/helper.service";
- Browse all repositories @@ -88,11 +88,11 @@ import {HelperService} from "../utils/helper/helper.service"; Deposit your research immediately
+ class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom"> Related zenodo communities + class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom"> Deposit in Zenodo
@@ -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; diff --git a/deposit/searchDataprovidersToDeposit.component.ts b/deposit/searchDataprovidersToDeposit.component.ts index 37eda090..97c813ec 100644 --- a/deposit/searchDataprovidersToDeposit.component.ts +++ b/deposit/searchDataprovidersToDeposit.component.ts @@ -20,7 +20,7 @@ import {PiwikService} from "../utils/piwik/piwik.service";