From e490cc81fe0aa27336465b1af97d04f93f1ad212 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 16 Jul 2019 16:23:33 +0000 Subject: [PATCH] [Trunk | Library]: add background 'communityPanelBackground' in search Form in simple search pages. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56579 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../searchDataprovidersToDeposit.component.ts | 3 +- .../searchUtils/searchPage.component.html | 50 +++++++++++++------ .../simple/searchDataproviders.component.ts | 3 +- .../simple/searchDatasets.component.ts | 3 +- .../simple/searchOrganizations.component.ts | 3 +- searchPages/simple/searchOrps.component.ts | 3 +- .../simple/searchProjects.component.ts | 3 +- .../simple/searchPublications.component.ts | 6 ++- .../simple/searchSoftware.component.ts | 3 +- 9 files changed, 54 insertions(+), 23 deletions(-) diff --git a/deposit/searchDataprovidersToDeposit.component.ts b/deposit/searchDataprovidersToDeposit.component.ts index 6399e31b..c8911a83 100644 --- a/deposit/searchDataprovidersToDeposit.component.ts +++ b/deposit/searchDataprovidersToDeposit.component.ts @@ -15,7 +15,7 @@ import {ZenodoInformationClass} from "./utils/zenodoInformation.class"; selector: 'search-dataproviders', template: ` -
+
    @@ -35,6 +35,7 @@ import {ZenodoInformationClass} from "./utils/zenodoInformation.class"; [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId + [searchFormClass]="''" [usedBy]="'deposit'" [showMoreFilterValuesInline]=true [filterValuesNum]=4 diff --git a/searchPages/searchUtils/searchPage.component.html b/searchPages/searchUtils/searchPage.component.html index c8ee9311..65ecc7b4 100644 --- a/searchPages/searchUtils/searchPage.component.html +++ b/searchPages/searchUtils/searchPage.component.html @@ -1,18 +1,40 @@ -
    -
    -
    -
    - - - Advanced search - - + + + + + + + + + -
    -
    - -
    -
    + + + + + + + + + +
    +
    +
    + +
    + +
    +
    diff --git a/searchPages/simple/searchDataproviders.component.ts b/searchPages/simple/searchDataproviders.component.ts index b129309b..6d49244e 100644 --- a/searchPages/simple/searchDataproviders.component.ts +++ b/searchPages/simple/searchDataproviders.component.ts @@ -25,7 +25,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId - searchFormClass="datasourcesSearchForm" + [searchFormClass]="customFilter && customFilter.queryFieldName == 'communityId' ? + 'communityPanelBackground' : 'datasourcesSearchForm'" [mapUrl]="mapUrl"> diff --git a/searchPages/simple/searchDatasets.component.ts b/searchPages/simple/searchDatasets.component.ts index 80df2867..f7291ed4 100644 --- a/searchPages/simple/searchDatasets.component.ts +++ b/searchPages/simple/searchDatasets.component.ts @@ -26,7 +26,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [disableForms]="disableForms" [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" - searchFormClass="datasetsSearchForm" + [searchFormClass]="customFilter && customFilter.queryFieldName == 'communityId' ? + 'communityPanelBackground' : 'datasetsSearchForm'" [(openaireLink)]=openaireLink [(advancedSearchParameters)]=advancedSearchParameters [piwikSiteId]=piwikSiteId diff --git a/searchPages/simple/searchOrganizations.component.ts b/searchPages/simple/searchOrganizations.component.ts index b4a1233d..2f8dbf37 100644 --- a/searchPages/simple/searchOrganizations.component.ts +++ b/searchPages/simple/searchOrganizations.component.ts @@ -25,7 +25,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId - searchFormClass="organizationsSearchForm"> + [searchFormClass]="customFilter && customFilter.queryFieldName == 'communityId' ? + 'communityPanelBackground' : 'organizationsSearchForm'"> ` diff --git a/searchPages/simple/searchOrps.component.ts b/searchPages/simple/searchOrps.component.ts index acb783dd..13b23536 100644 --- a/searchPages/simple/searchOrps.component.ts +++ b/searchPages/simple/searchOrps.component.ts @@ -26,7 +26,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [disableForms]="disableForms" [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" - searchFormClass="orpsSearchForm" + [searchFormClass]="customFilter && customFilter.queryFieldName == 'communityId' ? + 'communityPanelBackground' : 'orpsSearchForm'" [(openaireLink)]=openaireLink [(advancedSearchParameters)]=advancedSearchParameters [piwikSiteId]=piwikSiteId diff --git a/searchPages/simple/searchProjects.component.ts b/searchPages/simple/searchProjects.component.ts index e2de4a21..3ba8ba34 100644 --- a/searchPages/simple/searchProjects.component.ts +++ b/searchPages/simple/searchProjects.component.ts @@ -25,7 +25,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId - searchFormClass="projectsSearchForm"> + [searchFormClass]="customFilter && customFilter.queryFieldName == 'communityId' ? + 'communityPanelBackground' : 'projectsSearchForm'"> ` diff --git a/searchPages/simple/searchPublications.component.ts b/searchPages/simple/searchPublications.component.ts index cd61e46d..d07d1f30 100644 --- a/searchPages/simple/searchPublications.component.ts +++ b/searchPages/simple/searchPublications.component.ts @@ -14,6 +14,7 @@ import {EnvProperties} from '../../utils/properties/env-properties'; @Component({ selector: 'search-publications', template: ` +