diff --git a/src/app/app.component.html b/src/app/app.component.html index 3d54969..cafc34b 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,11 +2,11 @@
- diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1e0d321..6c15cba 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -253,6 +253,10 @@ export class AppComponent implements OnInit, OnDestroy { this.router.navigate([], {relativeTo: this.route}); } + public login() { + this.userManagementService.login(); + } + public get open() { return this.layoutService.open; } @@ -261,6 +265,10 @@ export class AppComponent implements OnInit, OnDestroy { return this.stakeholder && !this.hasPermission(this.view?this.view:this.stakeholder.visibility); } + get monitorLink() { + return "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu'; + } + private setSideBar() { let items: MenuItem[] = []; if (this.hasPermission(this.view?this.view:this.stakeholder.visibility)) { @@ -366,7 +374,7 @@ export class AppComponent implements OnInit, OnDestroy { }; } } else { - 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.userMenuItems.push(new MenuItem("", "User information", this.monitorLink + '/user-info', '', false, [], [], {}, null, null, null, null, "_self")); this.menuHeader = { route: null, url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu', @@ -379,13 +387,13 @@ export class AppComponent implements OnInit, OnDestroy { }; this.menuItems.push( new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, - "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/browse', "", false, [], null, {}, null, null, null, null, "_self") + this.monitorLink + '/browse', "", false, [], null, {}, null, null, null, null, "_self") ); - this.resourcesService.setResources(this.menuItems, '', "https://" + (this.properties.environment === 'beta' ? 'beta.' : '') + 'monitor.openaire.eu'); + this.resourcesService.setResources(this.menuItems, '', this.monitorLink); let about = new MenuItem("about", "About", "", "", false, [], null, {}); about.items = [ - new MenuItem("how-it-works", "How it works", "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/about/how-it-works', "", false, [], null, {}, null, null, null, null, "_self"), - new MenuItem("faqs", "FAQs", "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/about/faqs',"", false, [], null, {}, null, null, null, null, "_self") + new MenuItem("how-it-works", "How it works", this.monitorLink + '/about/how-it-works', "", false, [], null, {}, null, null, null, null, "_self"), + new MenuItem("faqs", "FAQs", this.monitorLink + '/about/faqs',"", false, [], null, {}, null, null, null, null, "_self") ] this.menuItems.push(about); if (this.hasAdminMenu) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 959e51b..c57b304 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -25,6 +25,8 @@ import {AdminDashboardGuard} from "./utils/adminDashboard.guard"; import {NotificationsSidebarModule} from "./openaireLibrary/notifications/notifications-sidebar/notifications-sidebar.module"; import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard"; import {IconsModule} from "./openaireLibrary/utils/icons/icons.module"; +import {IconsService} from "./openaireLibrary/utils/icons/icons.service"; +import {incognito} from "./openaireLibrary/utils/icons/icons"; @NgModule({ @@ -64,4 +66,7 @@ import {IconsModule} from "./openaireLibrary/utils/icons/icons.module"; }) // export class AppModule { + constructor(private iconsService: IconsService) { + this.iconsService.registerIcons([incognito]) + } } diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 3cea78d..5722641 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -102,7 +102,7 @@ [class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
{{indicator.name}}
-
+
{{numberResults.get(i + '-' + j) | numberRound}} --
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 328198b..789a022 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 328198b6a56c3f3ecb38c7928073914a9609ddc0 +Subproject commit 789a0225faced2d0f37c33c9e35b5827580d9beb diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index ebddaca..18361d8 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -67,7 +67,7 @@
{{indicator.name}}
-
+
{{numberResults.get(i + '-' + j) | numberRound}} --
diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 3f03f75..6d6e5d7 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -93,7 +93,7 @@ -