mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge pull request #517 from Topface/histogram-inline-checkboxes
Better-looking histogram checkboxes
This commit is contained in:
commit
04f8fbad7b
@ -27,6 +27,11 @@
|
|||||||
.histogram-options span {
|
.histogram-options span {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* this is actually should be in bootstrap */
|
||||||
|
.form-inline .checkbox {
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
<div>
|
<div>
|
||||||
<span ng-show='panel.options'>
|
<span ng-show='panel.options'>
|
||||||
@ -45,13 +50,37 @@
|
|||||||
<span ng-show="panel.legend" class="small"><span ng-show="panel.value_field && panel.mode != 'count'">{{panel.value_field}}</span> {{panel.mode}} per <strong>{{panel.interval}}</strong> | (<strong>{{hits}}</strong> hits)</span>
|
<span ng-show="panel.legend" class="small"><span ng-show="panel.value_field && panel.mode != 'count'">{{panel.value_field}}</span> {{panel.mode}} per <strong>{{panel.interval}}</strong> | (<strong>{{hits}}</strong> hits)</span>
|
||||||
</div>
|
</div>
|
||||||
<form class="form-inline bordered histogram-options" ng-show="options">
|
<form class="form-inline bordered histogram-options" ng-show="options">
|
||||||
<label class="small">Bars</label> <input type="checkbox" ng-model="panel.bars" ng-checked="panel.bars" ng-change="render()">
|
<div class="checkbox">
|
||||||
<label class="small">Lines</label> <input type="checkbox" ng-model="panel.lines" ng-checked="panel.lines" ng-change="render()">
|
<label class="small">
|
||||||
<label class="small">Points</label> <input type="checkbox" ng-model="panel.points" ng-checked="panel.points" ng-change="render()">
|
<input type="checkbox" ng-model="panel.bars" ng-checked="panel.bars" ng-change="render()">
|
||||||
<label class="small">Stack</label> <input type="checkbox" ng-model="panel.stack" ng-checked="panel.stack" ng-change="render()">
|
Bars
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="checkbox">
|
||||||
|
<label class="small">
|
||||||
|
<input type="checkbox" ng-model="panel.lines" ng-checked="panel.lines" ng-change="render()">
|
||||||
|
Lines
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="checkbox">
|
||||||
|
<label class="small">
|
||||||
|
<input type="checkbox" ng-model="panel.points" ng-checked="panel.points" ng-change="render()">
|
||||||
|
Points
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="checkbox">
|
||||||
|
<label class="small">
|
||||||
|
<input type="checkbox" ng-model="panel.stack" ng-checked="panel.stack" ng-change="render()">
|
||||||
|
Stack
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<span ng-show="panel.stack">
|
<span ng-show="panel.stack">
|
||||||
<label style="white-space:nowrap" class="small">Percent</label>
|
<div class="checkbox">
|
||||||
<input type="checkbox" ng-model="panel.percentage" ng-checked="panel.percentage" ng-change="render()">
|
<label style="white-space:nowrap" class="small">
|
||||||
|
<input type="checkbox" ng-model="panel.percentage" ng-checked="panel.percentage" ng-change="render()">
|
||||||
|
Percent
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
<label class="small">Interval</label> <select ng-change="set_interval(panel.interval);get_data();" class="input-small" ng-model="panel.interval" ng-options="interval_label(time) for time in _.union([panel.interval],panel.intervals)"></select>
|
<label class="small">Interval</label> <select ng-change="set_interval(panel.interval);get_data();" class="input-small" ng-model="panel.interval" ng-options="interval_label(time) for time in _.union([panel.interval],panel.intervals)"></select>
|
||||||
|
Loading…
Reference in New Issue
Block a user