From 3dffd1a9d5f97efc575be347775b1f48e0f1bc78 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 5 May 2020 16:08:30 +0000
Subject: [PATCH] [Connect | Trunk]: Add breadcrumbs on content, national
 bulletins and projects pages

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58605 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/content/contentPage.component.ts       | 14 ++++++++------
 src/app/content/contentPage.module.ts          |  3 ++-
 .../nationalBulletinsPage-routing.module.ts    |  4 ++--
 .../nationalBulletinsPage.component.ts         | 18 ++++++++++--------
 .../nationalBulletinsPage.module.ts            |  9 +++++----
 .../projects/projectsPage.component.ts         | 15 +++++++++------
 .../htmlPages/projects/projectsPage.module.ts  |  3 ++-
 7 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/app/content/contentPage.component.ts b/src/app/content/contentPage.component.ts
index 51950ba..434ba77 100644
--- a/src/app/content/contentPage.component.ts
+++ b/src/app/content/contentPage.component.ts
@@ -1,15 +1,17 @@
 import {Component} from '@angular/core';
+import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
 
 @Component({
   selector: 'content',
   template: `
-    <html-page description="Sources and methology" pageTitle="Sources and methology"></html-page>
+    <div class="communityBackground">
+      <div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
+          <breadcrumbs  addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"  [breadcrumbs]="breadcrumbs"></breadcrumbs>
+      </div>
+      <html-page description="Sources and methology" pageTitle="Sources and methology"></html-page>
+    </div>
   `
 })
 export class ContentPageComponent {
-   constructor() {}
-  public ngOnInit() {
-
-  }
-
+  public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about - Sources and Methology'}];
 }
diff --git a/src/app/content/contentPage.module.ts b/src/app/content/contentPage.module.ts
index 819a2fd..450523f 100644
--- a/src/app/content/contentPage.module.ts
+++ b/src/app/content/contentPage.module.ts
@@ -9,12 +9,13 @@ import {ContentPageRoutingModule} from './content-routing.module';
 import {CommonModule} from "@angular/common";
 import {HtmlPagesModule} from "../htmlPages/htmlPages.module";
 import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
+import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
 
 
 @NgModule({
   imports: [
     ContentPageRoutingModule, RouterModule, CommonModule,
-      HtmlPagesModule
+    HtmlPagesModule, BreadcrumbsModule
   ],
   declarations: [
     ContentPageComponent
diff --git a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts
index 2b1b48f..16564b7 100644
--- a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts
+++ b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import {NaionalBulletinPageComponent} from './nationalBulletinsPage.component';
+import {NationalBulletinPageComponent} from './nationalBulletinsPage.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@@ -8,7 +8,7 @@ import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: NaionalBulletinPageComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
+     	{ path: '', component: NationalBulletinPageComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
 
     ])
   ]
diff --git a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
index 88c6040..8280495 100644
--- a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
+++ b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
@@ -1,15 +1,17 @@
 import {Component} from '@angular/core';
+import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
 
 @Component({
-  selector: 'natinal-bulletin',
+  selector: 'national-bulletin',
   template: `
-    <html-page description="Sources and methology" pageTitle="Sources and methology"></html-page>
+    <div class="communityBackground">
+      <div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
+        <breadcrumbs  addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"  [breadcrumbs]="breadcrumbs"></breadcrumbs>
+      </div>
+     <html-page description="National Bulletins" pageTitle="National Bulletins"></html-page>
+    </div>
   `
 })
-export class NaionalBulletinPageComponent {
-   constructor() {}
-  public ngOnInit() {
-
-  }
-
+export class NationalBulletinPageComponent {
+  public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about - National Bulletins'}];
 }
diff --git a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts
index b321077..a6caa5c 100644
--- a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts
+++ b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.module.ts
@@ -3,23 +3,24 @@ import {RouterModule} from '@angular/router';
 
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {NaionalBulletinPageComponent} from './nationalBulletinsPage.component';
+import {NationalBulletinPageComponent} from './nationalBulletinsPage.component';
 import {CommonModule} from "@angular/common";
 import {HtmlPagesModule} from "../htmlPages.module";
 import {NaionalBulletinPageRoutingModule} from "./nationalBulletinsPage-routing.module";
 import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
+import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
 
 
 @NgModule({
   imports: [
-    NaionalBulletinPageRoutingModule, RouterModule, CommonModule,   HtmlPagesModule
+    NaionalBulletinPageRoutingModule, RouterModule, CommonModule, HtmlPagesModule, BreadcrumbsModule
   ],
   declarations: [
-    NaionalBulletinPageComponent
+    NationalBulletinPageComponent
   ],
   providers: [FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
   exports: [
-    NaionalBulletinPageComponent
+    NationalBulletinPageComponent
   ]
 })
 
diff --git a/src/app/htmlPages/projects/projectsPage.component.ts b/src/app/htmlPages/projects/projectsPage.component.ts
index dc06b7c..f74ae47 100644
--- a/src/app/htmlPages/projects/projectsPage.component.ts
+++ b/src/app/htmlPages/projects/projectsPage.component.ts
@@ -1,15 +1,18 @@
 import {Component} from '@angular/core';
+import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
 
 @Component({
   selector: 'projects',
   template: `
-    <html-page description="Sources and methology" pageTitle="Sources and methology"></html-page>
+    <div class="communityBackground">
+      <div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
+        <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
+                     [breadcrumbs]="breadcrumbs"></breadcrumbs>
+      </div>
+      <html-page description="Projects and funding Opportunities" pageTitle="Projects and funding Opportunities"></html-page>
+    </div>
   `
 })
 export class ProjectsPageComponent {
-   constructor() {}
-  public ngOnInit() {
-
-  }
-
+  public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about - Projects and funding Opportunities'}];
 }
diff --git a/src/app/htmlPages/projects/projectsPage.module.ts b/src/app/htmlPages/projects/projectsPage.module.ts
index 9c784f7..c97d5c1 100644
--- a/src/app/htmlPages/projects/projectsPage.module.ts
+++ b/src/app/htmlPages/projects/projectsPage.module.ts
@@ -8,11 +8,12 @@ import {CommonModule} from "@angular/common";
 import {HtmlPagesModule} from "../htmlPages.module";
 import {ProjectsPageRoutingModule} from "./projects-routing.module";
 import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
+import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
 
 
 @NgModule({
   imports: [
-    ProjectsPageRoutingModule, RouterModule, CommonModule,   HtmlPagesModule
+    ProjectsPageRoutingModule, RouterModule, CommonModule, HtmlPagesModule, BreadcrumbsModule
   ],
   declarations: [
     ProjectsPageComponent