From 1e6bd99fa2495de6a37572cfd45f10835f0d992c Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 21 Jun 2022 19:37:21 +0300
Subject: [PATCH] [Connect & Library | new-theme]: Breadcrumbs position updated
 in html pages | Bug fix in custom menu items | In search menu, use
 OpenaireEntities. 1. app.component.ts: In search menu, use OpenaireEntities.
 2. navigationBar.component.ts: [Bug fix] In method "isTheActiveMenu()",
 update condition to "if(menu instanceof MenuItem || !menu.rootItem)" - custom
 menu items via admin tools are MenuItems but not instanceof MenuItem. 3.
 projectsPage.component.ts & nationalBulletinsPage.component.ts &
 contentPage.component.ts: Margins & paddings updated, so that breadcrumb is
 at the same position on all pages.

---
 src/app/app.component.ts                                  | 7 ++++---
 src/app/content/contentPage.component.ts                  | 6 +++---
 .../nationalBulletins/nationalBulletinsPage.component.ts  | 8 ++++----
 src/app/htmlPages/projects/projectsPage.component.ts      | 7 +++----
 src/app/openaireLibrary                                   | 2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index dd7f80e..bf9c797 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -28,6 +28,7 @@ import {AlertModal} from "./openaireLibrary/utils/modal/alert";
 import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.component";
 import {Composer} from "./openaireLibrary/utils/email/composer";
 import {NotificationHandler} from "./openaireLibrary/utils/notification-handler";
+import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields";
 
 @Component({
   selector: 'app-root',
@@ -280,9 +281,9 @@ export class AppComponent implements OnInit, OnDestroy {
         {
           rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
           items: [
-            new MenuItem("", "Research outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
-            new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
-            new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
+            new MenuItem("", OpenaireEntities.RESULTS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
+            new MenuItem("", OpenaireEntities.PROJECTS, "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
+            new MenuItem("", OpenaireEntities.DATASOURCES, "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
           ]
         });
       this.menuItems.push(
diff --git a/src/app/content/contentPage.component.ts b/src/app/content/contentPage.component.ts
index 98107df..4b4b43b 100644
--- a/src/app/content/contentPage.component.ts
+++ b/src/app/content/contentPage.component.ts
@@ -4,9 +4,9 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
 @Component({
   selector: 'content',
   template: `
-    <div class="">
-      <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 class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
+      <div class="uk-padding-small uk-padding-remove-horizontal">
+        <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
       </div>
       <html-page description="Sources and methodology" pageTitle="Sources and methodology"></html-page>
     </div>
diff --git a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
index 61fdd33..323b4ba 100644
--- a/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
+++ b/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
@@ -4,11 +4,11 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
 @Component({
   selector: 'national-bulletin',
   template: `
-    <div class="">
-      <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 class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
+      <div class="uk-padding-small uk-padding-remove-horizontal">
+        <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
       </div>
-     <html-page description="National Bulletins" pageTitle="National Bulletins"></html-page>
+      <html-page description="National Bulletins" pageTitle="National Bulletins"></html-page>
     </div>
   `
 })
diff --git a/src/app/htmlPages/projects/projectsPage.component.ts b/src/app/htmlPages/projects/projectsPage.component.ts
index 68c91b9..1b2895b 100644
--- a/src/app/htmlPages/projects/projectsPage.component.ts
+++ b/src/app/htmlPages/projects/projectsPage.component.ts
@@ -4,10 +4,9 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
 @Component({
   selector: 'projects',
   template: `
-    <div class="">
-      <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 class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
+      <div class="uk-padding-small uk-padding-remove-horizontal">
+        <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
       </div>
       <html-page description="Projects and funding Opportunities" pageTitle="Projects and funding Opportunities"></html-page>
     </div>
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 0c4df8a..bbce674 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 0c4df8a34dd4f518353c5924238eca9d2cf0a91e
+Subproject commit bbce674da9073de8767b6c0ce25a3a72f9294812