From 8de9a2f215156cca6aca303eddcb42852f4c91ea Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 1 Feb 2019 12:14:46 +0000
Subject: [PATCH] Bottom menu: 	add grant id text, add missing link in the
 menu (newsletters), update subscribe link 	change parameter names to be
 more accurate

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54678 d315682c-612b-4755-9ff5-7f18f6832af3
---
 sharedComponents/bottom.component.html | 25 +++++++++++++++----------
 sharedComponents/bottom.component.ts   | 13 +++++++++----
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html
index 08d011b8..1fbb5813 100644
--- a/sharedComponents/bottom.component.html
+++ b/sharedComponents/bottom.component.html
@@ -6,14 +6,18 @@
                <div *ngIf="showOpenaire" class="uk-margin-small uk-margin-remove-top uk-text-left@s uk-text-center">
                   <img [src]="assetsPath + 'common/Logo_Horizontal_white_small.png'"   data-width="126" data-height="30" class="el-image" alt="OpenAIRE">
                </div>
-               <div *ngIf="showDnet" id="footer#5" class="uk-margin uk-text-left@s uk-text-center">
-                  <img  [src]="assetsPath + 'common/commission.jpg'"   sizes="(min-width: 50px) 50px" data-width="427" data-height="285" class="el-image" alt="European Commission">
+               <div *ngIf="showCommision" id="footer#5" class="uk-margin uk-text-left@s uk-text-center">
+                 <div class="uk-margin">
+                  <img style="margin-right: 8px; float: left;" [src]="assetsPath + 'common/commission.jpg'" alt="flag black white low" width="50" height="33">
+                  <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "(grantAdvance)?grantAdvanceText:grantConenctText"></span>
+                </div>
+                  <!--img  [src]="assetsPath + 'common/commission.jpg'"   sizes="(min-width: 50px) 50px" data-width="427" data-height="285" class="el-image" alt="European Commission"-->
                </div>
-               <div *ngIf="showSocialButton" id="footer#6" class="newsletter uk-margin uk-margin-remove-bottom uk-text-left@s uk-text-center uk-panel">
+               <div *ngIf="showSocialButtons" id="footer#6" class="newsletter uk-margin uk-margin-remove-bottom uk-text-left@s uk-text-center uk-panel">
                   <h5 class="el-title uk-margin uk-h5">
                      Newsletter
                   </h5>
-                  <a target="_blank" href="https://www.openaire.eu/newsletter/view" class="el-link">
+                  <a target="_blank" href="https://www.openaire.eu/past-newsletters/listing" class="el-link">
                      <span   class="el-image uk-icon">
                         <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                            <circle cx="3.12" cy="16.8" r="1.85"></circle>
@@ -23,7 +27,7 @@
                      </span>
                   </a>
                </div>
-               <div *ngIf="showSocialButton" id="footer#7" class="newsletter uk-margin-small uk-margin-remove-top uk-text-left@s   uk-panel">
+               <div *ngIf="showSocialButtons" id="footer#7" class="newsletter uk-margin-small uk-margin-remove-top uk-text-left@s   uk-panel">
 
                   <div class="acymailing_module" id="acymailing_module_formAcymailing60611">
                      <div class="" id="acymailing_toggle_formAcymailing60611">
@@ -32,7 +36,7 @@
                      </div>
                   </div>
                </div>
-               <div  *ngIf="showSocialButton"class="uk-margin-small uk-margin-remove-top uk-text-left@s uk-text-center">
+               <div  *ngIf="showSocialButtons" class="uk-margin-small uk-margin-remove-top uk-text-left@s uk-text-center">
                   <div class="uk-child-width-auto uk-grid-small uk-flex-left@s uk-flex-center uk-grid" uk-grid="">
                      <div class="uk-first-column">
                         <a  href="https://www.facebook.com/groups/openaire/" target="_blank" class="el-link uk-icon-button uk-icon">
@@ -77,7 +81,7 @@
                   </div>
                </div>
             </div>
