diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts b/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts index c01168dd..4c1fcc22 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts @@ -17,7 +17,7 @@ export class DataProviderService { getDataproviderInfo (id: string):any { console.info("getDataProviderInfo in service"); - let url = OpenaireProperties.getSearchAPIURLLast() + 'datasources/' +id +"?formatt=json"; + let url = OpenaireProperties.getSearchAPIURLLast() + 'datasources/' +id +"?format=json"; let key = url; if (this._cache.has(key)) { return Observable.of(this._cache.get(key)).map(res => this.parseDataProviderInfo(res)); diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html index fcae0007..e4daf59f 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html @@ -1,49 +1,54 @@ +
+
+
+
+
+ {{pageTitle}} +
+
+ Simple search + + + + +
+ +
+
+ +
+ -
-
-
-
-
- {{pageTitle}} -
-
- Simple search - - - - -
- -
- - - -
- - - -
- - -
- -
-
- -
- -
-
+
+ +
+ + +
+
+ + +
+ +
+
+ +
+
+ +
+
+
-
-
+
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.html b/portal-2/src/app/searchPages/searchUtils/searchPage.component.html index 55e3188c..c7b02609 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPage.component.html +++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.html @@ -42,7 +42,7 @@
-
+
@@ -60,14 +60,31 @@
+ +
+ + + + + + + + + + +
+
+ +
+
- -
+
+ -
+
@@ -88,13 +105,9 @@ - -
-
-
-
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html index c6c09370..43f123fc 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html +++ b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html @@ -1,168 +1,192 @@ -
-
-
+
+
-
-
-
- -
-
-
- Keywords: {{searchUtils.keyword}} - - - {{filter.title}}: - {{value.name}} - , - - - +
+
+
+ +
+
+
+ Keywords: {{searchUtils.keyword}} + + + {{filter.title}}: + {{value.name}} + , + + + - - Clear All - -
-
-
-
-
- - + + Clear All + +
+
+
+
+
+ + -
-
- -
-
+
- +
+ -
-
- -
Filter By:
- -
-
+
+
+ +
Filter By:
+ +
+
-
-
+
+ +
+ + {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} + + + + +
+
+ +
+

+ + + + + + +

+ + +
+ +
+
-
+
-
-
- - - - - +
+
+
- - {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} - - -
+ - - - - - - + + + + + + + + + + + + + + + + + +
Name - - - - - Type - - - - - Country - - - - - Institution - - - - - Compatibility - - - - - Name + + + + + Type + + + + + Country + + + + + Institution + + + + + Compatibility + + + + +
+ + + + + [no title available] + + + + {{dataprovider.type}} + - + + {{country}}{{(i < ( dataprovider['countries'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['countries'].slice(0,5).length-1 && dataprovider['countries'].length > 5)?"...":""}} + - + + + {{org.name}}{{org.name}}{{(i < ( dataprovider['organizations'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['organizations'].slice(0,5).length-1 && dataprovider['organizations'].length > 5)?"...":""}} + + - + + {{dataprovider.compatibility}} + - +
+
+
+
+

- - - - - - - - - [no title available] - - - - - {{dataprovider.type}} - - - - - {{country}}{{(i < ( dataprovider['countries'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['countries'].slice(0,5).length-1 && dataprovider['countries'].length > 5)?"...":""}} - - - - - - {{org.name}}{{org.name}}{{(i < ( dataprovider['organizations'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['organizations'].slice(0,5).length-1 && dataprovider['organizations'].length > 5)?"...":""}} - - - - - - {{dataprovider.compatibility}} - - - - - - -

-
-
-

+ - + + + +

- - - -

+ +
+
+
+
+ + {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} + + + + +
+
+
-
- -
- - -
-
+ +
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts index a3ca6a6b..4841af0a 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts @@ -12,11 +12,11 @@ import {ErrorCodes} from '../../utils/properties/openaireProperties';
{{oldTotalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages(oldTotalResults))}}
-
- +
+
-
- +
+
` diff --git a/portal-2/src/assets/discover-custom.css b/portal-2/src/assets/discover-custom.css index a0d24eac..609762d3 100644 --- a/portal-2/src/assets/discover-custom.css +++ b/portal-2/src/assets/discover-custom.css @@ -89,6 +89,19 @@ h2 .custom-external { .searchPaging { min-height: 46px; } + +@media (min-width: 960px) { + .float-children-right-at-medium > * { + float: right; + } +} + +@media (max-width: 959px) { + .margin-small-top-at-small { + margin-top: 10px !important; + } +} + .other-results { min-height: 300px; }