Commit 4f892ab9 by Torkel Ödegaard

Merge branch 'master' of github.com:grafana/grafana

parents a01836e8 39297698
<div class="editor-row"> <div class="editor-row">
<div class="section"> <div class="section gf-form-group">
<h5>Data</h5> <h5 class="section-heading">Data</h5>
<div class="tight-form-container"> <div class="gf-form-inline">
<div class="tight-form"> <div class="gf-form">
<ul class="tight-form-list"> <label class="gf-form-label width-10">To Table Transform</label>
<li class="tight-form-item" style="width: 140px"> <div class="gf-form-select-wrapper max-width-15">
To Table Transform <select class="gf-form-input"
</li>
<li>
<select class="input-large tight-form-input"
ng-model="editor.panel.transform" ng-model="editor.panel.transform"
ng-options="k as v.description for (k, v) in editor.transformers" ng-options="k as v.description for (k, v) in editor.transformers"
ng-change="editor.transformChanged()"></select> ng-change="editor.transformChanged()"></select>
</li> </div>
</ul> </div>
<div class="clearfix"></div> <div class="gf-form gf-form--grow">
</div> <div class="gf-form-label gf-form-label--grow"></div>
<div class="tight-form"> </div>
<ul class="tight-form-list"> </div>
<li class="tight-form-item" style="width: 140px"> <div class="gf-form-inline">
Columns <div class="gf-form">
</li> <label class="gf-form-label width-10">Columns</label>
<li class="tight-form-item" ng-repeat="column in editor.panel.columns"> </div>
<div class="gf-form" ng-repeat="column in editor.panel.columns">
<label class="gf-form-label">
<i class="pointer fa fa-remove" ng-click="editor.removeColumn(column)"></i> <i class="pointer fa fa-remove" ng-click="editor.removeColumn(column)"></i>
<span> <span>{{column.text}}</span>
{{column.text}} </label>
</span> </div>
</li> <div class="gf-form">
<li>
<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment> <metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
</div> </div>
</div> </div>
<div class="section"> <div class="section gf-form-group">
<h5>Table Display</h5> <h5 class="section-heading">Table Display</h5>
<div class="tight-form-container"> <div class="gf-form-inline">
<div class="tight-form"> <div class="gf-form max-width-17">
<ul class="tight-form-list"> <label class="gf-form-label width-11">Pagination (Page size)</label>
<li class="tight-form-item"> <input type="number" class="gf-form-input"
Pagination (Page size) placeholder="100" data-placement="right"
</li> ng-model="editor.panel.pageSize"
<li> ng-change="editor.render()"
<input type="number" class="input-small tight-form-input" placeholder="100" ng-model-onblur>
empty-to-null ng-model="editor.panel.pageSize" ng-change="editor.render()" ng-model-onblur> </div>
</li> <gf-form-switch class="gf-form" label-class="width-4"
<li class="tight-form-item"> label="Scroll"
<editor-checkbox text="Scroll" model="editor.panel.scroll" change="editor.render()"></editor-checkbox> checked="editor.panel.scroll"
</li> change="editor.render()"></gf-form-switch>
<li class="tight-form-item"> <div class="gf-form max-width-17">
Font size <label class="gf-form-label width-6">Font size</label>
</li> <div class="gf-form-select-wrapper max-width-15">
<li> <select class="gf-form-input"
<select class="input-small tight-form-input" ng-model="editor.panel.fontSize" ng-options="f for f in editor.fontSizes" ng-change="editor.render()"></select> ng-model="editor.panel.fontSize"
</li> ng-options="f for f in editor.fontSizes"
</ul> ng-change="editor.render()"></select>
<div class="clearfix"></div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="editor-row" style="margin-top: 20px"> <div class="editor-row">
<h5>Column Styles</h5> <div class="section gf-form-group">
<h5 class="section-heading">Column Styles</h5>
<div class="tight-form-container">
<div ng-repeat="style in editor.panel.styles"> <div ng-repeat="style in editor.panel.styles">
<div class="tight-form"> <div class="gf-form-inline">
<ul class="tight-form-list pull-right"> <div class="gf-form max-width-19">
<li class="tight-form-item last"> <label class="gf-form-label width-8">Name or regex</label>
<i class="fa fa-remove pointer" ng-click="editor.removeColumnStyle(style)"></i> <input type="text" class="gf-form-input"
</li> ng-model="style.pattern"
</ul> bs-typeahead="editor.getColumnNames"
ng-blur="editor.render()"
<ul class="tight-form-list"> data-min-length=0 data-items=100 ng-model-onblur>
<li class="tight-form-item"> </div>
Name or regex <div class="gf-form max-width-18">
</li> <label class="gf-form-label width-8">Type</label>
<li> <div class="gf-form-select-wrapper max-width-10">
<input type="text" ng-model="style.pattern" bs-typeahead="editor.getColumnNames" ng-blur="editor.render()" data-min-length=0 data-items=100 class="input-medium tight-form-input"> <select class="gf-form-input"
</li>
<li class="tight-form-item" style="width: 86px">
Type
</li>
<li>
<select class="input-small tight-form-input"
ng-model="style.type" ng-model="style.type"
ng-options="c.value as c.text for c in editor.columnTypes" ng-options="c.value as c.text for c in editor.columnTypes"
ng-change="editor.render()" ng-change="editor.render()"></select>
style="width: 150px" </div>
></select> </div>
</li> <div class="gf-form max-width-25" ng-if="style.type === 'date'">
</ul> <label class="gf-form-label width-5">Format</label>
<ul class="tight-form-list" ng-if="style.type === 'date'">
<li class="tight-form-item">
Format
</li>
<li>
<metric-segment-model property="style.dateFormat" options="editor.dateFormats" on-change="editor.render()" custom="true"></metric-segment-model> <metric-segment-model property="style.dateFormat" options="editor.dateFormats" on-change="editor.render()" custom="true"></metric-segment-model>
</li> </div>
</ul> <gf-form-switch class="gf-form" label-class="width-8"
<ul class="tight-form-list" ng-if="style.type === 'string'"> ng-if="style.type === 'string'"
<li class="tight-form-item"> label="Sanitize HTML"
<editor-checkbox text="Sanitize HTML" model="style.sanitize" change="editor.render()"></editor-checkbox> checked="style.sanitize"
</li> change="editor.render()"></gf-form-switch>
</ul> <div class="gf-form gf-form--grow" ng-if="style.type !== 'date'">
<div class="clearfix"></div> <div class="gf-form-label gf-form-label--grow"></div>
</div> </div>
<div class="tight-form" ng-if="style.type === 'number'"> <div class="gf-form">
<ul class="tight-form-list"> <label class="gf-form-label">
<li class="tight-form-item text-right" style="width: 93px"> <a class="pointer" ng-click="editor.removeColumnStyle(style)">
Coloring <i class="fa fa-trash"></i>
</li> </a>
<li> </label>
<select class="input-small tight-form-input" </div>
</div>
<div class="gf-form-inline" ng-if="style.type === 'number'">
<div class="gf-form max-width-20">
<label class="gf-form-label width-8">Coloring</label>
<div class="gf-form-select-wrapper max-width-12">
<select class="gf-form-input"
ng-model="style.colorMode" ng-model="style.colorMode"
ng-options="c.value as c.text for c in editor.colorModes" ng-options="c.value as c.text for c in editor.colorModes"
ng-change="editor.render()" ng-change="editor.render()"></select>
style="width: 150px" </div>
></select> </div>
</li> <div class="gf-form max-width-17">
<li class="tight-form-item"> <label class="gf-form-label width-8">Thresholds<tip>Comma separated values</tip></label>
Thresholds<tip>Comma separated values</tip> <input type="text" class="gf-form-input"
</li> ng-model="style.thresholds"
<li> placeholder="50,80"
<input type="text" class="input-small tight-form-input" style="width: 150px" ng-model="style.thresholds" ng-blur="editor.render()" placeholder="50,80" array-join></input> ng-blur="editor.render()"
</li> array-join ng-model-onblur>
<li class="tight-form-item" style="width: 60px"> </div>
Colors <div class="gf-form max-width-18">
</li> <label class="gf-form-label width-5">Colors</label>
<li class="tight-form-item"> <span class="gf-form-label">
<spectrum-picker ng-model="style.colors[0]" ng-change="editor.render()" ></spectrum-picker> <spectrum-picker ng-model="style.colors[0]" ng-change="editor.render()"></spectrum-picker>
<spectrum-picker ng-model="style.colors[1]" ng-change="editor.render()" ></spectrum-picker> </span>
<spectrum-picker ng-model="style.colors[2]" ng-change="editor.render()" ></spectrum-picker> <span class="gf-form-label">
</li> <spectrum-picker ng-model="style.colors[1]" ng-change="editor.render()"></spectrum-picker>
<li class="tight-form-item last"> </span>
<span class="gf-form-label">
<spectrum-picker ng-model="style.colors[2]" ng-change="editor.render()"></spectrum-picker>
</span>
<span class="gf-form-label">
<a class="pointer" ng-click="editor.invertColorOrder($index)">invert order</a> <a class="pointer" ng-click="editor.invertColorOrder($index)">invert order</a>
</li> </span>
</ul> </div>
<div class="clearfix"></div> <!-- <div class="gf-form gf-form--grow">
</div> <div class="gf-form-label gf-form-label--grow"></div>
<div class="tight-form" ng-if="style.type === 'number'"> </div> -->
<ul class="tight-form-list"> </div>
<li class="tight-form-item text-right" style="width: 93px"> <div class="gf-form-inline" ng-if="style.type === 'number'">
Unit <div class="gf-form">
</li> <label class="gf-form-label width-8">Unit</label>
<li class="dropdown" style="width: 150px" </div>
<div class="gf-form max-width-11">
<div class="gf-form-dropdown-typeahead max-width-19"
ng-model="style.unit" ng-model="style.unit"
dropdown-typeahead="editor.unitFormats" dropdown-typeahead2="editor.unitFormats"
dropdown-typeahead-on-select="editor.setUnitFormat(style, $subItem)"> dropdown-typeahead-on-select="editor.setUnitFormat(style, $subItem)">
</li>
<li class="tight-form-item" style="width: 86px">
Decimals
</li>
<li style="width: 105px">
<input type="number" class="input-mini tight-form-input" ng-model="style.decimals" ng-change="editor.render()" ng-model-onblur>
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="gf-form max-width-15">
<label class="gf-form-label width-8">Decimals</label>
<input type="number" class="gf-form-input" data-placement="right"
ng-model="style.decimals"
ng-change="editor.render()" ng-model-onblur>
</div> </div>
<div class="gf-form gf-form--grow">
<button class="btn btn-inverse" style="margin-top: 20px" ng-click="editor.addColumnStyle()"> <div class="gf-form-label gf-form-label--grow"></div>
Add column style rule </div>
</div>
</div>
</div>
<div class="gf-form-button">
<button class="btn btn-inverse" ng-click="editor.addColumnStyle()">
<i class="fa fa-plus"></i>&nbsp;Add column style rule
</button> </button>
</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