IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some last polish to thew new axis editor view, #1331

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-12 15:47:47 +01:00
parent d6f9ff34ce
commit 66631da1c7
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/panels/graph/axisEditor.html
View File

@ -4,13 +4,13 @@
<div class="grafana-target">
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 100px">
<li class="grafana-target-segment" style="width: 80px">
<strong>Left Y</strong>
</li>
<li class="grafana-target-segment">
Unit
</li>
<li class="dropdown" style="width: 140px;"
<li class="dropdown" style="width: 130px;"
ng-model="panel.y_formats[0]"
dropdown-typeahead="unitFormats"
dropdown-typeahead-on-select="setUnitFormat(0, $subItem)">
@ -35,7 +35,7 @@
Label
</li>
<li>
<input type="text" class="input-small grafana-target-segment-input"
<input type="text" class="input-small grafana-target-segment-input last"
ng-model="panel.leftYAxisLabel" ng-change="render()" ng-model-onblur>
</li>
</ul>
@ -43,13 +43,13 @@
</div>
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 100px">
<li class="grafana-target-segment" style="width: 80px">
<strong>Right Y</strong>
</li>
<li class="grafana-target-segment">
Unit
</li>
<li class="dropdown" style="width: 140px"
<li class="dropdown" style="width: 130px"
ng-model="panel.y_formats[1]"
dropdown-typeahead="unitFormats"
dropdown-typeahead-on-select="setUnitFormat(1, $subItem)">
@ -74,7 +74,7 @@
Label
</li>
<li>
<input type="text" class="input-small grafana-target-segment-input"
<input type="text" class="input-small grafana-target-segment-input last"
ng-model="panel.rightYAxisLabel" ng-change="render()" ng-model-onblur>
</li>
</ul>
@ -87,7 +87,7 @@
<div class="grafana-target">
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 100px">
<li class="grafana-target-segment" style="width: 80px">
<strong>Show Axis</strong>
</li>
<li class="grafana-target-segment">
@ -96,7 +96,7 @@
ng-model="panel['x-axis']" ng-checked="panel['x-axis']" ng-change="render()">
<label for="hideXAxis" class="cr1"></label>
</li>
<li class="grafana-target-segment">
<li class="grafana-target-segment last">
Y-Axis&nbsp;
<input class="cr1" id="hideYAxis" type="checkbox"
ng-model="panel['y-axis']" ng-checked="panel['y-axis']" ng-change="render()">
@ -107,7 +107,7 @@
</div>
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 100px">
<li class="grafana-target-segment" style="width: 80px">
<strong>Thresholds</strong>
</li>
<li class="grafana-target-segment">
@ -130,7 +130,7 @@
<li class="grafana-target-segment">
<spectrum-picker ng-model="panel.grid.threshold2Color" ng-change="render()" ></spectrum-picker>
</li>
<li class="grafana-target-segment">
<li class="grafana-target-segment last">
Line mode&nbsp;
<input class="cr1" id="panel.grid.thresholdLine" type="checkbox"
ng-model="panel.grid.thresholdLine" ng-checked="panel.grid.thresholdLine" ng-change="render()">
@ -149,7 +149,7 @@
<div class="grafana-target">
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 100px">
<li class="grafana-target-segment" style="width: 80px">
<strong>Legend</strong>
</li>
<li class="grafana-target-segment">
@ -170,8 +170,8 @@
ng-model="panel.legend.rightSide" ng-checked="panel.legend.rightSide" ng-change="render()">
<label for="panel.legend.rightSide" class="cr1"></label>
</li>
<li class="grafana-target-segment">
Hide empty&nbsp;
<li class="grafana-target-segment last">
<span bs-tooltip="'Hides series with only null values'">Hide empty&nbsp;<span>
<input class="cr1" id="panel.legend.hideEmpty" type="checkbox"
ng-model="panel.legend.hideEmpty" ng-checked="panel.legend.hideEmpty" ng-change="render()">
<label for="panel.legend.hideEmpty" class="cr1"></label>
@ -206,7 +206,7 @@
ng-model="panel.legend.avg" ng-checked="panel.legend.avg" ng-change="render()">
<label for="panel.legend.avg" class="cr1"></label>
</li>
<li class="grafana-target-segment">
<li class="grafana-target-segment last">
Current&nbsp;
<input class="cr1" id="panel.legend.current" type="checkbox"
ng-model="panel.legend.current" ng-checked="panel.legend.current" ng-change="render()">

3
src/css/less/grafana.less
View File

@ -251,6 +251,9 @@ input[type=text].grafana-target-text-input {
margin: 0px;
border-radius: 0;
padding: 8px 4px;
&.last {
border-right: none;
}
}
input[type=checkbox].grafana-target-option-checkbox {