diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html index a2d87437..7158c2dc 100644 --- a/sharedComponents/bottom.component.html +++ b/sharedComponents/bottom.component.html @@ -1,5 +1,6 @@ -
+
@@ -7,20 +8,16 @@ [src]="assetsPath + 'common/commission.jpg'" alt="flag black white low" width="50" height="33">
+
-
- -
-
- +
+
-
- -
-
- +
+
@@ -37,7 +34,8 @@
-
0)" + id="footer#3" [class]="'uk-first-column uk-flex uk-flex-middle ' + (centered?'uk-grid uk-margin-remove-right':'uk-margin-large-right uk-width-1-3@m')">
@@ -65,11 +63,10 @@ alt="flag black white low" width="50" height="33">
-
- -
-
- + +
+
diff --git a/sharedComponents/bottom.component.ts b/sharedComponents/bottom.component.ts index 8af2c7f3..10f3e0cb 100644 --- a/sharedComponents/bottom.component.ts +++ b/sharedComponents/bottom.component.ts @@ -6,6 +6,7 @@ import { ConfigurationService } from '../utils/configuration/configuration.servi import {EnvProperties} from "../utils/properties/env-properties"; import {Subscription} from "rxjs"; import {properties} from '../../../environments/environment'; +import {HelperService} from "../utils/helper/helper.service"; @Component({ selector: 'bottom', @@ -24,8 +25,8 @@ export class BottomComponent { // @Input() environment:string = "beta"; showPage ={}; @Input() grantAdvance:boolean = true; -grantAdvanceText = "OpenAIRE-Advance receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541."; -grantConenctText = "OpenAIRE-Connect receives funding from the European Union's Horizon 2020 Research and Innovation programme under grant agreement No. 731011 and No. 777541."; +// grantAdvanceText = "OpenAIRE-Advance receives funding from the European Union's Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541."; +// grantConenctText = "OpenAIRE-Connect receives funding from the European Union's Horizon 2020 Research and Innovation programme under grant agreement No. 731011 and No. 777541."; @Input() properties:EnvProperties = properties; @Input() darkBackground:boolean=true; @Input() centered:boolean=false; @@ -33,11 +34,16 @@ grantConenctText = "OpenAIRE-Connect receives funding from the European Union's sectionClass= "uk-section-primary"; subs: Subscription[] = []; +public divContents = null; -constructor(private config: ConfigurationService, private route: ActivatedRoute,) { +constructor(private config: ConfigurationService, private route: ActivatedRoute, + private helper: HelperService) { } ngOnInit() { + if(!properties.footerGrantText) { + this.getDivContents(); + } if(!this.darkBackground){ this.sectionClass= " footer-light-background"; } @@ -78,4 +84,12 @@ constructor(private config: ConfigurationService, private route: ActivatedRoute } return true; } + + private getDivContents() { + if (this.communityId) { + this.subs.push(this.helper.getDivHelpContents(this.properties, this.communityId, "/").subscribe(contents => { + this.divContents = contents; + })); + } + } } diff --git a/sharedComponents/bottom.module.ts b/sharedComponents/bottom.module.ts index 2a615ce9..23dacc1e 100644 --- a/sharedComponents/bottom.module.ts +++ b/sharedComponents/bottom.module.ts @@ -4,10 +4,11 @@ import { FormsModule } from '@angular/forms'; import { RouterModule } from "@angular/router"; import {BottomComponent} from './bottom.component'; +import {HelperModule} from "../utils/helper/helper.module"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule + CommonModule, FormsModule, RouterModule, HelperModule ], declarations: [ diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 53768d58..ac237191 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -135,4 +135,5 @@ export interface EnvProperties { sushiliteURL?: string; notificationsAPIURL?: string; myOrcidLinksPage?: string; + footerGrantText?: string; }