diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index 7838f18e..f06e4f88 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -112,7 +112,7 @@
-
+
-
+
-
+
- + + + + + + + + + + + + + + + Filters ({{(selectedRangeFilters+selectedFilters)}}) + + + + + + + + -
+
@@ -146,8 +168,8 @@
-
-
+
+
@@ -158,12 +180,12 @@ - - -
-
+ + + + +
+
Filters
Clear All @@ -238,16 +260,25 @@
- - + class="uk-grid uk-margin-small-top uk-margin-bottom"> +
+ + +
+
+ + +
-
+
-
- - -
+ + + + +
diff --git a/searchPages/searchUtils/searchDownload.component.ts b/searchPages/searchUtils/searchDownload.component.ts index 37402f30..5ce43824 100644 --- a/searchPages/searchUtils/searchDownload.component.ts +++ b/searchPages/searchUtils/searchDownload.component.ts @@ -14,10 +14,18 @@ import 'rxjs'; template: ` - + + 'results'" class="uk-link-text" *ngIf="totalResults > 0"> + + - (CSV) + + + + + + + + Download Results diff --git a/searchPages/searchUtils/searchPaging.component.ts b/searchPages/searchUtils/searchPaging.component.ts index 17283340..67c75d6f 100644 --- a/searchPages/searchUtils/searchPaging.component.ts +++ b/searchPages/searchUtils/searchPaging.component.ts @@ -5,24 +5,34 @@ import {ErrorCodes} from '../../utils/properties/errorCodes'; @Component({ 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)}} -
- -
- -
-
- +
+
+
+ {{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/searchResultsPerPage.component.ts b/searchPages/searchUtils/searchResultsPerPage.component.ts index ae9a8dca..a93b87ad 100644 --- a/searchPages/searchUtils/searchResultsPerPage.component.ts +++ b/searchPages/searchUtils/searchResultsPerPage.component.ts @@ -3,16 +3,14 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; @Component({ selector: 'search-results-per-page', template: ` - - Results per page: - - + Results per page: + ` }) diff --git a/searchPages/searchUtils/searchSorting.component.ts b/searchPages/searchUtils/searchSorting.component.ts index 5db63420..74efb6a5 100644 --- a/searchPages/searchUtils/searchSorting.component.ts +++ b/searchPages/searchUtils/searchSorting.component.ts @@ -3,21 +3,23 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; @Component({ selector: 'search-sorting', template: ` - - Sort by: - - - + Sort by: + + ` }) diff --git a/utils/pagingFormatter.component.ts b/utils/pagingFormatter.component.ts index e148136f..6190b067 100644 --- a/utils/pagingFormatter.component.ts +++ b/utils/pagingFormatter.component.ts @@ -9,7 +9,8 @@ import {EnvProperties} from './properties/env-properties'; template: ` -
    +