diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 60c8b1c..a0f64d6 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -41,8 +41,7 @@ export class AppComponent implements OnInit {
logoUrl: null,
logoSmallUrl: null,
position: 'center',
- badge: false,
- stickyAnimation: false
+ badge: false
};
userMenuItems: MenuItem[] = [];
loading: boolean = true;
@@ -178,12 +177,11 @@ export class AppComponent implements OnInit {
}
private buildMenu() {
- this.menuItems = [];
this.userMenuItems = [];
this.sideBarItems = [];
if (this.user) {
if (this.isCurator()) {
- this.userMenuItems.push(new MenuItem("", "Manage communities",
+ this.userMenuItems.push(new MenuItem("", "Manage Gateways",
"", "/", false, [], [], {}));
}
if (Session.isPortalAdministrator(this.user)) {
@@ -208,8 +206,7 @@ export class AppComponent implements OnInit {
logoUrl: this.headerLogoUrl,
logoSmallUrl: this.headerLogoUrl,
position: 'left',
- badge: false,
- stickyAnimation: false
+ badge: false
};
this.sideBarItems.push(new MenuItem("community", "Community Info", "", "/" + this.community.communityId, false, [], [], {}, {name: 'badge'}, null, null, "/" + this.community.communityId + "/info"));
this.sideBarItems.push(new MenuItem("users", "Users", "", "/" + this.community.communityId + "/users", false, [], [], {}, {name: 'group'}, null, null, "/" + this.community.communityId + "/users"));
@@ -218,7 +215,7 @@ export class AppComponent implements OnInit {
if (this.community.type === 'ri') {
this.sideBarItems.push(new MenuItem("mining", "Mining", "", "/" + this.community.communityId + "/mining/manage-profiles", false, [], [], {}, {svg: mining.data}, null, null, "/" + this.community.communityId + "/mining"));
}
- this.specialSideBarMenuItem = new MenuItem("back", "Manage communities", "", "/", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'});
+ this.specialSideBarMenuItem = new MenuItem("back", "Manage Gateways", "", "/", false, [], null, {}, {name: 'west'});
this.menuItems = [];
this.menuItems.push({
@@ -278,16 +275,31 @@ export class AppComponent implements OnInit {
this.headerUrl = 'https://' + ((properties.environment !== 'production')?'beta.':'') + 'connect.openaire.eu';
this.menuHeader = {
route: null,
- url: null,
- title: 'Research Community Dashboard',
- logoUrl: null,
- logoSmallUrl: null,
- position: 'center',
- badge: false,
- stickyAnimation: false
+ url: this.headerUrl,
+ title: "Monitor",
+ logoUrl: 'assets/common-assets/logo-services/connect/small.svg',
+ logoSmallUrl: "assets/common-assets/logo-services/connect/small.svg",
+ position: 'left',
+ badge: true,
+ menuPosition: "center"
};
+ this.menuItems = [];
+ this.menuItems.push({
+ rootItem: new MenuItem("about", "About", this.headerUrl + "/about/learn-how", "", false, [], [], {}, null, null, null, null, "_self"),
+ items: [
+ new MenuItem("", "Learn the process", this.headerUrl + "/about/learn-how", "", false, [], [], {}, null, null, null, null, "_self"),
+ new MenuItem("", "Publications", this.headerUrl + "/publications", "", false, [], [], {}, null, null, null, null, "_self"),
+ new MenuItem("", "Roadmap", "https://trello.com/b/yfzUz0kp/openaire-connect-dashboard", "", false, [], [], {}),
+ new MenuItem("", "FAQs", this.headerUrl + "/about/faq", "", false, [], [], {}, null, null, null, null, "_self")
+ ]
+
+ });
+ this.menuItems.push({
+ rootItem: new MenuItem("communities", "Communities", this.headerUrl + "/search/find/communities", "", false, [], [], {}, null, null, null, null, "_self"),
+ items: []
+ });
if(this.isCurator()) {
- this.sideBarItems.push(new MenuItem("communities", "Manage Communities", "", "/", false, [], [], {}, {name: 'settings'}));
+ this.sideBarItems.push(new MenuItem("communities", "Manage Gateways", "", "/", false, [], [], {}, {name: 'settings'}));
}
if (Session.isPortalAdministrator(this.user)) {
this.sideBarItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, '/admin-tools'));
@@ -296,7 +308,7 @@ export class AppComponent implements OnInit {
}
this.specialSideBarMenuItem = null;
}
- this.hasSidebar = this.hasSidebar && this.sideBarItems.length > 0;
+ this.hasSidebar = this.hasSidebar && this.sideBarItems.length > 1;
}
private isCurator() {
diff --git a/src/app/pages/affiliations/affiliations.component.html b/src/app/pages/affiliations/affiliations.component.html
index 3670142..5144275 100644
--- a/src/app/pages/affiliations/affiliations.component.html
+++ b/src/app/pages/affiliations/affiliations.component.html
@@ -1,10 +1,10 @@
-
+
-
Admin Dashboard - Manage Organizations
+
Admin Dashboard - Manage Organizations
-
{{community.shortTitle}}
+
{{community.shortTitle}}
diff --git a/src/app/pages/claims/claims.component.ts b/src/app/pages/claims/claims.component.ts
index 4bed805..6fd18c1 100644
--- a/src/app/pages/claims/claims.component.ts
+++ b/src/app/pages/claims/claims.component.ts
@@ -11,11 +11,11 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit
template: `
-
+
-
Admin Dashboard - Manage Links
+
Admin Dashboard - Manage Links
-
{{community.shortTitle}}
+
{{community.shortTitle}}
diff --git a/src/app/pages/community-info/community-info.component.ts b/src/app/pages/community-info/community-info.component.ts
index c809436..87d9c03 100644
--- a/src/app/pages/community-info/community-info.component.ts
+++ b/src/app/pages/community-info/community-info.component.ts
@@ -7,7 +7,7 @@ import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFie
@Component({
selector: 'community-info',
template: `
-
+
- Profile
- Organizations
- {{openAIREEntities.PROJECTS}}
diff --git a/src/app/pages/community-info/profile/profile.component.ts b/src/app/pages/community-info/profile/profile.component.ts
index f3f225a..c455273 100644
--- a/src/app/pages/community-info/profile/profile.component.ts
+++ b/src/app/pages/community-info/profile/profile.component.ts
@@ -12,12 +12,12 @@ import {Subscription} from "rxjs";
template: `
-
+
-
Admin Dashboard - Manage Community
+
Admin Dashboard - Manage Community
Profile
-
{{community.shortTitle}}
+
{{community.shortTitle}}
diff --git a/src/app/pages/content-providers/remove-content-providers.component.html b/src/app/pages/content-providers/remove-content-providers.component.html
index 08e3d7e..d921b24 100644
--- a/src/app/pages/content-providers/remove-content-providers.component.html
+++ b/src/app/pages/content-providers/remove-content-providers.component.html
@@ -1,10 +1,10 @@
-
+
-
Admin Dashboard - Manage
{{openAIREEntities.DATASOURCES}}
+
Admin Dashboard - Manage {{openAIREEntities.DATASOURCES}}
-
{{community.shortTitle}}
+
{{community.shortTitle}}
diff --git a/src/app/pages/manage-communities/manage-communities.component.ts b/src/app/pages/manage-communities/manage-communities.component.ts
index f58d8a4..f31efd2 100644
--- a/src/app/pages/manage-communities/manage-communities.component.ts
+++ b/src/app/pages/manage-communities/manage-communities.component.ts
@@ -20,15 +20,15 @@ type Tab = 'all' | 'communities' | 'ris';
template: `
-
+
-
+
Admin Dashboard - Manage Communities
-
Research Communities & Initiatives
+
Research Communities & Initiatives
-
+
- All
- Research Communities
diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html
index 227c3c4..8b84132 100644
--- a/src/app/pages/projects/remove-projects.component.html
+++ b/src/app/pages/projects/remove-projects.component.html
@@ -1,10 +1,10 @@
-
+
-
Admin Dashboard - Manage {{openaireEntiites.PROJECTS}}
+
Admin Dashboard - Manage {{openaireEntiites.PROJECTS}}
-
{{community.shortTitle}}
+
{{community.shortTitle}}
diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html
index f21204a..bb4547e 100644
--- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html
+++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html
@@ -1,10 +1,10 @@
-
+
-
Admin Dashboard - Manage Subjects
+
Admin Dashboard - Manage Subjects
-
{{community.shortTitle}}
+
{{community.shortTitle}}
diff --git a/src/app/pages/usernotifications/manage-user-notifications.component.html b/src/app/pages/usernotifications/manage-user-notifications.component.html
index a122c82..a498c34 100644
--- a/src/app/pages/usernotifications/manage-user-notifications.component.html
+++ b/src/app/pages/usernotifications/manage-user-notifications.component.html
@@ -1,9 +1,9 @@
-
+
-
Admin Dashboard - Manage Notification Settings
-
{{community.shortTitle}}
+
Admin Dashboard - Manage Notification Settings
+
{{community.shortTitle}}
diff --git a/src/app/pages/users/personal-info/personal-info.component.ts b/src/app/pages/users/personal-info/personal-info.component.ts
index 527850b..c5c311b 100644
--- a/src/app/pages/users/personal-info/personal-info.component.ts
+++ b/src/app/pages/users/personal-info/personal-info.component.ts
@@ -24,12 +24,12 @@ declare var UIkit;
template: `
-
+
-
Admin Dashboard - Manage Personal Info &
+
Admin Dashboard - Manage Personal Info &
Affiliations
-
{{community.shortTitle}}
+
{{community.shortTitle}}
diff --git a/src/app/pages/users/users-managers/users-managers.component.ts b/src/app/pages/users/users-managers/users-managers.component.ts
index f179ea8..46737f6 100644
--- a/src/app/pages/users/users-managers/users-managers.component.ts
+++ b/src/app/pages/users/users-managers/users-managers.component.ts
@@ -13,10 +13,10 @@ import {CommunityInfo} from "../../../openaireLibrary/connect/community/communit
template: `
-
+
-
Admin Dashboard - Manage Managers
-
{{community.shortTitle}}
+
Admin Dashboard - Manage Users
+
{{community.shortTitle}}
diff --git a/src/app/pages/users/users-subscribers/users-subscribers.component.ts b/src/app/pages/users/users-subscribers/users-subscribers.component.ts
index 65f769e..47957ca 100644
--- a/src/app/pages/users/users-subscribers/users-subscribers.component.ts
+++ b/src/app/pages/users/users-subscribers/users-subscribers.component.ts
@@ -10,10 +10,10 @@ import {CommunityInfo} from "../../../openaireLibrary/connect/community/communit
template: `
-
+
-
Admin Dashboard - Manage Members
-
{{community.shortTitle}}
+
Admin Dashboard - Manage Users
+
{{community.shortTitle}}
diff --git a/src/app/pages/users/users-tabs.component.ts b/src/app/pages/users/users-tabs.component.ts
index 0aa8df2..9a643fa 100644
--- a/src/app/pages/users/users-tabs.component.ts
+++ b/src/app/pages/users/users-tabs.component.ts
@@ -7,7 +7,7 @@ import {ActivatedRoute} from '@angular/router';
@Component({
selector: 'users-tabs',
template: `
-