From d9e53942cf826ae809ef94fe5944cd794410e994 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Wed, 9 May 2018 13:54:30 +0000 Subject: [PATCH] layout changes in result landing pages (make it clear -use margin & paddings, use FAB for linkinf menu)| layout changes in search results, advanced search form | fix reading from url for creating the list with refine fields git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51984 d315682c-612b-4755-9ff5-7f18f6832af3 --- landingPages/dataset/dataset.component.html | 68 ++++++++++++------- .../citeThis/citeThis.component.ts | 2 +- .../landing-utils/showAuthors.component.ts | 4 +- .../publication/publication.component.html | 50 ++++++++++++-- landingPages/software/software.component.html | 48 +++++++++++-- login/utils/helper.class.ts | 1 + .../advancedSearchForm.component.html | 8 +-- .../searchUtils/searchFilter.component.html | 6 +- .../searchUtils/searchPage.component.ts | 7 +- .../searchUtils/searchPaging.component.ts | 4 +- .../searchUtils/searchResult.component.html | 4 +- 11 files changed, 148 insertions(+), 54 deletions(-) diff --git a/landingPages/dataset/dataset.component.html b/landingPages/dataset/dataset.component.html index 7ec3e7d9..5e6f82c2 100644 --- a/landingPages/dataset/dataset.component.html +++ b/landingPages/dataset/dataset.component.html @@ -9,7 +9,7 @@
-
+
{{datasetInfo.types.join(", ")}} {{datasetInfo.languages.join(", ")}} @@ -185,7 +185,7 @@
-
+
Share - Bookmark @@ -235,7 +235,7 @@ -
  • + -
    • + +
    +
    + + +
    +
    + +
    diff --git a/landingPages/landing-utils/citeThis/citeThis.component.ts b/landingPages/landing-utils/citeThis/citeThis.component.ts index dc9e3074..3aec5f68 100644 --- a/landingPages/landing-utils/citeThis/citeThis.component.ts +++ b/landingPages/landing-utils/citeThis/citeThis.component.ts @@ -15,7 +15,7 @@ declare var Sys:any; -
    +
    diff --git a/landingPages/landing-utils/showAuthors.component.ts b/landingPages/landing-utils/showAuthors.component.ts index 517d9372..1ea03b85 100644 --- a/landingPages/landing-utils/showAuthors.component.ts +++ b/landingPages/landing-utils/showAuthors.component.ts @@ -8,7 +8,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
    View less authors
    - + @@ -16,7 +16,7 @@ import {RouterHelper} from '../../utils/routerHelper.class'; ; ... - + - + + +
    +
    + + +
    +
    + +
    +
    diff --git a/landingPages/software/software.component.html b/landingPages/software/software.component.html index ecb43a5b..4489a1e1 100644 --- a/landingPages/software/software.component.html +++ b/landingPages/software/software.component.html @@ -9,7 +9,7 @@
    -
    +
    {{softwareInfo.types.join(", ")}} {{softwareInfo.languages.join(", ")}} @@ -186,7 +186,7 @@
    -
    +
    Share - Bookmark @@ -237,7 +237,7 @@ -
  • +
    • + +
    +
    + + +
    +
    + +
    +
    diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts index f9daedbf..54f4d8a6 100644 --- a/login/utils/helper.class.ts +++ b/login/utils/helper.class.ts @@ -24,6 +24,7 @@ export class Session{ // localStorage.removeItem("user"); COOKIE.deleteCookie(COOKIE.cookieName_id) COOKIE.deleteCookie(COOKIE.cookieName_u); + COOKIE.deleteCookie("SESSION"); } } public static getUser():User { diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index 6177b49f..b7633619 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -1,5 +1,5 @@ -
    + @@ -38,14 +38,14 @@
    Search for: - + - + - +
    diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index 73827dfc..f6ab4990 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -12,7 +12,7 @@
    {{_formatName(value)}}
    - ({{value.number}}) + ({{value.number|number}}) @@ -22,7 +22,7 @@
    {{_formatName(value)}}
    - ({{value.number}}) + ({{value.number|number}}) @@ -62,7 +62,7 @@
    {{_formatName(value)}}
    - ({{value.number}}) + ({{value.number|number}}) diff --git a/searchPages/searchUtils/searchPage.component.ts b/searchPages/searchUtils/searchPage.component.ts index 43f1770a..50c47605 100644 --- a/searchPages/searchUtils/searchPage.component.ts +++ b/searchPages/searchUtils/searchPage.component.ts @@ -544,9 +544,10 @@ export class SearchPageComponent { private getSelectedParameters():string[] { var selected:string[] = []; var params:string[] = Object.keys(this.queryParameters); - for(var i=0; i < params.length; i++){ - if(this.refineFields.indexOf(params[i]) > -1){ - selected.push(params[i]); + + for(var i=0; i < this.refineFields.length; i++){ + if(this.queryParameters.get(this.refineFields[i])!= undefined ){ + selected.push(this.refineFields[i]); } } return selected; diff --git a/searchPages/searchUtils/searchPaging.component.ts b/searchPages/searchUtils/searchPaging.component.ts index f921255c..91242941 100644 --- a/searchPages/searchUtils/searchPaging.component.ts +++ b/searchPages/searchUtils/searchPaging.component.ts @@ -7,10 +7,10 @@ import {ErrorCodes} from '../../utils/properties/errorCodes'; template: `
    - {{searchUtils.totalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages(searchUtils.totalResults))}} + {{searchUtils.totalResults|number}} {{type}}, page {{searchUtils.page}} of {{(totalPages(searchUtils.totalResults)|number)}}
    - {{oldTotalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages(oldTotalResults))}} + {{oldTotalResults|number}} {{type}}, page {{searchUtils.page}} of {{(totalPages(oldTotalResults)|number)}}
    diff --git a/searchPages/searchUtils/searchResult.component.html b/searchPages/searchUtils/searchResult.component.html index f9666ce2..b4d695b4 100644 --- a/searchPages/searchUtils/searchResult.component.html +++ b/searchPages/searchUtils/searchResult.component.html @@ -28,8 +28,8 @@ Open Access mandate Special Clause 39 -
    - +
    +