Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Triggers Panel: rearrange options.

Browse Source
This commit is contained in:
Alexander Zobnin
2017-02-10 17:06:36 +03:00
parent 5d33462d8e
commit 248a988326
2 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
dist/panel-triggers/editor.html vendored
View File

@@ -82,7 +82,7 @@
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-8">Acknowledged</label> <label class="gf-form-label width-8">Acknowledged</label>
<div class="gf-form-select-wrapper"> <div class="gf-form-select-wrapper width-12">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.showTriggers" ng-model="editor.panel.showTriggers"
ng-options="f for f in editor.ackFilters" ng-options="f for f in editor.ackFilters"
@@ -90,19 +90,17 @@
</select> </select>
</div> </div>
</div> </div>
<div class="gf-form"> <gf-form-switch class="gf-form"
<label class="gf-form-label width-12">Limit triggers number to</label> label-class="width-13"
<input class="gf-form-input width-5" label="Hide hosts in maintenance"
type="number" checked="editor.panel.hideHostsInMaintenance"
ng-model="editor.panel.limit" on-change="ctrl.refresh()">
ng-model-onblur </gf-form-switch>
ng-change="editor.panelCtrl.refresh()">
</div>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-8">Sort by</label> <label class="gf-form-label width-8">Sort by</label>
<div class="gf-form-select-wrapper"> <div class="gf-form-select-wrapper width-12">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.sortTriggersBy" ng-model="editor.panel.sortTriggersBy"
ng-options="f.text for f in editor.sortByFields track by f.value" ng-options="f.text for f in editor.sortByFields track by f.value"
@@ -112,7 +110,7 @@
</div> </div>
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-8">Show events</label> <label class="gf-form-label width-8">Show events</label>
<div class="gf-form-select-wrapper"> <div class="gf-form-select-wrapper width-9">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.showEvents" ng-model="editor.panel.showEvents"
ng-options="f.text for f in editor.showEventsFields track by f.value" ng-options="f.text for f in editor.showEventsFields track by f.value"
@@ -122,24 +120,24 @@
</div> </div>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form">
<label class="gf-form-label width-8">Page size</label>
<input class="gf-form-input width-6"
type="number"
ng-model="editor.panel.pageSize"
ng-model-onblur
ng-change="editor.panelCtrl.refresh()">
</div>
<gf-form-switch class="gf-form" <gf-form-switch class="gf-form"
label-class="width-8" label-class="width-8"
label="Enable scroll" label="Enable scroll"
checked="editor.panel.scroll" checked="editor.panel.scroll"
on-change="ctrl.render()"> on-change="ctrl.render()">
</gf-form-switch> </gf-form-switch>
<div class="gf-form">
<label class="gf-form-label width-8">Page size</label>
<input class="gf-form-input width-5"
type="number"
ng-model="editor.panel.pageSize"
ng-model-onblur
ng-change="editor.panelCtrl.refresh()">
</div>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form max-width-12"> <div class="gf-form max-width-14">
<label class="gf-form-label width-6">Font size</label> <label class="gf-form-label width-8">Font size</label>
<div class="gf-form-select-wrapper max-width-8"> <div class="gf-form-select-wrapper max-width-8">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.fontSize" ng-model="editor.panel.fontSize"
@@ -147,12 +145,14 @@
ng-change="editor.panelCtrl.render()"></select> ng-change="editor.panelCtrl.render()"></select>
</div> </div>
</div> </div>
<gf-form-switch class="gf-form" <div class="gf-form">
label-class="width-14" <label class="gf-form-label width-8">Limit triggers</label>
label="Hide hosts in maintenance" <input class="gf-form-input width-5"
checked="editor.panel.hideHostsInMaintenance" type="number"
on-change="ctrl.refresh()"> ng-model="editor.panel.limit"
</gf-form-switch> ng-model-onblur
ng-change="editor.panelCtrl.refresh()">
</div>
</div> </div>
</div> </div>

54
src/panel-triggers/editor.html
View File

@@ -82,7 +82,7 @@
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-8">Acknowledged</label> <label class="gf-form-label width-8">Acknowledged</label>
<div class="gf-form-select-wrapper"> <div class="gf-form-select-wrapper width-12">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.showTriggers" ng-model="editor.panel.showTriggers"
ng-options="f for f in editor.ackFilters" ng-options="f for f in editor.ackFilters"
@@ -90,19 +90,17 @@
</select> </select>
</div> </div>
</div> </div>
<div class="gf-form"> <gf-form-switch class="gf-form"
<label class="gf-form-label width-12">Limit triggers number to</label> label-class="width-13"
<input class="gf-form-input width-5" label="Hide hosts in maintenance"
type="number" checked="editor.panel.hideHostsInMaintenance"
ng-model="editor.panel.limit" on-change="ctrl.refresh()">
ng-model-onblur </gf-form-switch>
ng-change="editor.panelCtrl.refresh()">
</div>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-8">Sort by</label> <label class="gf-form-label width-8">Sort by</label>
<div class="gf-form-select-wrapper"> <div class="gf-form-select-wrapper width-12">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.sortTriggersBy" ng-model="editor.panel.sortTriggersBy"
ng-options="f.text for f in editor.sortByFields track by f.value" ng-options="f.text for f in editor.sortByFields track by f.value"
@@ -112,7 +110,7 @@
</div> </div>
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-8">Show events</label> <label class="gf-form-label width-8">Show events</label>
<div class="gf-form-select-wrapper"> <div class="gf-form-select-wrapper width-9">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.showEvents" ng-model="editor.panel.showEvents"
ng-options="f.text for f in editor.showEventsFields track by f.value" ng-options="f.text for f in editor.showEventsFields track by f.value"
@@ -122,24 +120,24 @@
</div> </div>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form">
<label class="gf-form-label width-8">Page size</label>
<input class="gf-form-input width-6"
type="number"
ng-model="editor.panel.pageSize"
ng-model-onblur
ng-change="editor.panelCtrl.refresh()">
</div>
<gf-form-switch class="gf-form" <gf-form-switch class="gf-form"
label-class="width-8" label-class="width-8"
label="Enable scroll" label="Enable scroll"
checked="editor.panel.scroll" checked="editor.panel.scroll"
on-change="ctrl.render()"> on-change="ctrl.render()">
</gf-form-switch> </gf-form-switch>
<div class="gf-form">
<label class="gf-form-label width-8">Page size</label>
<input class="gf-form-input width-5"
type="number"
ng-model="editor.panel.pageSize"
ng-model-onblur
ng-change="editor.panelCtrl.refresh()">
</div>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form max-width-12"> <div class="gf-form max-width-14">
<label class="gf-form-label width-6">Font size</label> <label class="gf-form-label width-8">Font size</label>
<div class="gf-form-select-wrapper max-width-8"> <div class="gf-form-select-wrapper max-width-8">
<select class="gf-form-input" <select class="gf-form-input"
ng-model="editor.panel.fontSize" ng-model="editor.panel.fontSize"
@@ -147,12 +145,14 @@
ng-change="editor.panelCtrl.render()"></select> ng-change="editor.panelCtrl.render()"></select>
</div> </div>
</div> </div>
<gf-form-switch class="gf-form" <div class="gf-form">
label-class="width-14" <label class="gf-form-label width-8">Limit triggers</label>
label="Hide hosts in maintenance" <input class="gf-form-input width-5"
checked="editor.panel.hideHostsInMaintenance" type="number"
on-change="ctrl.refresh()"> ng-model="editor.panel.limit"
</gf-form-switch> ng-model-onblur
ng-change="editor.panelCtrl.refresh()">
</div>
</div> </div>
</div> </div>