From 21adb8493a9d7222af361e2ee006c191aefa42c1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 18 Sep 2024 13:01:37 +0300 Subject: [PATCH] Change texts in about and home. Add info for publicly-funded filter. Add engagement tag for engagement and training. Update library and Changelog before release. --- CHANGELOG.md | 8 ++++ src/app/home/home.component.html | 38 +++++++++++++------ src/app/openaireLibrary | 2 +- .../how-it-works/about.component.html | 1 - src/app/shared/monitor/monitor.component.html | 4 +- .../oa-indicator/oa-indicator.component.ts | 6 +-- src/styles.less | 10 +++++ 7 files changed, 48 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f9fa6d..76c06e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - *Fixed (for any bug fixes)* - *Security (in case of vulnerabilities)* +## v1.0.2 - 18.09.2024 +### Changed +Texts in home and about. + +### Added +Add info for publicly-funded filter. +Add engagement tag for engagement-training page. + ## v1.0.1 - 25.07.2024 ### Fixed Problem with ORCID KPIs regarding a researcher. diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index d972645..70112ae 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -7,8 +7,9 @@
Enhance your approach to Open Science. Explore insights thoughtfully designed to support your - strategy and contribute to the future of Irish Open Science. Our current pilot phase, aimed at - enhancing data integrity and broadening functionality, continues until June 2024. + strategy and contribute to the future of Irish Open Science. In our current pilot phase we are + aiming at at enhancing data integrity, broadening functionality and embedding the Monitor into the + Irish scholarly ecosystem.
Take a look
@@ -54,17 +55,22 @@

All in one platform

-
+
National Monitor

Explore Ireland’s Research Overview

- Dive into the National Dashboard for a comprehensive view of Ireland’s Open Access landscape or explore our other four types of tailor-made dashboards.
+ Dive into the National Dashboard for a comprehensive view of Ireland’s Open Access landscape or + explore our other four types of tailor-made dashboards. +
- + National Monitor - @@ -75,7 +81,8 @@
-
Research Performing Organisations Monitors
+
Research Performing Organisations + Monitors
-
Research Funding Organisations Monitors
+
Research Funding Organisations + Monitors
-
+
Add to ORCID
@@ -159,7 +170,8 @@ Connect research results with projects, research communities, or other research outcomes.
- + Link

We Value Your Feedback.

-
Your insights and feedback are crucial. Reach out with questions, comments, or to collaborate on data quality.
+
Your insights and feedback are crucial. Reach out with questions, comments, or + to collaborate on data quality. +
Contact us diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 1593ea6..8f668cd 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1593ea6ed9e62931800b62f4d4d4787228043d51 +Subproject commit 8f668cd4ff51655caacdab42304c32cb2446fe64 diff --git a/src/app/resources/how-it-works/about.component.html b/src/app/resources/how-it-works/about.component.html index 7c323e2..74d9ffe 100644 --- a/src/app/resources/how-it-works/about.component.html +++ b/src/app/resources/how-it-works/about.component.html @@ -15,7 +15,6 @@ This platform is currently in its pilot phase. Over the next few months, we are dedicatedly working on enhancing data quality and expanding functionalities. - Our goal is to deliver the final product by June 2024. This period is crucial for refining our services and ensuring that the platform meets the highest standards of excellence and user satisfaction, please contact us with any questions or comments. diff --git a/src/app/shared/monitor/monitor.component.html b/src/app/shared/monitor/monitor.component.html index 8f246db..e6d852e 100644 --- a/src/app/shared/monitor/monitor.component.html +++ b/src/app/shared/monitor/monitor.component.html @@ -273,8 +273,8 @@ - + * Publicly-funded information has been curated for IE only. + * If your filter selection cannot be applied to a chart, that chart will appear grayed-out. diff --git a/src/app/shared/oa-indicator/oa-indicator.component.ts b/src/app/shared/oa-indicator/oa-indicator.component.ts index 5dfa090..10f7495 100644 --- a/src/app/shared/oa-indicator/oa-indicator.component.ts +++ b/src/app/shared/oa-indicator/oa-indicator.component.ts @@ -1,14 +1,10 @@ import {Component, Input, OnInit} from "@angular/core"; import {Stakeholder} from "../../openaireLibrary/monitor/entities/stakeholder"; import {StatisticsService} from "../../openaireLibrary/monitor-admin/utils/services/statistics.service"; -import { - IndicatorStakeholderBaseComponent, - StakeholderBaseComponent -} from "../../openaireLibrary/monitor-admin/utils/stakeholder-base.component"; +import {IndicatorStakeholderBaseComponent} from "../../openaireLibrary/monitor-admin/utils/stakeholder-base.component"; import {zip} from "rxjs"; import {OAIndicator} from "../../openaireLibrary/monitor-admin/utils/indicator-utils"; import {IrishMonitorService} from "../irish-monitor.service"; -import {BaseComponent} from "../../openaireLibrary/sharedComponents/base/base.component"; @Component({ selector: "oa-indicator", diff --git a/src/styles.less b/src/styles.less index d8ebf3d..aa1781e 100644 --- a/src/styles.less +++ b/src/styles.less @@ -39,6 +39,7 @@ svg .a { @training-color: #A8B9FF; @webinar-color: #E0C44F; + @engagement-color: #dab6ff; .card { height: 325px; @@ -53,6 +54,10 @@ svg .a { background-image: url("~/src/assets/irish-assets/resources/resources-pink-blue.png"); } + &.engagement { + background-image: url("~/src/assets/irish-assets/resources/resources-dark-blue.jpg"); + } + .info { height: 50%; .set-blur-background(@dark-color, 50%, brightness(0.5) blur(20px)); @@ -97,6 +102,11 @@ svg .a { border-color: @webinar-color; } + .uk-label.engagement { + background-color: @engagement-color; + border-color: @engagement-color; + } + .uk-label.funder { background-color: @funder-color; border-color: @funder-color;