Compare commits

..

5 Commits

8 changed files with 23 additions and 9 deletions

View File

@ -4,6 +4,9 @@
<div *ngIf="!loading" [class.monitor]="isFrontPage">
<div id="modal-container"></div>
<ng-container *ngIf="!isHidden">
<div *ngIf="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>

View File

@ -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;
}
@ -267,6 +271,12 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
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}});
}

View File

@ -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],

View File

@ -23,7 +23,7 @@
</div>
</div>
</div>
<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top">
<div class="uk-grid uk-flex-middle uk-flex-between@m uk-flex-center uk-margin-large-top" [id]="id" uk-grid>
<div class="uk-flex uk-flex-middle">
<div *ngIf="sortOptions?.length > 0" class="uk-width-small uk-margin-medium-right">
<div input
@ -46,7 +46,7 @@
</paging-no-load>
</div>
</div>
<div class="uk-margin-large-top" id="target">
<div class="uk-margin-large-top">
<div *ngIf="!filteredStakeholders || filteredStakeholders?.length == 0" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-primary uk-text-center uk-width-2-3@m uk-width-1-1">
No {{entities.stakeholders}} available
@ -106,7 +106,7 @@
</div>
</td>
<td>
<div class="uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold" [title]="item.name">
<div class="uk-width-large uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold" [title]="item.name">
{{item.name}}
</div>
</td>

@ -1 +1 @@
Subproject commit 4396999ce03bb96543f258f64e64459546b86e19
Subproject commit 17471400639898d452155b4718fdef3ad45a09a6

View File

@ -8,7 +8,7 @@
<ul class="uk-tab uk-margin-remove-bottom uk-margin-medium-top">
<li [class.uk-active]="tab === 'manager'"><a routerLink="../manager">Managers</a></li>
<li [class.uk-active]="tab === 'member'"><a routerLink="../member">Members</a></li>
<li *ngIf="properties.environment != 'production'" ><a routerLink="../links">Links</a></li>
<li *ngIf="stakeholder.type == 'organization' && properties.environment != 'production'" ><a routerLink="../links">Links</a></li>
</ul>
</role-users>

@ -1 +1 @@
Subproject commit 5026b8b38fcae493ec7bcdc272bf167798c18fa3
Subproject commit c5ba8700be5b8fcf98522fe167246281545d7985

@ -1 +1 @@
Subproject commit 6524ee362c8fc8fa6e482144920e305198e54fc8
Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13