From 8101d3ef2af435e68d4263892b2a042e4545e9d7 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Mon, 22 Jul 2019 14:15:23 +0000 Subject: [PATCH] [Library|Trunk] Layout Changes according to the new theme (containers margins, header fonts size) Search: Update search filters layout: don't crop the text with css, but count the characters LayoutService: create a mock method git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56677 d315682c-612b-4755-9ff5-7f18f6832af3 --- deposit/depositFirstPage.component.ts | 10 +-- .../searchDataprovidersToDeposit.component.ts | 2 +- .../dataProvider/dataProvider.component.html | 4 +- landingPages/dataset/dataset.component.html | 5 +- .../htmlProjectReport.component.ts | 6 +- .../organization/organization.component.html | 4 +- landingPages/orp/orp.component.html | 4 +- landingPages/project/project.component.html | 4 +- .../publication/publication.component.html | 4 +- landingPages/software/software.component.html | 4 +- .../advancedSearchForm.component.html | 5 +- .../browseStatistic.component.html | 6 +- .../searchUtils/browseStatistic.component.ts | 10 ++- .../searchUtils/searchFilter.component.html | 73 ++++++------------- .../searchUtils/searchFilter.component.ts | 25 ++++++- .../searchUtils/searchPage.component.html | 4 +- services/layout.service.ts | 10 ++- utils/gif-slider/gif-slider.component.ts | 2 +- 18 files changed, 96 insertions(+), 86 deletions(-) diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts index f2221a6b..5d839529 100644 --- a/deposit/depositFirstPage.component.ts +++ b/deposit/depositFirstPage.component.ts @@ -8,7 +8,7 @@ import {HelperService} from "../utils/helper/helper.service"; @Component({ selector: 'deposit-first-page', template: ` -
+
@@ -59,9 +59,9 @@ import {HelperService} from "../utils/helper/helper.service";
-
-
OR
-
+ +
OR
+
@@ -78,7 +78,7 @@ import {HelperService} from "../utils/helper/helper.service";
-
+
diff --git a/deposit/searchDataprovidersToDeposit.component.ts b/deposit/searchDataprovidersToDeposit.component.ts index 7c19f55f..37eda090 100644 --- a/deposit/searchDataprovidersToDeposit.component.ts +++ b/deposit/searchDataprovidersToDeposit.component.ts @@ -16,7 +16,7 @@ import {PiwikService} from "../utils/piwik/piwik.service"; selector: 'search-dataproviders', template: ` -
+
diff --git a/searchPages/searchUtils/browseStatistic.component.ts b/searchPages/searchUtils/browseStatistic.component.ts index 6d9f0b35..26e63767 100644 --- a/searchPages/searchUtils/browseStatistic.component.ts +++ b/searchPages/searchUtils/browseStatistic.component.ts @@ -39,8 +39,14 @@ export class BrowseStatisticComponent { return '"'+str+'"'; } - private _formatName(value){ - return value.name+" ";//(((value.name+" ("+value.number+")").length >this._maxCharacters)?(value.name.substring(0,(this._maxCharacters - (" ("+value.number+")").length - ('...').length))+"..."):value.name) + public _formatName(value){ + let maxLineLength = 29; + //3 space before number + parenthesis + if(value.name.length+value.number.toLocaleString().length +3> maxLineLength){ + return value.name.substr(0, (maxLineLength - 3 -3 - value.number.toLocaleString().length))+'...'; + } + + return value.name; } filterKeywords(value){ if(this.keyword.length > 0){ diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index 58571805..a578b6ec 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -6,43 +6,31 @@