From b2bda20498efa1cef2945f6adca9f8e01b368b8b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 1 Mar 2023 15:22:49 +0200 Subject: [PATCH] Change manage profiles to the new Back Item for sidebar. Change back in topics in order to be the same with the back of sidebar --- src/app/app.component.html | 2 +- src/app/app.component.ts | 6 +-- src/app/openaireLibrary | 2 +- src/app/topic/topic.component.html | 62 +++++++++++++++++------------- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 6 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index bcd3c13..6b0bc58 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -10,7 +10,7 @@
- +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1ed197c..aa7cf13 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -43,7 +43,7 @@ export class AppComponent implements OnInit, OnDestroy { isFrontPage: boolean = false; view: Visibility; sideBarItems: MenuItem[] = []; - specialSideBarMenuItem: MenuItem = null; + backItem: MenuItem = null; menuItems: MenuItem[] = []; notificationGroups: Option[] = []; entities: string[]; @@ -314,7 +314,7 @@ export class AppComponent implements OnInit, OnDestroy { this.adminMenuItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, null, "/admin/" + this.stakeholder.alias + "/admin-tools")); } } - this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'}); + this.backItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'west'}); this.sideBarItems = items; this.hasSidebar = this.hasSidebar && this.sideBarItems.length > 0; } @@ -414,7 +414,7 @@ export class AppComponent implements OnInit, OnDestroy { this.menuItems.push(about); if (this.hasAdminMenu) { this.adminMenuItems = []; - this.specialSideBarMenuItem = null; + this.backItem = null; this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'})); if (Session.isPortalAdministrator(this.user)) { this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, '/admin/admin-tools')); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 679cae5..886b50a 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 679cae51f2435a97faf1cc019de854c922e93d14 +Subproject commit 886b50a52c93163113ed6583faf8b054d9390731 diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 21c9de0..c17d7b8 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -1,35 +1,36 @@