From 13d04301090b4ecb370510c2c788163a74b02778 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 24 Aug 2023 18:20:49 +0300 Subject: [PATCH 1/3] [Library | develop]: alert.ts & full-screen-modal.component.ts: Updated (h6 from h4 or h5) header font size and ratio of icons (make them smaller) - in angular 16 branch, paddings have also changed. --- utils/modal/alert.ts | 4 ++-- .../modal/full-screen-modal/full-screen-modal.component.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index 27e6c0a4..b6458d79 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -19,10 +19,10 @@ declare var UIkit: any;
-
{{alertTitle}}
+
{{alertTitle}}
-

{{title}}

+
{{title}}

{{title}}

From 2e33c470e9387428713e08e086a4e2408ad06dbc Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 24 Aug 2023 18:31:04 +0300 Subject: [PATCH 2/3] [Library | develop]: [Bug fix] landing-utils/fos.component.ts & fos/fos.component.ts & fos/fos.component.html: Added methods "buildFosQueryParam()" and "buildFosHrefParam()" to build and set in fos links, search param "fos" for production and "foslabel" for beta or dev environments. --- fos/fos.component.html | 12 ++++++------ fos/fos.component.ts | 4 ++++ landingPages/landing-utils/fos.component.ts | 18 +++++++++++++----- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/fos/fos.component.html b/fos/fos.component.html index 70b3e068..e29cc133 100644 --- a/fos/fos.component.html +++ b/fos/fos.component.html @@ -95,7 +95,7 @@

- {{item.id}} @@ -105,13 +105,13 @@

- {{child.id}}

- {{subChild.label}} @@ -126,19 +126,19 @@

-

-

-
diff --git a/fos/fos.component.ts b/fos/fos.component.ts index 49edfd5b..9aec0606 100644 --- a/fos/fos.component.ts +++ b/fos/fos.component.ts @@ -214,4 +214,8 @@ export class FosComponent implements OnInit, OnDestroy { this._meta.updateTag({content: description}, "name='description'"); this._meta.updateTag({content: description}, "property='og:description'"); } + + public buildFosQueryParam(fos) { + return (properties.environment !== 'production' ? ({'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}) : ({'fos': this.urlEncodeAndQuote(fos.id)})); + } } diff --git a/landingPages/landing-utils/fos.component.ts b/landingPages/landing-utils/fos.component.ts index c8445f9f..7457e9a3 100644 --- a/landingPages/landing-utils/fos.component.ts +++ b/landingPages/landing-utils/fos.component.ts @@ -32,7 +32,7 @@ import {StringUtils} from "../../utils/string-utils.class";
+ [queryParams]="buildFosQueryParam(subject)"> {{subject.label}}
@@ -47,11 +47,11 @@ import {StringUtils} from "../../utils/string-utils.class";
+ [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(subject)"> {{subject.label}} + [href]="'https://explore.openaire.eu'+properties.searchLinkToResults+'?'+buildFosHrefParam(subject)"> {{subject.label}}
@@ -60,11 +60,11 @@ import {StringUtils} from "../../utils/string-utils.class";
+ [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(subject)"> {{subject.label}} + [href]="'https://explore.openaire.eu'+properties.searchLinkToResults+'?'+buildFosHrefParam(subject)"> {{subject.label}}
@@ -115,4 +115,12 @@ export class FosComponent { public urlEncodeAndQuote(str: string): string { return StringUtils.quote(StringUtils.URIEncode(str)); } + + public buildFosQueryParam(fos) { + return (properties.environment !== 'production' ? ({'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}) : ({'fos': this.urlEncodeAndQuote(fos.id)})); + } + + public buildFosHrefParam(fos): string { + return (properties.environment !== 'production' ? ('foslabel='+this.urlEncodeAndQuote(fos.id+"||"+fos.label)) : ('fos='+this.urlEncodeAndQuote(fos.id))); + } } From 1b989441db0b1f808d1b626d3588901d54ffaf90 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 25 Aug 2023 15:56:53 +0300 Subject: [PATCH 3/3] [Library | develop]: resultLanding.component.html & project.component.html & organization.component.html & dataProvider.component.html: In main action bar for mobile (landing-action-bar-mobile), replaced uk-background-default with uk-tile-default uk-blur-background. --- landingPages/dataProvider/dataProvider.component.html | 2 +- landingPages/organization/organization.component.html | 2 +- landingPages/project/project.component.html | 2 +- landingPages/result/resultLanding.component.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 88d1c251..04e842e5 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -438,7 +438,7 @@
-
+
-
+
-
+
-
+