Merge pull request #591 from nclsHart/fix-issue-586

[Web UI] Fix sidebar display problem
This commit is contained in:
Alessio Sergi 2015-05-09 14:41:09 +02:00
commit ee6941133f
3 changed files with 12 additions and 4 deletions

View File

@ -42,6 +42,9 @@ body {
.text-left {
text-align: left;
}
.sidebar .table-cell:not(.text-left) {
padding-left: 10px;
}
/* Theme */

View File

@ -1,8 +1,13 @@
<div class="table-row">
<div class="table-cell text-left title">SENSORS</div>
<div class="table-cell">&#176;C</div>
</div>
<div class="table-row" ng-repeat="sensor in result['sensors']">
<div class="table-cell text-left">{{sensor.label}}</div>
<div class="table-cell" ng-class="getClass('sensors', 'sensors_' + sensor.type + '_', sensor.value, 0)">{{sensor.value}}</div>
<div class="table-cell text-left">{{ sensor.label }}</div>
<div class="table-cell">{{ sensor.unit }}</div>
<div class="table-cell" ng-if="sensor.type != 'battery'" ng-class="getClass('sensors', 'sensors_' + sensor.type + '_', sensor.value, 0)">
{{ sensor.value }}
</div>
<div class="table-cell" ng-if="sensor.type == 'battery'" ng-class="getClass('sensors', 'sensors_' + sensor.type + '_', 100 - sensor.value, 0)">
{{ sensor.value }}
</div>
</div>

View File

@ -40,7 +40,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-3" ng-show="show.sidebar">
<div class="col-sm-3 sidebar" ng-show="show.sidebar">
<div class="table">
<section id="network" class="plugin table-row-group" ng-show="show.network" ng-include src="'plugins/network.html'"></section>
<section id="diskio" class="plugin table-row-group" ng-show="show.diskio" ng-include src="'plugins/diskio.html'"></section>