From b861fecefa7924bf3a519aa2aaefee4bbceee12e Mon Sep 17 00:00:00 2001
From: vimniky <vimniky@gmail.com>
Date: Tue, 27 Feb 2018 10:13:59 +0800
Subject: [PATCH] Added back Accidentally removed warning radio option in Add
 Alert

---
 .../addon/components/alert/form-cluster-rules/template.hbs   | 5 +++--
 .../addon/components/alert/form-project-rules/template.hbs   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/alert/addon/components/alert/form-cluster-rules/template.hbs b/lib/alert/addon/components/alert/form-cluster-rules/template.hbs
index 9e9697b35..7daf9637b 100644
--- a/lib/alert/addon/components/alert/form-cluster-rules/template.hbs
+++ b/lib/alert/addon/components/alert/form-cluster-rules/template.hbs
@@ -27,7 +27,8 @@
     <div class="row">
       <div class="col span-2">
         <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>
       </div>
       <div class="col span-9 mt-0">
@@ -86,7 +87,7 @@
 <hr/>
 <section class="row">
   <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 class="col span-10">
   {{#if (eq model._targetType 'systemService')}}
diff --git a/lib/alert/addon/components/alert/form-project-rules/template.hbs b/lib/alert/addon/components/alert/form-project-rules/template.hbs
index 043c3ea81..91db2da62 100644
--- a/lib/alert/addon/components/alert/form-project-rules/template.hbs
+++ b/lib/alert/addon/components/alert/form-project-rules/template.hbs
@@ -88,7 +88,7 @@
 <hr/>
 <section class="row">
   <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 class="col span-10">
   {{#if (eq model._targetType 'pod')}}