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): more work on new annotations

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-02-23 08:42:03 +01:00
parent 2e52008542
commit cd52c24e87
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,12 +77,6 @@
<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 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>Color</span>

12
public/app/plugins/datasource/influxdb/partials/annotations.editor.html
View File

@ -1,8 +1,8 @@
<h6>Query</h6>
<div class="gf-form-group">
<div class="gf-form">
<span class="gf-form-label width-10">InfluxDB Query <tip>Example: select text from events where $timeFilter</tip></span class="gf-form-label">
<input type="text" class="gf-form-input" ng-model='ctrl.annotation.query' placeholder="select text from events where $timeFilter"></input>
</div>
<input type="text" class="gf-form-input" ng-model='ctrl.annotation.query' placeholder="select text from events where $timeFilter"></input>
</div>
</div>
@ -11,17 +11,17 @@
<div class="gf-form-inline">
<div class="gf-form">
<span class="gf-form-label width-4">Title</span>
<input type="text" class="gf-form-input" ng-model='ctrl.annotation.titleColumn' placeholder=""></input>
<input type="text" class="gf-form-input max-width-10" ng-model='ctrl.annotation.titleColumn' placeholder=""></input>
</div>
<div class="gf-form">
<span class="gf-form-label width-4">Tags</span>
<input type="text" class="gf-form-input" ng-model='ctrl.annotation.tagsColumn' placeholder=""></input>
<input type="text" class="gf-form-input max-width-10" ng-model='ctrl.annotation.tagsColumn' placeholder=""></input>
</div>
<div class="gf-form">
<span class="gf-form-label width-4">Text</span>
<input type="text" class="gf-form-input" ng-model='ctrl.annotation.textColumn' placeholder=""></input>
<input type="text" class="gf-form-input max-width-10" ng-model='ctrl.annotation.textColumn' placeholder=""></input>
</div>
</div>
</div>