From 6fe9bad457a78906cda574ba8e77e1e1c4c047a1 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Wed, 3 Oct 2018 14:12:42 +0000 Subject: [PATCH] submit facelift css changes part 2 git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53379 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../claimContextSearchForm.component.ts | 2 +- .../claimResultSearchForm.component.html | 30 ++--- claims/claim-utils/startOver.component.ts | 2 +- .../directLinking.component.html | 2 +- .../linking/bulkClaim/bulkClaim.component.ts | 2 +- .../insertClaim/insertClaim.component.ts | 2 +- .../selected/selectedResults.component.ts | 2 +- .../datasets/depositBySubject.component.ts | 4 +- .../depositBySubjectResult.component.html | 14 ++- deposit/deposit.component.html | 6 +- deposit/depositResult.component.ts | 4 +- .../dataProvider/dataProvider.component.html | 2 +- landingPages/dataset/dataset.component.html | 8 +- .../htmlProjectReport.component.ts | 2 +- .../landing-utils/addThis.component.ts | 23 +++- .../landing-utils/showTitle.component.ts | 2 +- .../organization/organization.component.html | 2 +- landingPages/orp/orp.component.html | 67 +++++++--- landingPages/project/project.component.html | 2 +- .../publication/publication.component.html | 2 +- landingPages/software/software.component.html | 8 +- searchPages/find/search.component.ts | 2 +- .../advancedSearchPage.component.html | 6 +- .../searchUtils/browseEntities.component.ts | 2 +- .../searchUtils/searchFilter.component.html | 4 +- .../searchUtils/searchPage.component.html | 56 ++++++--- .../searchPageTableView.component.html | 117 ++++++++++++++++-- .../searchPageTableView.component.ts | 13 +- .../searchUtils/searchPaging.component.ts | 4 +- .../searchUtils/searchResult.component.html | 6 +- .../searchUtils/tabResult.component.html | 4 +- sharedComponents/navigationBar.component.html | 57 +++------ utils/errorMessages.component.ts | 2 +- 33 files changed, 302 insertions(+), 159 deletions(-) diff --git a/claims/claim-utils/claimContextSearchForm.component.ts b/claims/claim-utils/claimContextSearchForm.component.ts index 8eea2993..780e1632 100644 --- a/claims/claim-utils/claimContextSearchForm.component.ts +++ b/claims/claim-utils/claimContextSearchForm.component.ts @@ -77,7 +77,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
or
browse through community categories: - +
diff --git a/claims/claim-utils/claimResultSearchForm.component.html b/claims/claim-utils/claimResultSearchForm.component.html index 6a5e9cac..328e3320 100644 --- a/claims/claim-utils/claimResultSearchForm.component.html +++ b/claims/claim-utils/claimResultSearchForm.component.html @@ -31,7 +31,7 @@ - +
@@ -40,18 +40,18 @@
- + @@ -68,7 +68,7 @@
- + @@ -84,7 +84,7 @@
- +
No results found
@@ -118,7 +118,7 @@
- + @@ -134,7 +134,7 @@
- + @@ -150,7 +150,7 @@
- + @@ -166,7 +166,7 @@
- + diff --git a/claims/claim-utils/startOver.component.ts b/claims/claim-utils/startOver.component.ts index 13a06ce4..d48f564c 100644 --- a/claims/claim-utils/startOver.component.ts +++ b/claims/claim-utils/startOver.component.ts @@ -6,7 +6,7 @@ import {AlertModal} from '../../utils/modal/alert'; @Component({ selector: 'start-over', template: ` - +
-
+
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index 23eea1b3..41068e79 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -5,7 +5,7 @@
- +
diff --git a/landingPages/publication/publication.component.html b/landingPages/publication/publication.component.html index 2046afe7..43ba7860 100644 --- a/landingPages/publication/publication.component.html +++ b/landingPages/publication/publication.component.html @@ -5,7 +5,7 @@
- +
diff --git a/landingPages/software/software.component.html b/landingPages/software/software.component.html index dba6f9ef..a6f5efb8 100644 --- a/landingPages/software/software.component.html +++ b/landingPages/software/software.component.html @@ -6,7 +6,7 @@ - +
@@ -238,19 +238,19 @@
- +
@@ -64,12 +64,12 @@
-
+
- +
diff --git a/searchPages/searchUtils/browseEntities.component.ts b/searchPages/searchUtils/browseEntities.component.ts index 55854e6c..069714e8 100644 --- a/searchPages/searchUtils/browseEntities.component.ts +++ b/searchPages/searchUtils/browseEntities.component.ts @@ -15,7 +15,7 @@ import{EnvProperties} from '../../utils/properties/env-properties'; selector: 'browse-entities', template: `
- +
diff --git a/searchPages/searchUtils/searchPage.component.html b/searchPages/searchUtils/searchPage.component.html index b63ebc0a..9e79c5bc 100644 --- a/searchPages/searchUtils/searchPage.component.html +++ b/searchPages/searchUtils/searchPage.component.html @@ -1,5 +1,5 @@
-
+
@@ -63,10 +63,21 @@
- - Clear All - - Try new Query +
+ + Clear All + + + Try new Query + + + + + + + + +
Filter By:
@@ -79,14 +90,14 @@
-
+
Keywords: - @@ -107,16 +118,26 @@
- - Clear All - - Try new Query +
+ + Clear All + + Try new Query + + + + + + + + +
- +
@@ -125,7 +146,7 @@
-
+
- -
+
-
+
diff --git a/searchPages/searchUtils/searchPageTableView.component.html b/searchPages/searchUtils/searchPageTableView.component.html index 4a819b60..f98068b2 100644 --- a/searchPages/searchUtils/searchPageTableView.component.html +++ b/searchPages/searchUtils/searchPageTableView.component.html @@ -1,7 +1,27 @@ -
+
+
+
+
+
+ + +
+
+ +
+ + +
+
+
+
+
+ +
-
+ + +
@@ -39,6 +60,42 @@
+
+ Keywords: + + + + +
+ {{filter.title}}: + + + + + , + + +
+
+ + Clear All + +
+

+ + + + + +

+
+
+ +
Filter By:
@@ -47,19 +104,55 @@
-
-
+
+
+
+ Keywords: + + + + +
+ {{filter.title}}: + + + + + , + + +
+
+ + Clear All + +
+

+ + + + + +

+
+
+ +
- +
- + {{searchUtils.totalResults | number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages()) | number}} @@ -68,7 +161,7 @@
-
+
@@ -170,7 +263,7 @@
- + {{searchUtils.totalResults | number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages()) | number}} @@ -183,7 +276,7 @@
-
+
diff --git a/searchPages/searchUtils/searchPageTableView.component.ts b/searchPages/searchUtils/searchPageTableView.component.ts index b3524ff7..4956c15a 100644 --- a/searchPages/searchUtils/searchPageTableView.component.ts +++ b/searchPages/searchUtils/searchPageTableView.component.ts @@ -61,7 +61,6 @@ export class SearchPageTableViewComponent implements OnInit, AfterViewInit { @ViewChild (ModalLoading) loading : ModalLoading ; private searchFieldsHelper:SearchFields = new SearchFields(); private queryParameters: Map = new Map(); - public countFilters= 0; public parameterNames:string[] =[]; public parameterValues:string[] =[]; @@ -526,4 +525,16 @@ Transform initial - not filtered results to get the filtered number public encode(param: string): string { return StringUtils.URIEncode(param); } + public countFilters():number{ + var filters=0; + for (let filter of this.filters){ + if(filter.countSelectedValues > 0){ + filters+=filter.countSelectedValues; + } + } + if(this.searchUtils.keyword.length > 0 ){ + filters++; + } + return filters; + } } diff --git a/searchPages/searchUtils/searchPaging.component.ts b/searchPages/searchUtils/searchPaging.component.ts index c6cb49c9..05fe8624 100644 --- a/searchPages/searchUtils/searchPaging.component.ts +++ b/searchPages/searchUtils/searchPaging.component.ts @@ -6,10 +6,10 @@ import {ErrorCodes} from '../../utils/properties/errorCodes'; selector: 'search-paging', template: `
-
+
{{searchUtils.totalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(searchUtils.totalResults)|number)}}
-
+
{{oldTotalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(oldTotalResults)|number)}}
diff --git a/searchPages/searchUtils/searchResult.component.html b/searchPages/searchUtils/searchResult.component.html index 460b55fd..4192d631 100644 --- a/searchPages/searchUtils/searchResult.component.html +++ b/searchPages/searchUtils/searchResult.component.html @@ -3,17 +3,17 @@ -