From f3866f424a90ff7aa760e8d481ecc5f1a4a99432 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 5 Oct 2017 11:01:10 +0000 Subject: [PATCH] Adjust results of search pages to expand when there is no csv or table-view or list-view on the right side or filters on the left side git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@49249 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../advancedSearchPage.component.html | 42 ++++++---- .../searchUtils/searchPage.component.html | 68 ++++++++------- .../searchPageTableView.component.html | 82 ++++++++++--------- .../searchUtils/searchPaging.component.ts | 2 +- portal-2/src/assets/discover-custom.css | 6 +- 5 files changed, 111 insertions(+), 89 deletions(-) diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html index e4daf59f..a1fbb90a 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.html @@ -20,29 +20,37 @@
-
- -
-
- -
- - + +
+
+ +
+ + + +
+ + +
+
+ +
+ + +
-
+
- +
- -
-
- +
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.html b/portal-2/src/app/searchPages/searchUtils/searchPage.component.html index c7b02609..b1939bbf 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 @@
-
+
@@ -56,46 +56,51 @@
- - -
-
- - - - - - - - - -
-
- -
- -
-
+
+
+ -
+
+
+ +
- - +
+ + + + + + + +
+ +
+ + +
+ +
+ +
+ + +
- -
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html index 43f123fc..266c2136 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html +++ b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.html @@ -34,7 +34,7 @@ -
+
@@ -48,37 +48,36 @@
- -
- - {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} - - - - -
-
-

- - - - - - -

- - -
- -
-
+
+
-
+
+
+
+ + {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} + + + + +
+
+ +
+

+ + + + + +

+
+
@@ -160,10 +159,24 @@ -->
-
-
-

+

+
+ + {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} + + + + +
+
+ + + +
+ +
-
-
- - {{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 4841af0a..5044baa3 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts @@ -5,7 +5,7 @@ import {ErrorCodes} from '../../utils/properties/openaireProperties'; @Component({ selector: 'search-paging', template: ` -
+
{{searchUtils.totalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages(searchUtils.totalResults))}}
diff --git a/portal-2/src/assets/discover-custom.css b/portal-2/src/assets/discover-custom.css index 609762d3..22cff062 100644 --- a/portal-2/src/assets/discover-custom.css +++ b/portal-2/src/assets/discover-custom.css @@ -89,6 +89,10 @@ h2 .custom-external { .searchPaging { min-height: 46px; } +.helper-left-right { + margin-top: 75px; + max-width: 20%; +} @media (min-width: 960px) { .float-children-right-at-medium > * { @@ -499,6 +503,6 @@ h2, .uk-h2{ .tm-toolbar .uk-subnav-line li:hover {display: block;} // remove the others -.helper-grid > * { +.helper-grid>*{ padding-left: 0px !important; }