diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 4760383e..7a54c6f4 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -67,7 +67,7 @@
-
+
@@ -79,10 +79,10 @@ - - + + + +
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 7de228f8..c6e47f0c 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -368,9 +368,9 @@ export class NewSearchPageComponent { if(yearFrom && yearTo) { filter.selectedFromAndToValues = yearFrom + "-" + yearTo; } else if(yearFrom) { - filter.selectedFromAndToValues = "from " + yearFrom; + filter.selectedFromAndToValues = "From " + yearFrom; } else if(yearTo) { - filter.selectedFromAndToValues = "until " + yearTo; + filter.selectedFromAndToValues = "Until " + yearTo; } if(!yearFrom && !yearTo) { diff --git a/searchPages/searchUtils/newSearchPage.module.ts b/searchPages/searchUtils/newSearchPage.module.ts index 1f5817c1..40b6d1f2 100644 --- a/searchPages/searchUtils/newSearchPage.module.ts +++ b/searchPages/searchUtils/newSearchPage.module.ts @@ -6,8 +6,8 @@ import { RouterModule } from '@angular/router'; import{NewSearchPageComponent} from './newSearchPage.component'; import{SearchFormModule} from './searchForm.module'; import {SearchFilterModule} from './searchFilter.module'; -import {RangeFilterModule} from 'app/openaireLibrary/utils/rangeFilter/rangeFilter.module'; -import{LoadingModalModule} from '../../utils/modal/loadingModal.module'; +import {RangeFilterModule} from "../../utils/rangeFilter/rangeFilter.module"; +import {LoadingModalModule} from '../../utils/modal/loadingModal.module'; import {ReportsServiceModule} from '../../services/reportsService.module'; import{SearchPagingModule} from './searchPaging.module'; import {SearchResultsPerPageModule} from './searchResultsPerPage.module'; diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index 956eff5a..04b8e57e 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -36,17 +36,18 @@
- + + {{' ('+(value.number|number)+')'}} + +
@@ -106,17 +107,17 @@
- + +
diff --git a/searchPages/searchUtils/searchPaging.component.ts b/searchPages/searchUtils/searchPaging.component.ts index 67c75d6f..c25e8cc7 100644 --- a/searchPages/searchUtils/searchPaging.component.ts +++ b/searchPages/searchUtils/searchPaging.component.ts @@ -5,16 +5,19 @@ 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}} diff --git a/utils/rangeFilter/rangeFilter.component.html b/utils/rangeFilter/rangeFilter.component.html index 0e3f1607..abba1401 100644 --- a/utils/rangeFilter/rangeFilter.component.html +++ b/utils/rangeFilter/rangeFilter.component.html @@ -26,6 +26,18 @@ +
+
+ Year must be between {{yearMin}} and {{yearMax}}. +
+
+
+ Starting year must be greater than or equal to ending year. +
+
@@ -44,18 +56,6 @@
- -
-
- Year must be between {{yearMin}} and {{yearMax}}. -
-
-
- "From" year must be equal or greater than "To" year. -