diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 3bf9f7e..7d15630 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -24,7 +24,6 @@ const routes: Routes = [
{
path: 'admin',
loadChildren: () => import('./manageStakeholders/manageStakeholders.module').then(m => m.ManageStakeholdersModule),
- data: {hasAdminMenu: true},
canActivateChild: [LoginGuard]
},
{
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 0bc74dd..7a4d88f 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -4,7 +4,7 @@
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 6de1adf..661f0d0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -10,7 +10,6 @@ import {MenuItem, RootMenuItem} from "./openaireLibrary/sharedComponents/menu";
import {Stakeholder, Topic, Visibility} from "./openaireLibrary/monitor/entities/stakeholder";
import {LinksResolver} from "./search/links-resolver";
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
-import {arrow_left} from "./openaireLibrary/utils/icons/icons";
import {properties} from "../environments/environment";
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
import {Option} from "./openaireLibrary/sharedComponents/input/input.component";
@@ -32,7 +31,6 @@ export class AppComponent implements OnInit, OnDestroy {
hasHeader: boolean = false;
hasAdminMenu: boolean = false;
isFrontPage: boolean = false;
- isDashboard: boolean = false;
isViewPublic: boolean = false;
sideBarItems: MenuItem[] = [];
specialSideBarMenuItem: MenuItem = null;
@@ -111,10 +109,6 @@ export class AppComponent implements OnInit, OnDestroy {
this.isFrontPage = isFrontPage;
this.cdr.detectChanges();
}));
- this.subscriptions.push(this.layoutService.isDashboard.subscribe(isDashboard => {
- this.isDashboard = isDashboard;
- this.cdr.detectChanges();
- }));
this.route.queryParams.subscribe(params => {
this.isViewPublic = (params['view'] == 'public');
});
@@ -241,9 +235,8 @@ export class AppComponent implements OnInit, OnDestroy {
if (this.isPublicOrIsMember(topic.visibility)) {
let topicItem: MenuItem = new MenuItem(topic.alias, topic.name, "", (
'/' + this.stakeholder.alias + '/' + topic.alias),
- null, [], [], {}, null, null, null, (
+ null, [], [], {}, {svg: topic.icon}, null, null, (
'/' + this.stakeholder.alias + '/' + topic.alias));
- topicItem.icon = topic.icon;
items.push(topicItem);
}
});
@@ -339,16 +332,16 @@ export class AppComponent implements OnInit, OnDestroy {
// rootItem: new MenuItem("", "Dashboard",
// "", '/' + this.stakeholder.alias + '/', false, [], null, {}), items: []
// });
- this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/" + this.stakeholder.alias, false, [], [], {}, "
"));
- this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, "
"));
+ this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/" + this.stakeholder.alias, false, [], [], {}, {name: 'badge'}));
+ this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, {name: 'analytics'}));
if (this.stakeholder.defaultId) {
- this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, "
", null, null, "/admin/" + this.stakeholder.alias+"/users"));
+ this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, {name: 'group'}, null, null, "/admin/" + this.stakeholder.alias+"/users"));
if (Session.isPortalAdministrator(this.user)) {
this.adminMenuItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, null, null, null, "/admin/" + this.stakeholder.alias + "/admin-tools"));
}
}
this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {});
- this.specialSideBarMenuItem.icon = '
' + arrow_left.data + ''; // '
';
+ this.specialSideBarMenuItem.icon = {name: 'search', class: 'uk-text-secondary'};
this.specialSideBarMenuItem.customClass = 'uk-text-uppercase uk-text-bold uk-text-secondary';
}
} else {
@@ -393,7 +386,6 @@ export class AppComponent implements OnInit, OnDestroy {
};
this.adminMenuItems = [];
this.specialSideBarMenuItem = null;
- this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "
"));
}
}
diff --git a/src/app/general/general.component.html b/src/app/general/general.component.html
index 7f2dc2b..2ccfb4c 100644
--- a/src/app/general/general.component.html
+++ b/src/app/general/general.component.html
@@ -9,13 +9,12 @@