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

Fixed show/hide axis toggles, #1331

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-12 14:31:15 +01:00
parent c39f9ed2f3
commit a1e39ce24d
3 changed files with 102 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/directives/arrayJoin.js
View File

@ -31,4 +31,5 @@ function (angular, app, _) {
}
};
});
});

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

@ -5,7 +5,7 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 90px">
<strong>Left Y Axis</strong>
<strong>Left Y</strong>
</li>
<li class="grafana-target-segment">
Unit
@ -38,16 +38,13 @@
<input type="text" class="input-small grafana-target-segment-input" placeholder="auto"
ng-model="panel.leftYAxisLabel" ng-change="render()" ng-model-onblur>
</li>
<li class="grafana-target-segment">
Show
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 90px">
<strong>Right Y Axis</strong>
<strong>Right Y</strong>
</li>
<li class="grafana-target-segment">
Unit
@ -80,8 +77,105 @@
<input type="text" class="input-small grafana-target-segment-input" placeholder="auto"
ng-model="panel.rightYAxisLabel" ng-change="render()" ng-model-onblur>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 90px">
<strong>Show Axis</strong>
</li>
<li class="grafana-target-segment">
Show
X-Axis&nbsp;
<input class="cr1" id="hideXAxis" type="checkbox"
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">
Y-Axis&nbsp;
<input class="cr1" id="hideYAxis" type="checkbox"
ng-model="panel['y-axis']" ng-checked="panel['y-axis']" ng-change="render()">
<label for="hideYAxis" class="cr1"></label>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>
<div class="editor-row" style="margin-top: 20px">
<div class="section">
<div class="grafana-target">
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 90px">
<strong>Thresholds</strong>
</li>
<li class="grafana-target-segment">
Level 1
</li>
<li>
<input type="text" class="input-small grafana-target-segment-input">
</li>
<li class="grafana-target-segment">
<spectrum-picker ng-model="panel.grid.threshold1Color" ng-change="render()" ></spectrum-picker>
</li>
<li class="grafana-target-segment">
Level 2
</li>
<li>
<input type="text" class="input-small grafana-target-segment-input">
</li>
<li class="grafana-target-segment">
<spectrum-picker ng-model="panel.grid.threshold2Color" ng-change="render()" ></spectrum-picker>
</li>
<li class="grafana-target-segment">
Line mode
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>
<div class="editor-row" style="margin-top: 20px">
<div class="section">
<div class="grafana-target">
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 90px">
<strong>Legend</strong>
</li>
<li class="grafana-target-segment">
Show: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Table: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Right side: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Hide empty: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Min: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Max: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Avg: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Total: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Current: <input type="checkbox">
</li>
</ul>
<div class="clearfix"></div>
@ -90,81 +184,3 @@
</div>
</div>
<div class="editor-row" style="margin-top: 20px">
<div class="section">
<div class="grafana-target">
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 90px">
<strong>Thresholds</strong>
</li>
<li class="grafana-target-segment">
Level 1
</li>
<li>
<input type="text" class="input-small grafana-target-segment-input">
</li>
<li class="grafana-target-segment">
<spectrum-picker ng-model="panel.grid.threshold1Color" ng-change="render()" ></spectrum-picker>
</li>
<li class="grafana-target-segment">
Level 2
</li>
<li>
<input type="text" class="input-small grafana-target-segment-input">
</li>
<li class="grafana-target-segment">
<spectrum-picker ng-model="panel.grid.threshold2Color" ng-change="render()" ></spectrum-picker>
</li>
<li class="grafana-target-segment">
Line mode
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>
<div class="editor-row" style="margin-top: 20px">
<div class="section">
<div class="grafana-target">
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" style="width: 90px">
<strong>Legend</strong>
</li>
<li class="grafana-target-segment">
Show: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Table: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Right side: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Hide empty: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Min: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Max: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Avg: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Total: <input type="checkbox">
</li>
<li class="grafana-target-segment">
Current: <input type="checkbox">
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>

2
src/css/less/forms.less
View File

@ -15,7 +15,7 @@ input[type="checkbox"]+.cr1 {
height: 19px;
clear: none;
text-indent: 2px;
margin-top: 4px;
margin: 0;
padding: 0 0 0 20px;
vertical-align:middle;
background: url(@checkboxImageUrl) left top no-repeat;