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(plugins): minor fixes to breaking out query editor row into reusable component

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-02-02 16:57:05 +01:00
parent f2700822e9
commit fc829b32d9
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/panel/query_editor_row.ts
View File

@ -11,7 +11,7 @@ function queryEditorRowDirective() {
restrict: 'E',
templateUrl: 'public/app/features/panel/partials/query_editor_row.html',
transclude: true,
scope: { ctrl: "=" },
scope: {ctrl: "="},
};
}

32
public/app/plugins/datasource/graphite/partials/query.editor.html
View File

@ -1,19 +1,21 @@
<query-editor-row ctrl="ctrl" controls="true">
<query-editor-row ctrl="ctrl">
<span style="display: block; overflow: hidden;">
<input type="text" class="tight-form-clear-input" style="width: 100%;" ng-model="ctrl.target.target" give-focus="ctrl.target.textEditor" spellcheck='false' ng-model-onblur ng-change="ctrl.targetTextChanged()" ng-show="ctrl.target.textEditor"></input>
</span>
<li class="tight-form-flex-wrapper" ng-show="ctrl.target.textEditor">
<input type="text" class="tight-form-clear-input" style="width: 100%;" ng-model="ctrl.target.target" give-focus="ctrl.target.textEditor" spellcheck='false' ng-model-onblur ng-change="ctrl.targetTextChanged()"></input>
</li>
<ul class="tight-form-list" role="menu" ng-hide="ctrl.target.textEditor">
<li ng-repeat="segment in ctrl.segments" role="menuitem">
<metric-segment segment="segment" get-options="ctrl.getAltSegments($index)" on-change="ctrl.segmentValueChanged(segment, $index)"></metric-segment>
</li>
<li ng-repeat="func in ctrl.functions">
<span graphite-func-editor class="tight-form-item tight-form-func">
</span>
</li>
<li class="dropdown" graphite-add-func>
</li>
</ul>
<li ng-hide-start="ctrl.target.textEditor"></li>
<li ng-repeat="segment in ctrl.segments" role="menuitem">
<metric-segment segment="segment" get-options="ctrl.getAltSegments($index)" on-change="ctrl.segmentValueChanged(segment, $index)"></metric-segment>
</li>
<li ng-repeat="func in ctrl.functions">
<span graphite-func-editor class="tight-form-item tight-form-func">
</span>
</li>
<li class="dropdown" graphite-add-func>
</li>
<li ng-hide-end></li>
</query-editor-row>

4
public/app/plugins/datasource/prometheus/partials/query.editor.html
View File

@ -1,5 +1,4 @@
<query-editor-row ctrl="ctrl" controls="true">
<query-editor-row ctrl="ctrl">
<li class="tight-form-item" style="width: 94px">
Query
</li>
@ -25,7 +24,6 @@
placeholder="metric name"
data-min-length=0 data-items=100>
</li>
</query-editor-row>
<div class="tight-form">

1
public/less/tightform.less
View File

@ -62,6 +62,7 @@
.tight-form-flex-wrapper {
display: flex;
flex-direction: row;
float: none !important;
}
.grafana-metric-options {