rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1665 from vimniky/alert-logging 

Added back Accidentally removed warning radio option in Add Alert
This commit is contained in:
Vincent Fiduccia 2018-02-26 21:38:21 -07:00 committed by GitHub
parent f5df9ba79e b861fecefa
commit 38a08a2831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/alert/addon/components/alert/form-cluster-rules/template.hbs
View File

@ -27,7 +27,8 @@
<div class="row"> <div class="row">
<div class="col span-2"> <div class="col span-2">
<label class="acc-label"> <label class="acc-label">
{{radio-button selection=model._targetType value="normalEvent"}} {{t 'alertPage.newOrEdit.normal'}} <span class="pr-10"> {{radio-button selection=model._targetType value="normalEvent"}} {{t 'alertPage.newOrEdit.normal'}} </span>
{{radio-button selection=model._targetType value="warningEvent"}} {{t 'alertPage.newOrEdit.warning'}}
</label> </label>
</div> </div>
<div class="col span-9 mt-0"> <div class="col span-9 mt-0">
@ -86,7 +87,7 @@
<hr/> <hr/>
<section class="row"> <section class="row">
<div class="col span-1"> <div class="col span-1">
<div style="{{if (eq _targetType 'systemService') '' 'padding-top: 6px;'}}">{{if isEventTarget (t 'alertPage.newOrEdit.happens') (t 'alertPage.newOrEdit.is')}}</div> <div style="{{if (or (eq model._targetType 'node') (eq model._targetType 'nodeSelector')) 'padding-top: 6px;' ''}}">{{if isEventTarget (t 'alertPage.newOrEdit.happens') (t 'alertPage.newOrEdit.is')}}</div>
</div> </div>
<div class="col span-10"> <div class="col span-10">
{{#if (eq model._targetType 'systemService')}} {{#if (eq model._targetType 'systemService')}}

2
lib/alert/addon/components/alert/form-project-rules/template.hbs
View File

@ -88,7 +88,7 @@
<hr/> <hr/>
<section class="row"> <section class="row">
<div class="col span-1"> <div class="col span-1">
<div style="padding-top:6px;">{{t 'alertPage.newOrEdit.is'}}</div> <div style="{{if (eq model._targetType 'pod') 'padding-top: 6px;' 'padding-top: 8px;'}}">{{t 'alertPage.newOrEdit.is'}}</div>
</div> </div>
<div class="col span-10"> <div class="col span-10">
{{#if (eq model._targetType 'pod')}} {{#if (eq model._targetType 'pod')}}