MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
konstantina.galouni 2019-07-16 16:23:33 +00:00
parent c670434702
commit e490cc81fe
9 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deposit/searchDataprovidersToDeposit.component.ts
View File

@ -15,7 +15,7 @@ import {ZenodoInformationClass} from "./utils/zenodoInformation.class";
selector: 'search-dataproviders',
template: `
<div class="uk-section uk-margin-top">
<div class="uk-section uk-margin-top uk-padding-remove-bottom">
<div class="communityPanelBackground uk-margin-top uk-padding-small">
<div class="uk-container uk-container-large uk-margin-small-top uk-margin-small-bottom">
<ul class="uk-breadcrumb">
@ -35,6 +35,7 @@ import {ZenodoInformationClass} from "./utils/zenodoInformation.class";
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults"
[piwikSiteId]=piwikSiteId
[searchFormClass]="''"
[usedBy]="'deposit'"
[showMoreFilterValuesInline]=true
[filterValuesNum]=4

50
searchPages/searchUtils/searchPage.component.html
View File

@ -1,18 +1,40 @@
<div class="image-front-topbar uk-section-default" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
<div [class]="usedBy == 'deposit' ? 'uk-margin-large-bottom ' : 'searchFormMinHeight uk-padding-remove-bottom' + ' uk-background-norepeat uk-background-bottom-center uk-section uk-flex uk-flex-middle uk-background-fixed '+searchFormClass">
<div [class]="'uk-container uk-position-relative uk-margin-large-top' + (usedBy == 'deposit' ? ' uk-container-large' : '')">
<div class="uk-width-1-1">
<!--link to advanced search -->
<a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="((disableForms)?'uk-float-right uk-disabled uk-link-muted uk-light ':'uk-float-right uk-light') +' portal-color uk-margin-small-bottom'" [routerLink]=advancedSearchLink [queryParams]=advancedSearchParameters >
<span class=" ">Advanced search</span>
</a>
<search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
<!--<div *ngIf="searchFormClass == 'communitiesSearchForm'" class="image-front-topbar uk-section-default" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">-->
<!-- <div [class]="usedBy == 'deposit' ? 'uk-margin-large-bottom ' : 'searchFormMinHeight uk-padding-remove-bottom' + ' uk-background-norepeat uk-background-bottom-center uk-section uk-flex uk-flex-middle uk-background-fixed '+searchFormClass">-->
<!-- <div [class]="'uk-container uk-position-relative uk-margin-large-top' + (usedBy == 'deposit' ? ' uk-container-large' : '')">-->
<!-- <div class="uk-width-1-1">-->
<!-- &lt;!&ndash;link to advanced search &ndash;&gt;-->
<!-- <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="((disableForms)?'uk-float-right uk-disabled uk-link-muted uk-light ':'uk-float-right uk-light') +' portal-color uk-margin-small-bottom'" [routerLink]=advancedSearchLink [queryParams]=advancedSearchParameters >-->
<!-- <span class=" ">Advanced search</span>-->
<!-- </a>-->
<!-- <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>-->
</div>
<div *ngIf="entityType === 'community'" class="uk-position-center-right-out">
<img src="../../../../assets/banner/search.png" class="uk-align-center" width="141" height="171">
</div>
</div>
<!-- </div>-->
<!-- <div *ngIf="entityType === 'community'" class="uk-position-center-right-out">-->
<!-- <img src="../../../../assets/banner/search.png" class="uk-align-center" width="141" height="171">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
<div [class]="usedBy != 'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') ? ' image-front-topbar uk-section-default ' : (' uk-section uk-padding-remove-bottom ' + (usedBy == 'deposit' ? ' uk-padding-remove-top ' : ' uk-margin-top '))"
uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
<div [class]="' uk-background-norepeat uk-background-bottom-center uk-section uk-flex uk-flex-middle uk-background-fixed '+searchFormClass
+ (usedBy != 'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') ? ' searchFormMinHeight uk-padding-remove-bottom ' : ' uk-margin-medium-bottom uk-section-small ')
+ (usedBy == 'deposit' ? ' uk-padding-remove uk-margin-large-bottom uk-margin-large-top ' : '')">
<div [class]="' uk-container uk-position-relative '
+ (usedBy != 'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') ? ' uk-margin-large-top ' : '')
+ (usedBy == 'deposit' ? ' uk-container-large' : '')">
<div>
<a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="((disableForms)?'uk-float-right uk-disabled uk-link-muted uk-light ':'uk-float-right uk-light') +' uk-margin-small-bottom'" [routerLink]=advancedSearchLink [queryParams]=advancedSearchParameters >
<span class=" ">Advanced search</span>
</a>
<search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
</div>
<div *ngIf="entityType === 'community'" class="uk-position-center-right-out">
<img src="../../../../assets/banner/search.png" class="uk-align-center" width="141" height="171">
</div>
</div>
</div>
</div>

3
searchPages/simple/searchDataproviders.component.ts
View File

@ -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">
</search-page>

3
searchPages/simple/searchDatasets.component.ts
View File

@ -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

3
searchPages/simple/searchOrganizations.component.ts
View File

@ -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'">
</search-page>
`

3
searchPages/simple/searchOrps.component.ts
View File

@ -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

3
searchPages/simple/searchProjects.component.ts
View File

@ -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'">
</search-page>
`

6
searchPages/simple/searchPublications.component.ts
View File

@ -14,6 +14,7 @@ import {EnvProperties} from '../../utils/properties/env-properties';
@Component({
selector: 'search-publications',
template: `
<!-- [searchFormClass]="customFilter.queryFieldName == 'communityId' ? 'communityPanelBackground' : 'publicationsSearchForm'"-->
<search-page pageTitle="Search Publications"
formPlaceholderText = "Search for Publications"
@ -25,8 +26,9 @@ import {EnvProperties} from '../../utils/properties/env-properties';
advancedSearchLink="/search/advanced/publications"
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults"
searchFormClass="publicationsSearchForm"
[oldTotalResults]="oldTotalResults"
[searchFormClass]="customFilter && customFilter.queryFieldName == 'communityId' ?
'communityPanelBackground' : 'publicationsSearchForm'"
[(openaireLink)]=openaireLink
[(advancedSearchParameters)]=advancedSearchParameters
[piwikSiteId]=piwikSiteId

3
searchPages/simple/searchSoftware.component.ts
View File

@ -26,7 +26,8 @@ import{EnvProperties} from '../../utils/properties/env-properties';
[disableForms]="disableForms"
[loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults"
searchFormClass="softwareSearchForm"
[searchFormClass]="customFilter && customFilter.queryFieldName == 'communityId' ?
'communityPanelBackground' : 'softwareSearchForm'"
[(openaireLink)]=openaireLink
[(advancedSearchParameters)]=advancedSearchParameters
[piwikSiteId]=piwikSiteId