[develop | DONE]: Change position of buttons of multi indicator paths to bottom right and add slider-tabs.
This commit is contained in:
parent
966d012c09
commit
59d85d3a30
|
@ -185,19 +185,6 @@
|
||||||
<h6 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom">
|
<h6 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom">
|
||||||
{{indicator.name + " "}}
|
{{indicator.name + " "}}
|
||||||
</h6>
|
</h6>
|
||||||
<div *ngIf="indicator.indicatorPaths.length > 1" class="uk-button-group">
|
|
||||||
<ul class="uk-subnav uk-subnav-pill uk-subnav-small">
|
|
||||||
<li *ngFor="let indicatorPath of indicator.indicatorPaths; let i=index"
|
|
||||||
class="uk-flex uk-margin-small-top"
|
|
||||||
[class.uk-active]="(!indicator.activePath && i == 0) || indicator.activePath === i">
|
|
||||||
<a (click)="indicator.activePath = i">
|
|
||||||
<span>
|
|
||||||
{{indicatorPath.parameters.title ? indicatorPath.parameters.title : '--' }}
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<iframe [class.uk-blend-multiply]="!isFullscreen"
|
<iframe [class.uk-blend-multiply]="!isFullscreen"
|
||||||
*ngIf=" !properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'"
|
*ngIf=" !properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'"
|
||||||
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
|
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
|
||||||
|
@ -212,6 +199,13 @@
|
||||||
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
|
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
|
||||||
class="uk-width-1-1 uk-blend-multiply"
|
class="uk-width-1-1 uk-blend-multiply"
|
||||||
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
|
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
|
||||||
|
<slider-tabs *ngIf="indicator.indicatorPaths.length > 1" [type]="'dynamic'" [flexPosition]="'right'" (activeEmitter)="indicator.activePath = $event"
|
||||||
|
tabsClass="uk-subnav uk-subnav-pill uk-subnav-small" containerClass="uk-margin-top uk-margin-bottom" [border]="false">
|
||||||
|
<slider-tab *ngFor="let indicatorPath of indicator.indicatorPaths; let i=index"
|
||||||
|
[tabTitle]="indicatorPath.parameters.tab ? indicatorPath.parameters.tab : indicatorPath.parameters.title"
|
||||||
|
[tabId]="i" [active]="(!indicator.activePath && i == 0) || indicator.activePath == i">
|
||||||
|
</slider-tab>
|
||||||
|
</slider-tabs>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom uk-visible@m">
|
<div class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom uk-visible@m">
|
||||||
<a *ngIf="indicator.description || indicator.additionalDescription"
|
<a *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6e96974364507f347ee4ed65307073e5ca12e476
|
Subproject commit 41b46b754edaadb901829ba57faa2e799b4ced49
|
|
@ -1 +1 @@
|
||||||
Subproject commit fe10d2e9195fdebf3d906f28abbb072f3617c4ee
|
Subproject commit 99e7fe14bc804271116cc8ee54f2547e4f04034f
|
Loading…
Reference in New Issue