diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0505ffa..71f54ac 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -17,6 +17,7 @@ import {StakeholderUtils} from "./utils/indicator-utils";
import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
import {ResourcesService} from "./openaireLibrary/monitor/services/resources.service";
+import {StringUtils} from "./openaireLibrary/utils/string-utils.class";
@Component({
@@ -245,7 +246,7 @@ export class AppComponent implements OnInit, OnDestroy {
this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, {name: 'bar_chart'}));
if (this.stakeholder.defaultId) {
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)) {
+ if (this.isCurator()) {
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"));
}
}
@@ -261,15 +262,15 @@ export class AppComponent implements OnInit, OnDestroy {
this.menuItems = [];
this.userMenuItems = [];
if (this.user) {
- if (this.isCurator()) {
+ if (this.isKindOfMonitorManager()) {
this.userMenuItems.push(new MenuItem("", "Manage profiles",
"", "/admin", false, [], [], {}));
}
if (Session.isPortalAdministrator(this.user)) {
this.userMenuItems.push(new MenuItem("adminOptions", "Super Admin options", "", "/admin/admin-tools/portals", false, [], [], {}));
}
- if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)) {
- this.userMenuItems.push(new MenuItem("monitorOptions", "Monitor portal options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}));
+ if (this.isCurator()) {
+ this.userMenuItems.push(new MenuItem("monitorOptions", "Monitor options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}));
}
}
if (this.stakeholder) {
@@ -286,7 +287,7 @@ export class AppComponent implements OnInit, OnDestroy {
null, null, null, null),
items: []
});
- if(this.properties.environment !== 'production') {
+ if (this.properties.environment !== 'production') {
this.resourcesService.setResourcesDeprecated(this.menuItems, "/" + this.stakeholder.alias);
} else {
this.menuItems.push({
@@ -319,10 +320,23 @@ export class AppComponent implements OnInit, OnDestroy {
url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu',
title: "Monitor",
logoUrl: 'assets/common-assets/logo-services/monitor/small-inverted.svg',
- logoSmallUrl: "assets/common-assets/logo-services/monitor/small-inverted.svg",
+ logoSmallUrl: "assets/common-assets/logo-services/monitor/small.svg",
position: 'center',
badge: true,
- menuPosition: "center"
+ darkBg: true,
+ menuPosition: "center",
+ replaceHeader: {
+ route: './' + this.stakeholder.alias,
+ url: null,
+ title: this.stakeholder.name,
+ logoUrl: StringUtils.getLogoUrl(this.stakeholder),
+ logoSmallUrl: StringUtils.getLogoUrl(this.stakeholder),
+ logoInfo: '
Dashboard
' +
+ '
' + this.stakeholder.name + '
',
+ position: 'center',
+ badge: true,
+ menuPosition: "center"
+ }
};
} else {
this.menuHeader = {
@@ -333,65 +347,65 @@ export class AppComponent implements OnInit, OnDestroy {
logoSmallUrl: "assets/common-assets/logo-services/monitor/small.svg",
position: 'center',
badge: true,
- menuPosition: "center"
+ menuPosition: "center",
+ replaceHeader: {
+ route: './' + this.stakeholder.alias,
+ url: null,
+ title: this.stakeholder.name,
+ logoUrl: StringUtils.getLogoUrl(this.stakeholder),
+ logoSmallUrl: StringUtils.getLogoUrl(this.stakeholder),
+ position: 'center',
+ badge: true,
+ menuPosition: "center"
+ }
};
}
} else {
- if (this.isFrontPage || !this.hasAdminMenu) {
- this.userMenuItems.push(new MenuItem("", "User information", "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/user-info', '', false, [], [], {}, null, null, null, null, "_self"));
- this.menuHeader = {
- route: null,
- url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu',
- title: "Monitor",
- logoUrl: 'assets/common-assets/logo-services/monitor/main.svg',
- logoSmallUrl: "assets/common-assets/logo-services/monitor/small.svg",
- position: 'left',
- badge: true,
- menuPosition: "center"
- };
- this.menuItems.push({
- rootItem: new MenuItem("about", "About",
- "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/about/learn-how', "", false, [], null, {}, null, null, null, null, "_self"),
- items: []
- });
- if(this.properties.environment === 'development') {
- // @ts-ignore
- this.resourcesService.setResourcesDeprecated(this.menuItems, '', "https://" + (this.properties.environment === 'beta' ? 'beta.' : '') + 'monitor.openaire.eu');
- }
- this.menuItems.push({
- rootItem: new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS,
- "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/browse', "", false, [], null, {}, null, null, null, null, "_self"),
- items: []
- });
- } else {
- this.userMenuItems.push(new MenuItem("", "User information", "", "/admin/user-info", false, [], [], {}));
- this.menuHeader = {
- route: "/",
- url: null,
- title: "Monitor Dashboard",
- logoUrl: null,
- logoSmallUrl: null,
- position: 'center',
- badge: false,
- stickyAnimation: true,
- menuPosition: "center"
- };
+ this.userMenuItems.push(new MenuItem("", "User information", "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/user-info', '', false, [], [], {}, null, null, null, null, "_self"));
+ this.menuHeader = {
+ route: null,
+ url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu',
+ title: "Monitor",
+ logoUrl: 'assets/common-assets/logo-services/monitor/main.svg',
+ logoSmallUrl: "assets/common-assets/logo-services/monitor/small.svg",
+ position: 'left',
+ badge: true,
+ menuPosition: "center"
+ };
+ this.menuItems.push({
+ rootItem: new MenuItem("about", "About",
+ "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/about/learn-how', "", false, [], null, {}, null, null, null, null, "_self"),
+ items: []
+ });
+ if (this.properties.environment === 'development') {
+ // @ts-ignore
+ this.resourcesService.setResourcesDeprecated(this.menuItems, '', "https://" + (this.properties.environment === 'beta' ? 'beta.' : '') + 'monitor.openaire.eu');
+ }
+ this.menuItems.push({
+ rootItem: new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS,
+ "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/browse', "", false, [], null, {}, null, null, null, null, "_self"),
+ items: []
+ });
+ if (this.hasAdminMenu) {
this.adminMenuItems = [];
this.specialSideBarMenuItem = 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'));
+ this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, '/admin/admin-tools'));
}
if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)) {
- this.adminMenuItems.push(new MenuItem("monitor", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, '/admin/monitor/admin-tools'));
+ this.adminMenuItems.push(new MenuItem("monitor", "Monitor options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, '/admin/monitor/admin-tools'));
}
- this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 0;
+ this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 1;
}
}
-
}
public isCurator() {
+ return this.user && (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user));
+ }
+
+ public isKindOfMonitorManager() {
return this.user && (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isKindOfMonitorManager(this.user));
}
diff --git a/src/app/general/general.component.html b/src/app/general/general.component.html
index 8642b4e..c104f67 100644
--- a/src/app/general/general.component.html
+++ b/src/app/general/general.component.html
@@ -1,10 +1,10 @@
-
+
-
Admin Dashboard - Manage Profile
-
{{stakeholder.name}} (unsaved changes)
+
Admin Dashboard - Manage Profile
+
{{stakeholder.name}} (unsaved changes)
diff --git a/src/app/manageStakeholders/manageStakeholders-routing.module.ts b/src/app/manageStakeholders/manageStakeholders-routing.module.ts
index 595da18..09aaccc 100644
--- a/src/app/manageStakeholders/manageStakeholders-routing.module.ts
+++ b/src/app/manageStakeholders/manageStakeholders-routing.module.ts
@@ -9,8 +9,7 @@ import {ManageStakeholdersComponent} from "./manageStakeholders.component";
{
path: '',
component: ManageStakeholdersComponent,
- canDeactivate: [PreviousRouteRecorder],
- data: {hasSidebar: true}
+ canDeactivate: [PreviousRouteRecorder]
}
])
]
diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html
index 9fb9893..6760158 100644
--- a/src/app/manageStakeholders/manageStakeholders.component.html
+++ b/src/app/manageStakeholders/manageStakeholders.component.html
@@ -1,13 +1,13 @@
-
+
-
Admin Dashboard - Manage profiles
-
Profile Templates & Profiles
+
Admin Dashboard - Manage profiles
+
Profile Templates & Profiles
-
+
- All
- Profile templates
- Profiles
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index e79e311..66462fc 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -37,41 +37,43 @@
-
-
0" header>
-
+
+
+
-
Dashboard
-
{{stakeholder.name}}
+
Dashboard
+
{{stakeholder.name}}
-
-
+
0" class="uk-margin-medium-top" actions>
+
1" class="uk-flex uk-flex-right uk-margin-top">
+
+
-
-
- {{activeSubCategory.description}}
-
-
0) ||
- (activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
- (activeTopic && activeTopic.description && activeTopic.description.length > 0))" class="uk-text-center">
-
- {{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
- : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
- (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
-
+
+ {{activeSubCategory.description}}
+
+
0) ||
+ (activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
+ (activeTopic && activeTopic.description && activeTopic.description.length > 0))" class="uk-text-center">
+
+ {{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
+ : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
+ (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
-
-
-
- No indicators available yet. Stay tuned!
-
-
-
-
-
- 0" class="uk-grid uk-margin-medium-bottom" uk-grid
- uk-height-match="target: .uk-card">
-
{{number.title}}
-
-
-
-
-
-
- {{numberResults.get(i + '-' + j) | number}}
- --
-
-
-
{{numberResults.get(i + '-' + j) | number}}
-
-
{{indicator.name}}
+
+
+
+
+ No indicators available yet. Stay tuned!
+
+
+
+
+
+ 0" class="uk-grid uk-margin-medium-bottom" uk-grid
+ uk-height-match="target: .uk-card">
+
{{number.title}}
+
+
+
+
+
+
+ {{numberResults.get(i + '-' + j) | number}}
+ --
-
-
-
-
-
-
-
-
- {{indicator.description}}
-
-
- {{indicator.additionalDescription}}
-
-
+
+
{{numberResults.get(i + '-' + j) | number}}
+
+
{{indicator.name}}
+
+
+
+
+
+
+
+
+
+ {{indicator.description}}
+
+
+ {{indicator.additionalDescription}}
+
+
+
+
+
+
+
+
+ 0"
+ class="uk-grid uk-grid-column-medium uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid
+ uk-height-match="target: .uk-card">
+
{{chart.title}}
+
+
+
+
+
+
{{indicator.name + " "}}
+
+
1" class="uk-button-group">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{indicator.description}}
+
+
+ {{indicator.additionalDescription}}
+
+
+
+
+
-
- 0"
- class="uk-grid uk-grid-column-medium uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid
- uk-height-match="target: .uk-card">
-
{{chart.title}}
-
-
-
-
-
-
{{indicator.name + " "}}
-
-
1" class="uk-button-group">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{indicator.description}}
-
-
- {{indicator.additionalDescription}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Powered by
-
OpenAIRE Research Graph
-
- . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}}
-
-
-
-
-
Send us your
-
feedback
-
.
-
+
+
+
+
+
Powered by
+
OpenAIRE Research Graph
+
+ . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}}
+
-
-
+
+
+
Send us your
+
feedback
+
.
+
+
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index fd9794e..6a7559a 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit fd9794ec3aa5fd031a3642febf4c2a4d20425cd7
+Subproject commit 6a7559a3ad226e25eeea9c39cb62fa960438d6ef
diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html
index e087cd1..dcf1d3d 100644
--- a/src/app/topic/topic.component.html
+++ b/src/app/topic/topic.component.html
@@ -142,17 +142,17 @@
0 && stakeholder.topics[topicIndex]">
-
+
-
Admin Dashboard - Manage Indicators
-
{{stakeholder.name}}
+
Admin Dashboard - Manage Indicators
+
{{stakeholder.name}}
-
+
-
diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html
index 73aaf4f..8f67c8f 100644
--- a/src/app/users/users.component.html
+++ b/src/app/users/users.component.html
@@ -5,14 +5,14 @@
-
+
-
Admin Dashboard - Manage {{users}}
-
{{stakeholder.name}}
+
Admin Dashboard - Manage Users
+
{{stakeholder.name}}
-
+
diff --git a/src/assets/common-assets b/src/assets/common-assets
index c645362..adf1b6d 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit c645362896b10ae00563f38337aa0011c640cb20
+Subproject commit adf1b6d5f5e8fb1568615b0fc596a0f39beab3e6
diff --git a/src/assets/monitor-dashboard-custom.less b/src/assets/monitor-dashboard-custom.less
index bef5a29..7ac91eb 100644
--- a/src/assets/monitor-dashboard-custom.less
+++ b/src/assets/monitor-dashboard-custom.less
@@ -32,6 +32,7 @@
@list-primary-color: @monitor-color;
/* Navbar */
+ @inverse-navbar-background: @monitor-color;
@inverse-navbar-background-image: url("banner.jpg");
/** Text */
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index ee5eeb0..eb5739a 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit ee5eeb0ccc7e8a1b7086730fbce597faa9b25b13
+Subproject commit eb5739ab8271aa71c8e58998ab88c61878f8788d