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

worked on fill style options, connected line, null and null as zero

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-01-11 21:32:27 +01:00
parent ee8ba469dd
commit eee81617b3
4 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/panels/graphite/legend.html
View File

@ -15,20 +15,35 @@
</span> </span>
</span> </span>
<!-- <a class="small" ng-click="toggleYAxis(series)">
2:nd Y-axis (y&sup2;) <input type="checkbox"></input>
</a> -->
<!-- <div class="editor-row">
Fill style <select class="input-mini" ng-model="panel.aliasFillStyle[series.alias]" ng-options="f for f in ['no', 'all', 'null']" ng-change="get_data()"></select>
</div>
-->
<script type="text/ng-template" id="colorPopup.html"> <script type="text/ng-template" id="colorPopup.html">
<div class="histogram-legend-popover"> <div class="histogram-legend-popover">
<div class="histogram-legend-popover-header"> <a class="close" ng-click="dismiss();" href="">×</a>
<a class="close" ng-click="dismiss();" href="">×</a>
</div>
<div class="editor-row"> <div class="editor-row small" style="margin-left: 5px; padding-bottom: 0;">
<a class="small" ng-click="toggleYAxis(series)"> <label>Axis:</label>
2:nd Y-axis (y&sup2;) <input type="checkbox"></input> <button ng-click="toggleYAxis(series)"
</a> class="btn btn-mini"
</div> ng-class="{'btn-success': series.yaxis === 1 }">
Left
<div class="editor-row"> </button>
Fill style <select class="input-mini" ng-model="panel.aliasFillStyle[series.alias]" ng-options="f for f in ['no', 'all', 'null']" ng-change="get_data()"></select> <button ng-click="toggleYAxis(series)"
class="btn btn-mini"
ng-class="{'btn-success': series.yaxis === 2 }">
Right
</button>
<label>Null points:</label>
<button ng-click="panel.aliasFillStyle[series.alias] = 'no'; get_data();" class="btn btn btn-mini">Connect</button>
<button ng-click="panel.aliasFillStyle[series.alias] = 'null';get_data();" class="btn btn-success btn-mini">Null</button>
<button ng-click="panel.aliasFillStyle[series.alias] = 'all';get_data();" class="btn btn btn-mini">Zero</button>
</div> </div>
<div class="editor-row"> <div class="editor-row">

2
src/css/bootstrap.dark.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
src/css/bootstrap.light.min.css vendored
View File

File diff suppressed because one or more lines are too long

22
src/vendor/bootstrap/less/grafana.less vendored
View File

@ -154,14 +154,20 @@
} }
.histogram-legend-popover { .histogram-legend-popover {
width: 150px; width: 200px;
label {
.histogram-legend-popover-header { display: inline-block;
background: #41474c; width: 70px;
text-align: center; }
border-bottom: 1px solid #353a3e; .btn {
padding: 3px 5px; padding: 1px 3px;
white-space: nowrap; margin-right: 0px;
line-height: initial;
}
.close {
color: white;
opacity: 0.7;
text-shadow: none;
} }
.editor-row { .editor-row {
padding: 5px; padding: 5px;