diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 1cca9f75..d5ec6e68 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -405,23 +405,6 @@ - -
-
- -
- -
-
-
-
@@ -430,59 +413,79 @@
- - -
- - -
- - eosc_logo - Check compatible EOSC services - -
- -
- - eosc_logo - Check compatible EOSC services - -
- -
-
-
- -
-
- -
- -
- -
- -
- -
- -
- -
-
- + + + + +
+
+ +
+ +
+
+
+ + + +
+ + +
+ + eosc_logo + Check compatible EOSC services + +
+ +
+ + eosc_logo + Check compatible EOSC services + +
+ +
+
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts index f94d03bf..2439599f 100644 --- a/orcid/orcid-work.component.ts +++ b/orcid/orcid-work.component.ts @@ -87,8 +87,8 @@ declare var UIkit: any; - -
+ +
{{requestGrantMessage}}
diff --git a/searchPages/searchUtils/datasourcesHelper.class.ts b/searchPages/searchUtils/datasourcesHelper.class.ts index 40319e84..603996b3 100644 --- a/searchPages/searchUtils/datasourcesHelper.class.ts +++ b/searchPages/searchUtils/datasourcesHelper.class.ts @@ -47,23 +47,23 @@ export class DatasourcesHelperClass { } } public static getQueryPrefix(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): string { - if(properties.environment == "production") { - if (type == "registries") { - return ' (datasourcetypeuiid = "entityregistry" or datasourcetypeuiid = "entityregistry::products" or datasourcetypeuiid = "entityregistry::repositories" ' + - 'or datasourcetypeuiid = "entityregistry::organizations" or datasourcetypeuiid = "entityregistry::researchers" ) '; - - } else if (type == "journals") { - // return ' not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) '; - return 'oaftype exact datasource not datasourcecompatibilityid = notCompatible and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) '; - - } else if (type == "compatible") { - return ' oaftype exact datasource and datasourcecompatibilityid <> notCompatible and datasourcetypeuiid <> other and datasourcetypeuiid <> "pubsrepository::journal" and datasourcetypeuiid <> "aggregator::pubsrepository::journals" '; - } else if (type == "deposit") { - return ' oaftype exact datasource '; - } else { - return ""; - } - }else{ + // if(properties.environment == "production") { + // if (type == "registries") { + // return ' (datasourcetypeuiid = "entityregistry" or datasourcetypeuiid = "entityregistry::products" or datasourcetypeuiid = "entityregistry::repositories" ' + + // 'or datasourcetypeuiid = "entityregistry::organizations" or datasourcetypeuiid = "entityregistry::researchers" ) '; + // + // } else if (type == "journals") { + // // return ' not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) '; + // return 'oaftype exact datasource not datasourcecompatibilityid = notCompatible and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) '; + // + // } else if (type == "compatible") { + // return ' oaftype exact datasource and datasourcecompatibilityid <> notCompatible and datasourcetypeuiid <> other and datasourcetypeuiid <> "pubsrepository::journal" and datasourcetypeuiid <> "aggregator::pubsrepository::journals" '; + // } else if (type == "deposit") { + // return ' oaftype exact datasource '; + // } else { + // return ""; + // } + // }else{ if (type == "registries") { return 'datasourcetypeuiname exact "Registry"'; } else if (type == "journals") { @@ -77,7 +77,7 @@ export class DatasourcesHelperClass { } else { return ""; } - } + // } } public static createFilters(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): Filter[] { diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 301e6f07..513a5648 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -34,11 +34,9 @@ import {properties} from "../../../../environments/environment"; import {AlertModal} from "../../utils/modal/alert"; import {Subscriber} from "rxjs"; import {IndexInfoService} from "../../utils/indexInfo.service"; +import {Background} from "../../utils/background-utils"; -export interface SearchForm { - class: string, - dark: boolean -} +export interface SearchForm extends Background {} declare var UIkit: any; diff --git a/sharedComponents/quick-contact/quick-contact.component.html b/sharedComponents/quick-contact/quick-contact.component.html index 28f33844..116060f7 100644 --- a/sharedComponents/quick-contact/quick-contact.component.html +++ b/sharedComponents/quick-contact/quick-contact.component.html @@ -7,7 +7,7 @@
-
+
Send a message
diff --git a/sharedComponents/quick-contact/quick-contact.component.ts b/sharedComponents/quick-contact/quick-contact.component.ts index eb5bbac4..ca2106c8 100644 --- a/sharedComponents/quick-contact/quick-contact.component.ts +++ b/sharedComponents/quick-contact/quick-contact.component.ts @@ -1,6 +1,8 @@ import {Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild} from '@angular/core'; import {FormGroup} from "@angular/forms"; import {Subscriber} from "rxjs"; +import {SearchForm} from "../../searchPages/searchUtils/newSearchPage.component"; +import {Background} from "../../utils/background-utils"; declare var UIkit; @@ -17,8 +19,7 @@ export class QuickContactComponent implements OnInit, OnDestroy { public images: string[] = []; @Input() public contact: string = 'contact'; - @Input() - public background: string = 'uk-background-primary'; + public backgroundHeader: Background = {class: 'uk-background-primary', dark: true}; @Input() public sending = false; @Input() @@ -27,6 +28,15 @@ export class QuickContactComponent implements OnInit, OnDestroy { private subscriptions: any[] = []; @ViewChild('drop') drop: ElementRef; + @Input() + set background(background: Background | string) { + if(typeof background === 'string') { + this.backgroundHeader = {class: background, dark: true} + } else { + this.backgroundHeader = background; + } + } + ngOnInit() { if (typeof document !== 'undefined') { this.subscriptions.push(UIkit.util.on(document, 'beforehide', '#quick-contact', (event) => { @@ -41,6 +51,9 @@ export class QuickContactComponent implements OnInit, OnDestroy { this.showDrop = false; })); } + if(typeof this.background === 'string' ) { + this.background = {class: this.background, dark: true}; + } } ngOnDestroy() { diff --git a/utils/background-utils.ts b/utils/background-utils.ts new file mode 100644 index 00000000..28a2f3f0 --- /dev/null +++ b/utils/background-utils.ts @@ -0,0 +1,4 @@ +export interface Background { + class: string, + dark: boolean +} diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index 9e16d872..65b5e505 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -5,9 +5,9 @@ declare var UIkit: any; @Component({ selector: 'modal-alert', template: ` -
+
-
+
{{alertTitle}}