MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Change grid of indicatos base on new mocks. Add blend mode in iframes

This commit is contained in:
Konstantinos Triantafyllou 2022-03-15 16:30:36 +02:00
parent 36d09164de
commit 06d032e45c
6 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/app.component.ts
View File

@ -278,8 +278,8 @@ export class AppComponent implements OnInit, OnDestroy {
route: "/" + this.stakeholder.alias,
url: null,
title: this.stakeholder.name,
logoUrl: 'assets/common-assets/logo-services/monitor/small-inverted.png',
logoSmallUrl: "assets/common-assets/logo-services/monitor/small-inverted.png",
logoUrl: 'assets/common-assets/logo-services/monitor/small-inverted.svg',
logoSmallUrl: "assets/common-assets/logo-services/monitor/small-inverted.svg",
position: 'center',
badge: true,
stickyAnimation: true,
@ -351,8 +351,8 @@ export class AppComponent implements OnInit, OnDestroy {
route: null,
url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu',
title: "Monitor",
logoUrl: 'assets/common-assets/logo-services/monitor/main.png',
logoSmallUrl: "assets/common-assets/logo-services/monitor/small.png",
logoUrl: 'assets/common-assets/logo-services/monitor/main.svg',
logoSmallUrl: "assets/common-assets/logo-services/monitor/small.svg",
position: 'left',
badge: true,
stickyAnimation: true,

4
src/app/monitor/monitor.component.html
View File

@ -161,11 +161,11 @@
<div [class.uk-margin-large-top]="activeSubCategory.numbers.length > 0">
<ng-container *ngFor="let chart of activeSubCategory.charts; let i = index;">
<div *ngIf="countIndicatorsToShow(chart.indicators) > 0"
class="uk-grid uk-margin-medium-bottom uk-flex uk-flex-middle" uk-height-match="target: .uk-card">
class="uk-grid uk-grid-column-small uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid uk-height-match="target: .uk-card">
<h5 *ngIf="chart.title" class="uk-width-1-1 uk-margin-bottom">{{chart.title}}</h5>
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
<div *ngIf="isPublicOrIsMember(indicator.visibility) && chartsActiveType.get(i + '-' + j)"
[ngClass]="getChartClassBySize(indicator.width)" class="uk-margin-bottom">
[ngClass]="getChartClassBySize(indicator.width)">
<div class="uk-card uk-card-default"
[class.semiFiltered]="chartsActiveType.get(i + '-' + j).filtersApplied < countSelectedFilters()">
<div class="uk-card-body uk-text-center">

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit e1a632e63f8c91e967740fa50b1f37318847302f
Subproject commit 1a2925a890260948369f22dd7e5cb899b5727816

9
src/app/topic/indicators.component.html
View File

@ -197,12 +197,9 @@
{{indicator.name}}
</div>
<iframe *ngIf="!properties.disableFrameLoad && indicator.indicatorPaths[0] &&
indicator.indicatorPaths[0].source !==
'image' &&
safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
indicator.indicatorPaths[0].source !=='image' && safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
[src]="safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
[class]="' uk-width-1-1 uk-height-' +
(indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
class="uk-width-1-1 uk-blend-multiply" [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
<div *ngIf="properties.disableFrameLoad &&
indicator.indicatorPaths[0].source !==
'image'" class="uk-alert uk-alert-danger uk-text-center">I frames
@ -511,7 +508,7 @@
</div>
<iframe *ngIf="indicator.indicatorPaths[i].source !== 'image'"
[src]="indicator.indicatorPaths[i].safeResourceUrl"
class="uk-width-1-1 uk-height-large"></iframe>
class="uk-width-1-1 uk-height-large uk-blend-multiply"></iframe>
<!-- <div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[i].source !== 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames-->
<!-- preview is disabled</div>-->
<div *ngIf="indicator.indicatorPaths[i].source === 'image'">

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 9a06b6e012adb3f7c47659237fe775631a20ff11
Subproject commit 776ba07197e4cf73e98890bd4213a32183ea19d2

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit de51fea2dd3c8a64fc3c68ed29a9aa8f71034a54
Subproject commit c9dd790861ec988c621a7b6d1ccf161a209d6154