dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MrKartoshka-master'

Browse Source
This commit is contained in:
Igor Kulikov 2019-03-07 18:31:39 +02:00
commit a7e15f6f4d
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ui/src/app/widget/lib/tripAnimation/trip-animation-widget.js
View File

File diff suppressed because one or more lines are too long

3
ui/src/app/widget/lib/tripAnimation/trip-animation-widget.scss
View File

@ -18,7 +18,8 @@
position: relative;
width: 100%;
height: 100%;
padding-top: 35px;
font-size: 16px;
line-height: 24px;
}
.heat-map-info-panel {

5
ui/src/app/widget/lib/tripAnimation/trip-animation-widget.tpl.html
View File

@ -15,7 +15,8 @@
limitations under the License.
-->
<div class="heat-map-widget tracking-widget" layout="column" layout-align="center start">
<div class="heat-map-widget tracking-widget" layout="column" layout-align="center start"
ng-style="{'padding-top' : (!vm.widgetConfig.showTitle && vm.ctx.settings.showLabel) ? '5px' : '0px'}">
<div ng-show="vm.ctx.settings.showLabel">
{{vm.trips[vm.activeTripIndex].settings.labelText}}
</div>
@ -32,7 +33,7 @@
<md-button aria-label="Stop playing" ng-click="vm.stopPlay()">
<ng-md-icon icon="pause_circle_outline"></ng-md-icon>
</md-button>
<div class="panel-timer">{{vm.trips[0].timeRange[vm.index].ts | date:'medium'}}
<div class="panel-timer">{{vm.trips[vm.activeTripIndex].timeRange[vm.index].ts | date:'medium'}}
</div>
</md-slider-container>
</div>