From 6c4ecbf946c206f105ac6a97a3b73ad8eff4d019 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Wed, 10 Apr 2024 16:32:08 +0300 Subject: [PATCH] [master | DONE | ADDED] engagement & training: add class helptext for events (cards) --- src/app/openaireLibrary | 2 +- .../engagement/engagement.component.html | 63 ++------------- .../engagement/engagement.component.less | 70 ----------------- .../engagement/engagement.component.ts | 12 ++- .../resources/engagement/engagement.module.ts | 3 +- .../methodology/terminology.component.ts | 1 - src/assets/openaire-theme | 2 +- src/styles.less | 76 +++++++++++++++++++ 8 files changed, 96 insertions(+), 133 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 0111ea6..609f09c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 0111ea668179f643ed4ac5b91881d9185733b8e8 +Subproject commit 609f09cc9ff3505fc509d00805b987394a4f3215 diff --git a/src/app/resources/engagement/engagement.component.html b/src/app/resources/engagement/engagement.component.html index c4e82ff..f8af643 100644 --- a/src/app/resources/engagement/engagement.component.html +++ b/src/app/resources/engagement/engagement.component.html @@ -15,64 +15,11 @@ -
-
-
-
-
-
- Webinar -
1st Stakeholder Webinar
-
- -
-
-
-
-
-
-
- Webinar -
2nd Stakeholder Webinar
-
- -
-
-
-
-
-
-
- Training - RFO -
RFO Training
-
- -
-
-
-
-
-
-
- Training - RPO -
RPO Training
-
- -
-
-
-
-
+ + + + +
diff --git a/src/app/resources/engagement/engagement.component.less b/src/app/resources/engagement/engagement.component.less index 61fd8bf..3d8b932 100644 --- a/src/app/resources/engagement/engagement.component.less +++ b/src/app/resources/engagement/engagement.component.less @@ -1,9 +1,6 @@ @import (reference) "~src/assets/extend-theme/less/_import-variables.less"; @import (reference) "~src/assets/openaire-theme/less/mixin.less"; -@training-color: #A8B9FF; -@webinar-color: #E0C44F; - .graphics { grid-gap: 40px; @@ -28,39 +25,6 @@ } } -.card { - height: 325px; - background-repeat: no-repeat; - background-position: center; - - &.webinar { - background-image: url("~/src/assets/irish-assets/resources/resources-green.png"); - } - - &.training { - background-image: url("~/src/assets/irish-assets/resources/resources-pink-blue.png"); - } - - .info { - height: 50%; - .set-blur-background(@dark-color, 50%, brightness(0.5) blur(20px)); - - a { - display: none; - } - } - - &:hover { - .info { - height: 100%; - - a { - display: inline-block; - } - } - } -} - @media (max-width: @breakpoint-small-max) { .graphics { grid-gap: 20px; @@ -85,38 +49,4 @@ } } } - - .card { - height: unset; - - .info { - height: 100%; - - a { - display: inline-block; - } - } - } -} - -.uk-label.training { - background-color: @training-color; - border-color: @training-color; -} - -.uk-label.webinar { - background-color: @webinar-color; - border-color: @webinar-color; -} - -.uk-label.funder { - background-color: @funder-color; - border-color: @funder-color; - color: @global-inverse-color; -} - -.uk-label.organization { - background-color: @organization-color; - border-color: @organization-color; - color: @global-inverse-color; } diff --git a/src/app/resources/engagement/engagement.component.ts b/src/app/resources/engagement/engagement.component.ts index 7d200f9..727a704 100644 --- a/src/app/resources/engagement/engagement.component.ts +++ b/src/app/resources/engagement/engagement.component.ts @@ -6,6 +6,7 @@ import {Meta, Title} from "@angular/platform-browser"; import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service"; import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; import {LayoutService} from "../../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; +import {HelperService} from "../../openaireLibrary/utils/helper/helper.service"; @Component({ selector: 'engagement', @@ -16,6 +17,7 @@ export class EngagementComponent extends BaseComponent implements OnInit { title = 'Engagement & Training'; description = 'Engagement & Training'; breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'resources - engagement & training'}]; + divContents: any; isMobile: boolean = false; @@ -26,7 +28,8 @@ export class EngagementComponent extends BaseComponent implements OnInit { protected _title: Title, protected _router: Router, private cdr: ChangeDetectorRef, - private layoutService: LayoutService) { + private layoutService: LayoutService, + private helper: HelperService) { super(); } @@ -36,5 +39,12 @@ export class EngagementComponent extends BaseComponent implements OnInit { this.isMobile = isMobile; this.cdr.detectChanges(); }); + this.getDivContents(); + } + + private getDivContents() { + this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'irish', '/engagement-training').subscribe(contents => { + this.divContents = contents; + })); } } diff --git a/src/app/resources/engagement/engagement.module.ts b/src/app/resources/engagement/engagement.module.ts index 2c88a3d..6b23411 100644 --- a/src/app/resources/engagement/engagement.module.ts +++ b/src/app/resources/engagement/engagement.module.ts @@ -3,6 +3,7 @@ import {CommonModule} from "@angular/common"; import {EngagementComponent} from "./engagement.component"; import {RouterModule} from "@angular/router"; import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; +import {HelperModule} from "../../openaireLibrary/utils/helper/helper.module"; @NgModule({ declarations: [EngagementComponent], @@ -10,7 +11,7 @@ import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcr { path: '', component: EngagementComponent } - ]), BreadcrumbsModule], + ]), BreadcrumbsModule, HelperModule], exports: [EngagementComponent] }) export class EngagementModule { diff --git a/src/app/resources/methodology/terminology.component.ts b/src/app/resources/methodology/terminology.component.ts index 4233816..45b2d9c 100644 --- a/src/app/resources/methodology/terminology.component.ts +++ b/src/app/resources/methodology/terminology.component.ts @@ -59,7 +59,6 @@ export class TerminologyComponent extends BaseComponent{ private getDivContents() { this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'irish', '/methodology/terminology').subscribe(contents => { this.divContents = contents; - console.log(this.divContents); })); } } \ No newline at end of file diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 43ed7e2..9171ec2 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 43ed7e267915bcae7f3ab03fab8c98136810f269 +Subproject commit 9171ec2a63d1fb53f239cfbff26f9b3a1ed9cc61 diff --git a/src/styles.less b/src/styles.less index 08d2633..d8ebf3d 100644 --- a/src/styles.less +++ b/src/styles.less @@ -33,3 +33,79 @@ svg .a { opacity: 0.5; } } + +// Engagement & Training +.events { + + @training-color: #A8B9FF; + @webinar-color: #E0C44F; + + .card { + height: 325px; + background-repeat: no-repeat; + background-position: center; + + &.webinar { + background-image: url("~/src/assets/irish-assets/resources/resources-green.png"); + } + + &.training { + background-image: url("~/src/assets/irish-assets/resources/resources-pink-blue.png"); + } + + .info { + height: 50%; + .set-blur-background(@dark-color, 50%, brightness(0.5) blur(20px)); + + a { + display: none; + } + } + + &:hover { + .info { + height: 100%; + + a { + display: inline-block; + } + } + } + } + + @media (max-width: @breakpoint-small-max) { + .card { + height: unset; + + .info { + height: 100%; + + a { + display: inline-block; + } + } + } + } + + .uk-label.training { + background-color: @training-color; + border-color: @training-color; + } + + .uk-label.webinar { + background-color: @webinar-color; + border-color: @webinar-color; + } + + .uk-label.funder { + background-color: @funder-color; + border-color: @funder-color; + color: @global-inverse-color; + } + + .uk-label.organization { + background-color: @organization-color; + border-color: @organization-color; + color: @global-inverse-color; + } +}