-            <div *ngIf="!showMenu" class="uk-width-expand@m uk-light">
+            <div *ngIf="showMenuItems" class="uk-width-expand@m uk-light">
                <div id="footer#7" class="uk-text-right@m uk-text-center">
 
                   <ul class="uk-subnav uk-margin-remove-bottom uk-subnav-divider" uk-margin="">
@@ -91,7 +95,7 @@
 
                </div>
             </div>
-            <div *ngIf="showMenu" id="footer#9" class="uk-width-expand@s uk-visible@m">
+            <div *ngIf="!showMenuItems" id="footer#9" class="uk-width-expand@s uk-visible@m">
                <div id="footer#10" class="uk-width-medium uk-text-left@s uk-text-center uk-panel">
                   <h3 class="el-title uk-h6">Dashboards</h3>
                   <ul class="uk-nav uk-nav-default uk-nav-parent-icon uk-nav-accordion" uk-nav="">
@@ -103,7 +107,7 @@
                   </ul>
                </div>
             </div>
-            <div *ngIf="showMenu" id="footer#11" class="uk-width-expand@s uk-visible@m">
+            <div *ngIf="!showMenuItems" id="footer#11" class="uk-width-expand@s uk-visible@m">
                <div id="footer#12" class="uk-width-medium uk-text-left@s uk-text-center uk-panel">
                   <h3 class="el-title uk-h6">Support</h3>
                   <ul class="uk-nav uk-nav-default uk-nav-parent-icon uk-nav-accordion" uk-nav="">
@@ -116,13 +120,14 @@
                   </ul>
                </div>
             </div>
-            <div *ngIf="showMenu" id="footer#13" class="uk-width-expand@s uk-visible@m">
+            <div *ngIf="!showMenuItems" id="footer#13" class="uk-width-expand@s uk-visible@m">
                <div id="footer#14" class="uk-width-medium uk-text-left@s uk-text-center uk-panel">
                   <h3 class="el-title uk-h6">Updates</h3>
                   <ul class="uk-nav uk-nav-default uk-nav-parent-icon uk-nav-accordion" uk-nav="">
                      <li><a target="_blank" href="https://www.openaire.eu/news/">News</a></li>
                      <li><a target="_blank" href="https://www.openaire.eu/events">Events</a></li>
                      <li><a target="_blank" href="https://www.openaire.eu/blogs/magazine">Blogs</a></li>
+                     <li><a target="_blank" href="https://www.openaire.eu/newsletter/listing">Newsletters</a></li>
                      <li><a target="_blank" href="https://www.openaire.eu/documents">Documents</a></li>
                   </ul>
                </div>
diff --git a/sharedComponents/bottom.component.ts b/sharedComponents/bottom.component.ts
index 59bd3561..9faeea17 100644
--- a/sharedComponents/bottom.component.ts
+++ b/sharedComponents/bottom.component.ts
@@ -10,10 +10,10 @@ import { ConfigurationService } from '../utils/configuration/configuration.servi
 })
 export class BottomComponent {
 
-@Input() showSocialButton:boolean = true;
+@Input() showSocialButtons:boolean = true;
 @Input() showOpenaire:boolean = true;
-@Input() showMenu:boolean = true;
-@Input() showDnet:boolean = true;
+@Input() showMenuItems:boolean = false;
+@Input() showCommision:boolean = true;
 @Input() assetsPath:string ='assets/common-assets/';
 @Input() menuItems:MenuItem [];
 
@@ -21,12 +21,17 @@ export class BottomComponent {
 @Input() communityId;
 @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."
+
+
 constructor(private config: ConfigurationService, private  route: ActivatedRoute,) {
 }
 
   ngOnInit() {
     this.route.queryParams.subscribe(params => {
-      if(!this.showMenu){
+      if(this.showMenuItems){
         if( this.APIUrl && this.communityId ){
           this.config.getCommunityInformation(this.APIUrl, this.communityId ).subscribe(data => {
             for(var i=0; i< data.pages.length; i++){