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: ` -
-
- +
+
+
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: ` -
-
- +
+
+
- +
` }) 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: ` -
-
- +
+
+
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