opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-22 07:48:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(query editors): progress on query editors

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-04-26 09:58:55 +02:00
parent bbf4d00319
commit bca0894f73
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/panel/partials/query_editor_row.html
View File

@ -1,3 +1,4 @@
<div class="gf-form-query"> <div class="gf-form-query">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label"> <label class="gf-form-label">
@ -24,6 +25,7 @@
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label"> <label class="gf-form-label">
<a class="pointer" tabindex="1" ng-click="ctrl.toggleCollapse()" ng-class="{muted: !ctrl.canCollapse}"> <a class="pointer" tabindex="1" ng-click="ctrl.toggleCollapse()" ng-class="{muted: !ctrl.canCollapse}">
<em ng-show="ctrl.target.datasource">{{ctrl.target.datasource}}&nbsp;</em>
<i class="fa fa-fw fa-chevron-down" ng-hide="ctrl.collapsed"></i> <i class="fa fa-fw fa-chevron-down" ng-hide="ctrl.collapsed"></i>
<i class="fa fa-fw fa-chevron-left" ng-show="ctrl.collapsed"></i> <i class="fa fa-fw fa-chevron-left" ng-show="ctrl.collapsed"></i>
</a> </a>

4
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
View File

@ -43,9 +43,9 @@
<div class="gf-form offset-width-7"> <div class="gf-form offset-width-7">
<label class="gf-form-label width-10"> <label class="gf-form-label width-10">
Trim edges points Trim edges
<info-popover mode="right-normal"> <info-popover mode="right-normal">
Trim the edges on the timeseries x datapoints Trim the edges on the timeseries datapoints
</info-popover> </info-popover>
</label> </label>
<input class="gf-form-input max-width-12" type="number" ng-model="agg.settings.trimEdges" ng-change="onChangeInternal()"> <input class="gf-form-input max-width-12" type="number" ng-model="agg.settings.trimEdges" ng-change="onChangeInternal()">

2
public/app/plugins/datasource/elasticsearch/partials/query.editor.html
View File

@ -7,7 +7,7 @@
</div> </div>
<div class="gf-form max-width-15"> <div class="gf-form max-width-15">
<label class="gf-form-label query-keyword">Alias</label> <label class="gf-form-label query-keyword">Alias</label>
<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="alias patterns (empty = auto)" ng-blur="ctrl.refresh()"> <input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="alias patterns" ng-blur="ctrl.refresh()">
</div> </div>
</div> </div>

1
public/sass/components/_gf-form.scss
View File

@ -126,6 +126,7 @@ $gf-form-margin: 0.25rem;
&--dropdown { &--dropdown {
padding-right: $input-padding-x*2; padding-right: $input-padding-x*2;
&:after { &:after {
position: absolute; position: absolute;
top: 35%; top: 35%;

5
public/sass/utils/_utils.scss
View File

@ -59,15 +59,16 @@ button.close {
// Toggling content // Toggling content
.hide { .hide {
display: none; display: none !important;
} }
.show { .show {
display: block; display: block;
} }
// Visibility // Visibility
.invisible { .invisible {
visibility: hidden; visibility: hidden !important;
} }
// For Affix plugin // For Affix plugin