Skip to content

Commit 00732f6

Browse files
committed
Added blur to utils and message to threshold section
1 parent 7c06757 commit 00732f6

File tree

2 files changed

+45
-37
lines changed

2 files changed

+45
-37
lines changed

public/app/plugins/panel/graph/tab_display.html

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -133,52 +133,55 @@ <h5>Series specific overrides <tip>Regex match example: /server[0-3]/i </tip></h
133133
<div class="edit-tab-content" ng-if="ctrl.subTabIndex === 2">
134134
<div class="gf-form-group">
135135
<h5>Thresholds</h5>
136-
<div class="gf-form-inline" ng-repeat="threshold in ctrl.panel.thresholds">
137-
<div class="gf-form">
138-
<label class="gf-form-label">T{{$index+1}}</label>
139-
</div>
136+
<p>Visual Thresholds are <strong>disabled.</strong><br>To re-enable thresholds, alerting must be turned off. Visit the Alert tab to update your config.</p>
137+
<div class="blur">
138+
<div class="gf-form-inline" ng-repeat="threshold in ctrl.panel.thresholds">
139+
<div class="gf-form">
140+
<label class="gf-form-label">T{{$index+1}}</label>
141+
</div>
140142

141-
<div class="gf-form">
142-
<div class="gf-form-select-wrapper">
143-
<select class="gf-form-input" ng-model="threshold.op" ng-options="f for f in ['>', '<']" ng-change="ctrl.render()"></select>
143+
<div class="gf-form">
144+
<div class="gf-form-select-wrapper">
145+
<select class="gf-form-input" ng-model="threshold.op" ng-options="f for f in ['>', '<']" ng-change="ctrl.render()"></select>
146+
</div>
147+
<input type="number" ng-model="threshold.value" class="gf-form-input width-8" ng-change="ctrl.render()" placeholder="value">
144148
</div>
145-
<input type="number" ng-model="threshold.value" class="gf-form-input width-8" ng-change="ctrl.render()" placeholder="value">
146-
</div>
147149

148-
<div class="gf-form">
149-
<label class="gf-form-label">Color</label>
150-
<div class="gf-form-select-wrapper">
151-
<select class="gf-form-input" ng-model="threshold.colorMode" ng-options="f for f in ['custom', 'critical', 'warning', 'ok']" ng-change="ctrl.render()"></select>
150+
<div class="gf-form">
151+
<label class="gf-form-label">Color</label>
152+
<div class="gf-form-select-wrapper">
153+
<select class="gf-form-input" ng-model="threshold.colorMode" ng-options="f for f in ['custom', 'critical', 'warning', 'ok']" ng-change="ctrl.render()"></select>
154+
</div>
152155
</div>
153-
</div>
154156

155-
<gf-form-switch class="gf-form" label="Fill" checked="threshold.fill" on-change="ctrl.render()"></gf-form-switch>
156-
<div class="gf-form" ng-if="threshold.fill && threshold.colorMode === 'custom'">
157-
<label class="gf-form-label">Fill color</label>
158-
<span class="gf-form-label">
159-
<spectrum-picker ng-model="threshold.fillColor" ng-change="ctrl.render()" ></spectrum-picker>
160-
</span>
161-
</div>
157+
<gf-form-switch class="gf-form" label="Fill" checked="threshold.fill" on-change="ctrl.render()"></gf-form-switch>
158+
<div class="gf-form" ng-if="threshold.fill && threshold.colorMode === 'custom'">
159+
<label class="gf-form-label">Fill color</label>
160+
<span class="gf-form-label">
161+
<spectrum-picker ng-model="threshold.fillColor" ng-change="ctrl.render()" ></spectrum-picker>
162+
</span>
163+
</div>
162164

163-
<gf-form-switch class="gf-form" label="Line" checked="threshold.line" on-change="ctrl.render()"></gf-form-switch>
164-
<div class="gf-form" ng-if="threshold.line && threshold.colorMode === 'custom'">
165-
<label class="gf-form-label">Line color</label>
166-
<span class="gf-form-label">
167-
<spectrum-picker ng-model="threshold.lineColor" ng-change="ctrl.render()" ></spectrum-picker>
168-
</span>
169-
</div>
165+
<gf-form-switch class="gf-form" label="Line" checked="threshold.line" on-change="ctrl.render()"></gf-form-switch>
166+
<div class="gf-form" ng-if="threshold.line && threshold.colorMode === 'custom'">
167+
<label class="gf-form-label">Line color</label>
168+
<span class="gf-form-label">
169+
<spectrum-picker ng-model="threshold.lineColor" ng-change="ctrl.render()" ></spectrum-picker>
170+
</span>
171+
</div>
170172

171-
<div class="gf-form">
172-
<label class="gf-form-label">
173-
<i class="fa fa-trash pointer" ng-click="ctrl.removeThreshold($index)"></i>
174-
</label>
173+
<div class="gf-form">
174+
<label class="gf-form-label">
175+
<i class="fa fa-trash pointer" ng-click="ctrl.removeThreshold($index)"></i>
176+
</label>
177+
</div>
175178
</div>
176-
</div>
177179

178-
<div class="gf-form-button-row">
179-
<button class="btn btn-inverse" ng-click="ctrl.addThreshold()">
180-
<i class="fa fa-plus"></i>&nbsp;Add Threshold
181-
</button>
180+
<div class="gf-form-button-row">
181+
<button class="btn btn-inverse" ng-click="ctrl.addThreshold()">
182+
<i class="fa fa-plus"></i>&nbsp;Add Threshold
183+
</button>
184+
</div>
182185
</div>
183186
</div>
184187
</div>

public/sass/utils/_utils.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,8 @@ button.close {
7575
.affix {
7676
position: fixed;
7777
}
78+
79+
// Blur a div
80+
.blur {
81+
filter: blur(3px);
82+
}

0 commit comments

Comments
 (0)