From 890275d93d1158cb5aa4553d0c937fbe492c1762 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 27 Dec 2016 15:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=A2=9E=E5=A4=A7=E5=8F=AF=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F<=E4=BB=BB=E5=8A=A1>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/kubernetes/html/layoutKubernetes.html | 2 +-
 plugins/navigation/ts/navigationPlugin.ts     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/kubernetes/html/layoutKubernetes.html b/plugins/kubernetes/html/layoutKubernetes.html
index c7d4a06f..7ece69dd 100644
--- a/plugins/kubernetes/html/layoutKubernetes.html
+++ b/plugins/kubernetes/html/layoutKubernetes.html
@@ -214,7 +214,7 @@
         <button class="btn sj_btn" style="border:0;background:none;" ng-click="showDeleteOne.open(entity)" ng-disabled="entity.status == 1 || entity.status == 0">
             <span class="glyphicon glyphicon-trash"></span>&nbsp;&nbsp;删除
         </button>
-        <button class="btn sj_btn" style="border:0;  " ng-click="showCancelOne.open(entity)" ng-disabled="entity.process == 99 || entity.status == 3">
+        <button class="btn sj_btn" style="border:0;  " ng-click="showCancelOne.open(entity)" ng-disabled="entity.process == 99 || entity.status == 2">
             <span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;取消
         </button>
         <div hawtio-confirm-dialog="showDeleteOne.show" title="是否删除任务？" ok-button-text="确认" cancel-button-text="取消" on-cancel="showDeleteOne.onCancelled()" on-ok="showDeleteOne.onOk()">
diff --git a/plugins/navigation/ts/navigationPlugin.ts b/plugins/navigation/ts/navigationPlugin.ts
index 0133353d..cccfe761 100644
--- a/plugins/navigation/ts/navigationPlugin.ts
+++ b/plugins/navigation/ts/navigationPlugin.ts
@@ -206,8 +206,8 @@ module Navigation {
                   </li>
                 </ul>
               </div>
-              <div ng-hide="subTab.items.length" class="sj_menu_nav" >
-                <i class=" sj_menu_02" ></i><a href="{{subTab.href}}">{{subTab.label}}</a>               
+              <div ng-hide="subTab.items.length" class="title sj_menu_nav" >
+                <i class=" sj_menu_02" ></i><a href="{{subTab.href}}">{{subTab.label}}&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;</a>               
               </div>
             </li>  
           </ul>