mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge branch 'master' of github.com:grafana/grafana
This commit is contained in:
Torkel Ödegaard
commit
4f892ab9bf
@ -1,173 +1,169 @@
|
||||
<div class="editor-row">
|
||||
<div class="section">
|
||||
<h5>Data</h5>
|
||||
<div class="tight-form-container">
|
||||
<div class="tight-form">
|
||||
<ul class="tight-form-list">
|
||||
<li class="tight-form-item" style="width: 140px">
|
||||
To Table Transform
|
||||
</li>
|
||||
<li>
|
||||
<select class="input-large tight-form-input"
|
||||
<div class="section gf-form-group">
|
||||
<h5 class="section-heading">Data</h5>
|
||||
<div class="gf-form-inline">
|
||||
<div class="gf-form">
|
||||
<label class="gf-form-label width-10">To Table Transform</label>
|
||||
<div class="gf-form-select-wrapper max-width-15">
|
||||
<select class="gf-form-input"
|
||||
ng-model="editor.panel.transform"
|
||||
ng-options="k as v.description for (k, v) in editor.transformers"
|
||||
ng-change="editor.transformChanged()"></select>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tight-form">
|
||||
<ul class="tight-form-list">
|
||||
<li class="tight-form-item" style="width: 140px">
|
||||
Columns
|
||||
</li>
|
||||
<li class="tight-form-item" ng-repeat="column in editor.panel.columns">
|
||||
<i class="pointer fa fa-remove" ng-click="editor.removeColumn(column)"></i>
|
||||
<span>
|
||||
{{column.text}}
|
||||
</span>
|
||||
</li>
|
||||
<li>
|
||||
<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="clearfix"></div>
|
||||
<div class="gf-form gf-form--grow">
|
||||
<div class="gf-form-label gf-form-label--grow"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="gf-form-inline">
|
||||
<div class="gf-form">
|
||||
<label class="gf-form-label width-10">Columns</label>
|
||||
</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>
|
||||
<span>{{column.text}}</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="gf-form">
|
||||
<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="section">
|
||||
<h5>Table Display</h5>
|
||||
<div class="tight-form-container">
|
||||
<div class="tight-form">
|
||||
<ul class="tight-form-list">
|
||||
<li class="tight-form-item">
|
||||
Pagination (Page size)
|
||||
</li>
|
||||
<li>
|
||||
<input type="number" class="input-small tight-form-input" placeholder="100"
|
||||
empty-to-null ng-model="editor.panel.pageSize" ng-change="editor.render()" ng-model-onblur>
|
||||
</li>
|
||||
<li class="tight-form-item">
|
||||
<editor-checkbox text="Scroll" model="editor.panel.scroll" change="editor.render()"></editor-checkbox>
|
||||
</li>
|
||||
<li class="tight-form-item">
|
||||
Font size
|
||||
</li>
|
||||
<li>
|
||||
<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>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="clearfix"></div>
|
||||
<div class="section gf-form-group">
|
||||
<h5 class="section-heading">Table Display</h5>
|
||||
<div class="gf-form-inline">
|
||||
<div class="gf-form max-width-17">
|
||||
<label class="gf-form-label width-11">Pagination (Page size)</label>
|
||||
<input type="number" class="gf-form-input"
|
||||
placeholder="100" data-placement="right"
|
||||
ng-model="editor.panel.pageSize"
|
||||
ng-change="editor.render()"
|
||||
ng-model-onblur>
|
||||
</div>
|
||||
<gf-form-switch class="gf-form" label-class="width-4"
|
||||
label="Scroll"
|
||||
checked="editor.panel.scroll"
|
||||
change="editor.render()"></gf-form-switch>
|
||||
<div class="gf-form max-width-17">
|
||||
<label class="gf-form-label width-6">Font size</label>
|
||||
<div class="gf-form-select-wrapper max-width-15">
|
||||
<select class="gf-form-input"
|
||||
ng-model="editor.panel.fontSize"
|
||||
ng-options="f for f in editor.fontSizes"
|
||||
ng-change="editor.render()"></select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="editor-row" style="margin-top: 20px">
|
||||
<h5>Column Styles</h5>
|
||||
|
||||
<div class="tight-form-container">
|
||||
<div class="editor-row">
|
||||
<div class="section gf-form-group">
|
||||
<h5 class="section-heading">Column Styles</h5>
|
||||
<div ng-repeat="style in editor.panel.styles">
|
||||
<div class="tight-form">
|
||||
<ul class="tight-form-list pull-right">
|
||||
<li class="tight-form-item last">
|
||||
<i class="fa fa-remove pointer" ng-click="editor.removeColumnStyle(style)"></i>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<ul class="tight-form-list">
|
||||
<li class="tight-form-item">
|
||||
Name or regex
|
||||
</li>
|
||||
<li>
|
||||
<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">
|
||||
</li>
|
||||
<li class="tight-form-item" style="width: 86px">
|
||||
Type
|
||||
</li>
|
||||
<li>
|
||||
<select class="input-small tight-form-input"
|
||||
ng-model="style.type"
|
||||
ng-options="c.value as c.text for c in editor.columnTypes"
|
||||
ng-change="editor.render()"
|
||||
style="width: 150px"
|
||||
></select>
|
||||
</li>
|
||||
</ul>
|
||||
<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>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="tight-form-list" ng-if="style.type === 'string'">
|
||||
<li class="tight-form-item">
|
||||
<editor-checkbox text="Sanitize HTML" model="style.sanitize" change="editor.render()"></editor-checkbox>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="clearfix"></div>
|
||||
<div class="gf-form-inline">
|
||||
<div class="gf-form max-width-19">
|
||||
<label class="gf-form-label width-8">Name or regex</label>
|
||||
<input type="text" class="gf-form-input"
|
||||
ng-model="style.pattern"
|
||||
bs-typeahead="editor.getColumnNames"
|
||||
ng-blur="editor.render()"
|
||||
data-min-length=0 data-items=100 ng-model-onblur>
|
||||
</div>
|
||||
<div class="gf-form max-width-18">
|
||||
<label class="gf-form-label width-8">Type</label>
|
||||
<div class="gf-form-select-wrapper max-width-10">
|
||||
<select class="gf-form-input"
|
||||
ng-model="style.type"
|
||||
ng-options="c.value as c.text for c in editor.columnTypes"
|
||||
ng-change="editor.render()"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="gf-form max-width-25" ng-if="style.type === 'date'">
|
||||
<label class="gf-form-label width-5">Format</label>
|
||||
<metric-segment-model property="style.dateFormat" options="editor.dateFormats" on-change="editor.render()" custom="true"></metric-segment-model>
|
||||
</div>
|
||||
<gf-form-switch class="gf-form" label-class="width-8"
|
||||
ng-if="style.type === 'string'"
|
||||
label="Sanitize HTML"
|
||||
checked="style.sanitize"
|
||||
change="editor.render()"></gf-form-switch>
|
||||
<div class="gf-form gf-form--grow" ng-if="style.type !== 'date'">
|
||||
<div class="gf-form-label gf-form-label--grow"></div>
|
||||
</div>
|
||||
<div class="gf-form">
|
||||
<label class="gf-form-label">
|
||||
<a class="pointer" ng-click="editor.removeColumnStyle(style)">
|
||||
<i class="fa fa-trash"></i>
|
||||
</a>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tight-form" ng-if="style.type === 'number'">
|
||||
<ul class="tight-form-list">
|
||||
<li class="tight-form-item text-right" style="width: 93px">
|
||||
Coloring
|
||||
</li>
|
||||
<li>
|
||||
<select class="input-small tight-form-input"
|
||||
ng-model="style.colorMode"
|
||||
ng-options="c.value as c.text for c in editor.colorModes"
|
||||
ng-change="editor.render()"
|
||||
style="width: 150px"
|
||||
></select>
|
||||
</li>
|
||||
<li class="tight-form-item">
|
||||
Thresholds<tip>Comma separated values</tip>
|
||||
</li>
|
||||
<li>
|
||||
<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>
|
||||
</li>
|
||||
<li class="tight-form-item" style="width: 60px">
|
||||
Colors
|
||||
</li>
|
||||
<li class="tight-form-item">
|
||||
<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>
|
||||
<spectrum-picker ng-model="style.colors[2]" ng-change="editor.render()" ></spectrum-picker>
|
||||
</li>
|
||||
<li class="tight-form-item last">
|
||||
<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-options="c.value as c.text for c in editor.colorModes"
|
||||
ng-change="editor.render()"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="gf-form max-width-17">
|
||||
<label class="gf-form-label width-8">Thresholds<tip>Comma separated values</tip></label>
|
||||
<input type="text" class="gf-form-input"
|
||||
ng-model="style.thresholds"
|
||||
placeholder="50,80"
|
||||
ng-blur="editor.render()"
|
||||
array-join ng-model-onblur>
|
||||
</div>
|
||||
<div class="gf-form max-width-18">
|
||||
<label class="gf-form-label width-5">Colors</label>
|
||||
<span class="gf-form-label">
|
||||
<spectrum-picker ng-model="style.colors[0]" ng-change="editor.render()"></spectrum-picker>
|
||||
</span>
|
||||
<span class="gf-form-label">
|
||||
<spectrum-picker ng-model="style.colors[1]" ng-change="editor.render()"></spectrum-picker>
|
||||
</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>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="clearfix"></div>
|
||||
</span>
|
||||
</div>
|
||||
<!-- <div class="gf-form gf-form--grow">
|
||||
<div class="gf-form-label gf-form-label--grow"></div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="tight-form" ng-if="style.type === 'number'">
|
||||
<ul class="tight-form-list">
|
||||
<li class="tight-form-item text-right" style="width: 93px">
|
||||
Unit
|
||||
</li>
|
||||
<li class="dropdown" style="width: 150px"
|
||||
<div class="gf-form-inline" ng-if="style.type === 'number'">
|
||||
<div class="gf-form">
|
||||
<label class="gf-form-label width-8">Unit</label>
|
||||
</div>
|
||||
<div class="gf-form max-width-11">
|
||||
<div class="gf-form-dropdown-typeahead max-width-19"
|
||||
ng-model="style.unit"
|
||||
dropdown-typeahead="editor.unitFormats"
|
||||
dropdown-typeahead2="editor.unitFormats"
|
||||
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 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 class="gf-form gf-form--grow">
|
||||
<div class="gf-form-label gf-form-label--grow"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button class="btn btn-inverse" style="margin-top: 20px" ng-click="editor.addColumnStyle()">
|
||||
Add column style rule
|
||||
</button>
|
||||
<div class="gf-form-button">
|
||||
<button class="btn btn-inverse" ng-click="editor.addColumnStyle()">
|
||||
<i class="fa fa-plus"></i> Add column style rule
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user