Skip to content

N
nexpie-grafana-theme
Commit 8e37de19 by Torkel Ödegaard
Options

ux(): minor fix to tooltip in template editor view

parent 83ba6638
Showing with 53 additions and 52 deletions
CHANGELOG.md
# 3.0.0-beta5 (2016-04-15 # 3.0.0-beta5 (2016-04-15)
### Bug fixes ### Bug fixes
* **Grafna-cli**: Fixed issue grafana-cli tool, did not detect the right plugin dir, fixes [#4723](https://github.com/grafana/grafana/issues/4723) * **grafana-cli**: Fixed issue grafana-cli tool, did not detect the right plugin dir, fixes [#4723](https://github.com/grafana/grafana/issues/4723)
* **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702) * **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702)
* **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706) * **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706)
......
public/app/features/templating/partials/editor.html
...@@ -179,55 +179,56 @@ ...@@ -179,55 +179,56 @@
<div class="section gf-form-group" > <div class="section gf-form-group" >
<h5 class="section-heading">Selection Options</h5> <h5 class="section-heading">Selection Options</h5>
<gf-form-switch class="gf-form" <div class="section">
label="Multi-value" <gf-form-switch class="gf-form"
label-class="width-10" label="Multi-value"
tooltip="Enables multiple values to be selected at the same time" label-class="width-10"
checked="current.multi" tooltip="Enables multiple values to be selected at the same time"
on-change="runQuery()"> checked="current.multi"
</gf-form-switch> on-change="runQuery()">
<gf-form-switch class="gf-form" </gf-form-switch>
label="Include All option" <gf-form-switch class="gf-form"
label-class="width-10" label="Include All option"
checked="current.includeAll" label-class="width-10"
on-change="runQuery()"> checked="current.includeAll"
</gf-form-switch> on-change="runQuery()">
</gf-form-switch>
<div class="gf-form" ng-if="current.includeAll"> </div>
<span class="gf-form-label width-10">Custom all value</span> <div class="gf-form" ng-if="current.includeAll">
<input type="text" class="gf-form-input max-width-15" ng-model='current.allValue' placeholder="blank = auto"></input> <span class="gf-form-label width-10">Custom all value</span>
</div> <input type="text" class="gf-form-input max-width-15" ng-model='current.allValue' placeholder="blank = auto"></input>
</div> </div>
</div>
<div class="gf-form-group" ng-if="current.type === 'query'">
<h5>Value groups/tags (Experimental feature)</h5> <div class="gf-form-group" ng-if="current.type === 'query'">
<div class="gf-form"> <h5>Value groups/tags (Experimental feature)</h5>
<editor-checkbox text="Enable" model="current.useTags" change="runQuery()"></editor-checkbox> <div class="gf-form">
</div> <editor-checkbox text="Enable" model="current.useTags" change="runQuery()"></editor-checkbox>
<div class="gf-form last" ng-if="current.useTags"> </div>
<span class="gf-form-label width-10">Tags query</span> <div class="gf-form last" ng-if="current.useTags">
<input type="text" class="gf-form-input" ng-model='current.tagsQuery' placeholder="metric name or tags query" ng-model-onblur></input> <span class="gf-form-label width-10">Tags query</span>
</div> <input type="text" class="gf-form-input" ng-model='current.tagsQuery' placeholder="metric name or tags query" ng-model-onblur></input>
<div class="gf-form" ng-if="current.useTags"> </div>
<li class="gf-form-label width-10">Tag values query</li> <div class="gf-form" ng-if="current.useTags">
<input type="text" class="gf-form-input" ng-model='current.tagValuesQuery' placeholder="apps.$tag.*" ng-model-onblur></input> <li class="gf-form-label width-10">Tag values query</li>
</div> <input type="text" class="gf-form-input" ng-model='current.tagValuesQuery' placeholder="apps.$tag.*" ng-model-onblur></input>
</div> </div>
</div>
<div class="gf-form-group">
<h5>Preview of values (shows max 20)</h5> <div class="gf-form-group">
<div class="gf-form"> <h5>Preview of values (shows max 20)</h5>
<span class="gf-form-label" ng-repeat="option in current.options | limitTo: 20"> <div class="gf-form">
{{option.text}} <span class="gf-form-label" ng-repeat="option in current.options | limitTo: 20">
</span> {{option.text}}
</div> </span>
</div> </div>
</div> </div>
</div>
<div class="gf-form-button-row p-y-0">
<button type="button" class="btn btn-success" ng-show="mode === 'edit'" ng-click="update();">Update</button> <div class="gf-form-button-row p-y-0">
<button type="button" class="btn btn-success" ng-show="mode === 'new'" ng-click="add();">Add</button> <button type="button" class="btn btn-success" ng-show="mode === 'edit'" ng-click="update();">Update</button>
</div> <button type="button" class="btn btn-success" ng-show="mode === 'new'" ng-click="add();">Add</button>
</div> </div>
</div>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment