diff --git a/package.json b/package.json index c663f4a..3f44cd5 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.12.0", + "uikit": "3.12.2", "zone.js": "~0.11.4" }, "devDependencies": { diff --git a/src/app/about/how-it-works.component.ts b/src/app/about/how-it-works.component.ts index a436835..acf688d 100644 --- a/src/app/about/how-it-works.component.ts +++ b/src/app/about/how-it-works.component.ts @@ -319,7 +319,7 @@ import {StakeholderEntities} from "../openaireLibrary/monitor/entities/stakehold -
+
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b66ef22..c1df23d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -30,8 +30,8 @@ import {ResourcesService} from "./openaireLibrary/monitor/services/resources.ser -
- Get Started + Get Started @@ -172,6 +172,9 @@ export class AppComponent { public buildMenu() { this.menuItems = []; + this.menuItems.push( + new MenuItem("home", "Home", "", "/", false, [], null, {}, null, null, "uk-hidden@m") + ); this.menuItems.push( new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {}) ); diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.html b/src/app/browse-stakeholder/browse-stakeholder.component.html index 49bc11d..e73d814 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.html +++ b/src/app/browse-stakeholder/browse-stakeholder.component.html @@ -9,11 +9,11 @@
+ class="uk-position-top-right uk-margin-small-top uk-margin-small-right uk-flex uk-flex-column uk-flex-middle uk-position-z-index"> {{stakeholder.visibility.toLowerCase()}}
-
+
OpenAIRE placeholder logo diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.ts b/src/app/browse-stakeholder/browse-stakeholder.component.ts index f630d4a..5b6425b 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.ts +++ b/src/app/browse-stakeholder/browse-stakeholder.component.ts @@ -7,6 +7,7 @@ import {properties} from "../../environments/environment" import {LocalStorageService} from "../openaireLibrary/services/localStorage.service"; import {Subscriber} from "rxjs"; import {StringUtils} from "../openaireLibrary/utils/string-utils.class"; +import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; @Component({ selector: 'browse-stakeholder', @@ -27,15 +28,23 @@ export class BrowseStakeholderComponent { constructor(private route: ActivatedRoute, private router: Router, private location: Location, - private localStorageService: LocalStorageService) { + private localStorageService: LocalStorageService, + private layoutService: LayoutService) { } public ngOnInit() { this.properties = properties; - this.subscriptions.push(this.localStorageService.get().subscribe(value => { - this.directLink = value; + this.subscriptions.push(this.layoutService.isMobile.subscribe(value => { + if(value) { + this.directLink = true; + } else { + this.subscriptions.push(this.localStorageService.get().subscribe(value => { + this.directLink = value; + })); + } })); + } ngOnDestroy() { diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5bcc25f..259182b 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5bcc25fe849d87d8570d7ec7ebe6650642ef1de2 +Subproject commit 259182b7c4e93079af045335d09d18c836402071 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index c4e2781..f264617 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit c4e2781acc42f281265a70d6cd75616cdd6fa762 +Subproject commit f264617e5ab356c4279ee1ef1819db434fec4fba