Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/openaire-library into new-theme
This commit is contained in:
commit
6663dee508
|
@ -17,7 +17,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc
|
|||
template: `
|
||||
<div class="deposit">
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,4 +1,14 @@
|
|||
import {ChangeDetectorRef, Component, ElementRef, Input, Output, ViewChild} from '@angular/core';
|
||||
import {
|
||||
ChangeDetectorRef,
|
||||
Component,
|
||||
ElementRef,
|
||||
Input,
|
||||
OnChanges,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
Output, SimpleChanges,
|
||||
ViewChild
|
||||
} from '@angular/core';
|
||||
import {Location} from '@angular/common';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Meta, Title} from '@angular/platform-browser';
|
||||
|
@ -36,7 +46,7 @@ declare var UIkit: any;
|
|||
selector: 'new-search-page',
|
||||
templateUrl: 'newSearchPage.component.html'
|
||||
})
|
||||
export class NewSearchPageComponent {
|
||||
export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
|
||||
@ViewChild('mobileFilters') mobileFilters: ElementRef;
|
||||
@Input() piwikSiteId = null;
|
||||
@Input() hasPrefix: boolean = true;
|
||||
|
@ -228,6 +238,11 @@ export class NewSearchPageComponent {
|
|||
});
|
||||
}
|
||||
|
||||
ngOnChanges(changes: SimpleChanges) {
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
|
||||
|
||||
get disabled() {
|
||||
return this.disableForms || this.disableRefineForms;
|
||||
}
|
||||
|
|
|
@ -22,12 +22,12 @@ declare var UIkit: any;
|
|||
<ng-content></ng-content>
|
||||
</div>
|
||||
<div *ngIf="choice || okButton || cancelButton" class="uk-modal-footer">
|
||||
<div class="uk-grid uk-flex uk-flex-middle">
|
||||
<label *ngIf="choice" class="uk-width-1-2">
|
||||
<div class="uk-grid uk-flex uk-flex-middle" uk-grid>
|
||||
<label *ngIf="choice" class="uk-width-expand">
|
||||
<input type="checkbox" [(ngModel)]="select">
|
||||
<span class="uk-margin-small-left">Don't show this message again</span>
|
||||
</label>
|
||||
<div [ngClass]="(choice)?'uk-width-1-2':'uk-width-1-1'">
|
||||
<div [ngClass]="(choice)?'uk-width-auto':'uk-width-1-1'">
|
||||
<div *ngIf="alertFooter" class="uk-flex-right uk-grid uk-grid-small" uk-grid>
|
||||
<span *ngIf="okButton" [class.uk-flex-last]="!okButtonLeft">
|
||||
<button class="uk-button uk-button-primary uk-box-no-shadow" [disabled]="okDisabled"
|
||||
|
|
|
@ -72,7 +72,7 @@ export class SearchFields {
|
|||
equalityOperator: "=",
|
||||
filterType: null
|
||||
},
|
||||
["pid"]: {name: "PID", type: "keyword", param: "pid", operator: "pd", equalityOperator: " = ", filterType: null},
|
||||
["pid"]: {name: "PID", type: "keyword", param: "pid", operator: "pd", equalityOperator: " exact ", filterType: null},
|
||||
["resulthostingdatasourceid"]: {
|
||||
name: "Hosting "+OpenaireEntities.DATASOURCE,
|
||||
type: "entity",
|
||||
|
@ -280,7 +280,7 @@ export class SearchFields {
|
|||
filterType: null
|
||||
},
|
||||
["projectkeywords"]: {
|
||||
name: "Keywords",
|
||||
name: "Keyword",
|
||||
type: "keyword",
|
||||
param: "keywords",
|
||||
operator: "ky",
|
||||
|
@ -515,7 +515,7 @@ export class SearchFields {
|
|||
type: "vocabulary",
|
||||
param: "country",
|
||||
operator: "cu",
|
||||
equalityOperator: "=",
|
||||
equalityOperator: " exact ",
|
||||
filterType: "checkbox"
|
||||
},
|
||||
["datasourcethematic"]: {
|
||||
|
@ -531,7 +531,7 @@ export class SearchFields {
|
|||
type: "vocabulary",
|
||||
param: "jurisdiction",
|
||||
operator: "ju",
|
||||
equalityOperator: "=",
|
||||
equalityOperator: " exact ",
|
||||
filterType: "checkbox"
|
||||
}
|
||||
};
|
||||
|
@ -561,7 +561,7 @@ export class SearchFields {
|
|||
type: "vocabulary",
|
||||
param: "country",
|
||||
operator: "cu",
|
||||
equalityOperator: "=",
|
||||
equalityOperator: " exact ",
|
||||
filterType: "checkbox"
|
||||
},
|
||||
["datasourceodsubjects"]: {
|
||||
|
@ -622,7 +622,7 @@ export class SearchFields {
|
|||
type: "vocabulary",
|
||||
param: "country",
|
||||
operator: "cu",
|
||||
equalityOperator: "=",
|
||||
equalityOperator: " exact ",
|
||||
filterType: "checkbox"
|
||||
},
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue