diff --git a/angular.json b/angular.json index 071c1a5..4469700 100644 --- a/angular.json +++ b/angular.json @@ -50,8 +50,8 @@ "src/material.scss" ], "scripts": [ - "src/assets/openaire-theme/js/uikit.min.js", - "src/assets/openaire-theme/js/uikit-icons.min.js", + "node_modules/uikit/dist/js/uikit.min.js", + "node_modules/uikit/dist/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" ] }, diff --git a/package.json b/package.json index 6b29064..3295999 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", + "uikit": "3.12.0", "zone.js": "~0.10.2" }, "devDependencies": { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 68a15bc..c9c9030 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,6 +1,6 @@ import {Component, Inject, RendererFactory2, ViewEncapsulation} from '@angular/core'; import {EnvProperties} from './openaireLibrary/utils/properties/env-properties'; -import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; +import {MenuItem} from './openaireLibrary/sharedComponents/menu'; import {AggregatorInfo, PortalAggregators} from "./utils/aggregators"; import {UserManagementService} from "./openaireLibrary/services/user-management.service"; import {User} from "./openaireLibrary/login/utils/helper.class"; @@ -45,7 +45,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields" }) export class AppComponent { isClient: boolean = false; - menuItems: RootMenuItem [] = []; + menuItems: MenuItem [] = []; userMenuItems: MenuItem[] = []; community = null; id: string = null; @@ -120,24 +120,17 @@ export class AppComponent { private buildMenu() { this.menuItems = [ - {rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []}, - { - rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}), - items: [] - }, - { - rootItem: new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], {}), - items: [] - }, - { - rootItem: new MenuItem("link", "Link", "", "/participate/claim", false, [], ["/participate/claim"], {}), - items: [new MenuItem("", "Start linking", "", "/participate/claim", false, [], ["/participate/claim"], {}), - new MenuItem("", "Learn more", this.properties.claimsInformationLink, "", false, [], [], {})] - }, - { - rootItem: new MenuItem("develop", "Develop", "", "/develop", false, [], ["/develop"], {}), - items: [] - } + new MenuItem("home", "Home", "", "/", false, [], null, {}), + new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}), + new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], {}), + new MenuItem("link", "Link", "", "/participate/claim", false, [], ["/participate/claim"], {}, + null, null, null, null, "_blank", "internal", false, + [ + new MenuItem("", "Start linking", "", "/participate/claim", false, [], ["/participate/claim"], {}), + new MenuItem("", "Learn more", this.properties.claimsInformationLink, "", false, [], [], {}) + ] + ), + new MenuItem("develop", "Develop", "", "/develop", false, [], ["/develop"], {}), ]; let params = {}; // params[this.agg.queryFieldName] = this.agg.valueId; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 1e3c9d7..4cec290 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1e3c9d7cba92176af8a8d45f500bdaa97e1cdebc +Subproject commit 4cec2907da5e1bf55cf59930c23dd9a45c569b89 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index eb5739a..f085a90 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit eb5739ab8271aa71c8e58998ab88c61878f8788d +Subproject commit f085a90973b216b89065848dba864e2d581acc84 diff --git a/src/index.html b/src/index.html index 800d21c..5ea0dad 100644 --- a/src/index.html +++ b/src/index.html @@ -44,6 +44,9 @@