Merge from develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monitor-dashboard",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",

src/app/app.component.html

@@ -4,6 +4,9 @@
 <div *ngIf="!loading" [class.monitor]="isFrontPage">
     <div id="modal-container"></div>
     <ng-container *ngIf="!isHidden">
+        <div *ngIf="divContents && divContents['banner']" class="uk-tile uk-tile-default uk-padding uk-border-bottom">
+            <helper [texts]="divContents['banner']"></helper>
+        </div>
         <navbar *ngIf="hasHeader" portal="monitor_dashboard" [header]="menuHeader" [userMenuItems]=userMenuItems
                 [menuItems]="menuItems" [user]="user"
                 [notificationConfiguration]="isMobile && user && notificationGroupsInitialized?notificationConfiguration:null"></navbar>

src/app/app.component.ts

@@ -27,6 +27,7 @@ import {
 import {SidebarBaseComponent} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-base.component";
 import {Breadcrumb} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
 import {OpenaireEntities} from './openaireLibrary/utils/properties/searchFields';
+import {HelperService} from "./openaireLibrary/utils/helper/helper.service";
 
 
 @Component({
@@ -73,6 +74,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
   paramsSubscription: Subscription;
   openaireEntities = OpenaireEntities;
   activeType: StakeholderType;
+  divContents: any;
 
   constructor(protected _route: ActivatedRoute,
               protected _router: Router,
@@ -82,6 +84,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
               private smoothScroll: SmoothScroll,
               private stakeholderService: StakeholderService,
               private configurationService: ConfigurationService,
+              private helper: HelperService,
               private resourcesService: ResourcesService) {
     super();
     this.initRouterParams(_route, event => {
@@ -92,6 +95,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
 
   ngOnInit() {
     super.ngOnInit();
+    this.getDivContents();
     if (typeof document !== 'undefined' && window) {
       this.innerWidth = window.innerWidth;
     }
@@ -266,7 +270,13 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
     this.configurationService.clearSubscriptions();
     this.smoothScroll.clearSubscriptions();
   }
-  
+
+  private getDivContents() {
+    this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', '/').subscribe(contents => {
+      this.divContents = contents;
+    }));
+  }
+
   private navigateToError() {
     this._router.navigate([this.properties.errorLink], {queryParams: {'page': this.properties.baseLink + this._router.url}});
   }

src/app/app.module.ts

@@ -34,6 +34,7 @@ import {CustomRouteReuseStrategy} from "./openaireLibrary/shared/custom-route-re
 import {RouteReuseStrategy} from "@angular/router";
 import {LogoUrlPipeModule} from './openaireLibrary/utils/pipes/logoUrlPipe.module';
 import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.module';
+import {HelperModule} from "./openaireLibrary/utils/helper/helper.module";
 
 @NgModule({
 
@@ -51,7 +52,7 @@ import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs
     AppRoutingModule,
     SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule, NotificationsSidebarModule, IconsModule, CacheIndicatorsModule,
     LogoUrlPipeModule,
-    BreadcrumbsModule
+    BreadcrumbsModule, HelperModule
   ],
   declarations: [AppComponent, OpenaireErrorPageComponent],
   exports: [AppComponent],

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit ef5f6c9f5b0ed8f695b9592c9c391ba449e5443c
+Subproject commit a5c908988c7b4ab8f17b31c65bcc08792c11cdca

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit c5ba8700be5b8fcf98522fe167246281545d7985
+Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit c7848e0107c9505116f0951b2669429629b82735
+Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13

src/environments/environment.beta.ts

@@ -3,6 +3,7 @@ import {common, commonBeta} from "../app/openaireLibrary/utils/properties/enviro
 
 let props: EnvProperties = {
   dashboard: 'monitor',
+  adminToolsPortalType: "monitor",
   isDashboard: true,
   enablePiwikTrack: true,
   monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/",

src/environments/environment.prod.ts

@@ -3,6 +3,7 @@ import {common, commonProd} from "../app/openaireLibrary/utils/properties/enviro
 
 let props: EnvProperties = {
   dashboard: 'monitor',
+  adminToolsPortalType: "monitor",
   isDashboard: true,
   enablePiwikTrack: true,
   monitorStatsFrameUrl: "https://services.openaire.eu/stats-tool/",