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

feat(annotations): updated editor, removed line color and icon size

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-02-23 08:22:00 +01:00
parent a6a5f393cc
commit 2e52008542
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
public/app/features/annotations/partials/editor.html
View File

@@ -68,7 +68,7 @@
<div class="gf-form-group">
<div class="gf-form-inline">
<div class="gf-form gf-size-max-xxl">
<span class="gf-form-label width-10">Name</span>
<span class="gf-form-label">Name</span>
<input type="text" class="gf-form-input" ng-model='currentAnnotation.name' placeholder="name"></input>
</div>
<div class="gf-form">
@@ -77,27 +77,18 @@
<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select>
</div>
</div>
</div>
<div class="gf-form-inline">
<div class="gf-form gf-size-max-xl">
<span class="gf-form-label width-10">Icon size</span>
<div class="gf-form-select-wrapper">
<select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select>
</div>
</div>
<!-- <div class="gf&#45;form gf&#45;size&#45;max&#45;xl"> -->
<!-- <span class="gf&#45;form&#45;label width&#45;10">Icon size</span> -->
<!-- <div class="gf&#45;form&#45;select&#45;wrapper"> -->
<!-- <select class="gf&#45;form&#45;input gf&#45;size&#45;md" ng&#45;model="currentAnnotation.iconSize" ng&#45;options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select> -->
<!-- </div> -->
<!-- </div> -->
<div class="gf-form">
<label class="gf-form-label">
<span>Icon color</span>
<span>Color</span>
<spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker>
</label>
</div>
<div class="gf-form">
<label class="gf-form-label">
<span>Line color</span>
<spectrum-picker ng-model="currentAnnotation.lineColor"></spectrum-picker>
</label>
<editor-checkbox text="Grid line" model="currentAnnotation.showLine"></editor-checkbox>
</div>
</div>
</div>

9
public/app/plugins/panel/graph/graph.js
View File

@@ -335,16 +335,9 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
types[event.annotation.name] = {
color: event.annotation.iconColor,
position: 'BOTTOM',
markerSize: 5,
};
}
// if (event.annotation.showLine) {
// options.grid.markings.push({
// color: event.annotation.lineColor,
// lineWidth: 1,
// xaxis: { from: event.min, to: event.max }
// });
// }
});
options.events = {