From cc251fba1670f92705d931655ccfbc97fdf1c637 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Wed, 4 Jan 2017 15:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=B3=BB=E7=BB=9F=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=8F=98=E5=AE=BD?=
 =?UTF-8?q?=E7=9A=84bug+=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gulpfile.js                                   |  4 ++--
 plugins/developer/ts/dataManagerHelper.ts     |  2 +-
 plugins/kubernetes/html/layoutKubernetes.html | 18 +++++++++++++-----
 plugins/navigation/ts/navigationPlugin.ts     |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 21be333..a4e3610 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -248,8 +248,8 @@ gulp.task('connect', ['watch'], function() {
         targetPath: '/hawtio/git'
     }, {
         proto: "http",
-        port: "8088",
-        hostname: "192.168.0.110",
+        port: "8080",
+        hostname: "192.168.0.181",
         path: '/java/console/api',
         targetPath: "/"
     }];
diff --git a/plugins/developer/ts/dataManagerHelper.ts b/plugins/developer/ts/dataManagerHelper.ts
index c9caf6d..31e79da 100644
--- a/plugins/developer/ts/dataManagerHelper.ts
+++ b/plugins/developer/ts/dataManagerHelper.ts
@@ -47,7 +47,7 @@ module Developer{
 			},			
 			{
 			 	href: UrlHelpers.join(context,"Overview/","task"),
-			 	label: "任务",
+			 	label: "查看任务",
 			 	title: "任务查看"
 			},			
 		]);
diff --git a/plugins/kubernetes/html/layoutKubernetes.html b/plugins/kubernetes/html/layoutKubernetes.html
index 7ece69d..525a788 100644
--- a/plugins/kubernetes/html/layoutKubernetes.html
+++ b/plugins/kubernetes/html/layoutKubernetes.html
@@ -235,13 +235,21 @@
 </script>
 <!-- 迁移进度条 -->
 <script type="text/ng-template" id="taskProcess.html">
-    <div class="ngCellText progress" ng-init="entity=row.entity">
-        <div ng-show="entity.status!==3" class="progress-bar progress-bar-success active sj_progress_bar " role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="width: {{entity.process}}%">
-            <span class="sj_progress_font">{{entity.process}}%</span>
+    <!-- <div style="height:80%;" class="ngCellText progress" ng-init="entity=row.entity"> -->
+    <div ng-init="entity=row.entity">
+        <div style="position:relative;text-align:right;width:100%;height:25px">
+             <span></span>
         </div>
-        <div ng-show="entity.status ===3" class="progress-bar progress-bar-danger active sj_progress_bar" role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="width: {{entity.process}}%" title="{{entity.process}}%">
-            <span class="sj_progress_font">{{entity.process}}%</span>
+        <div ng-show="entity.status!==3" class="progress-bar progress-bar-success active sj_progress_bar " role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="text-align:left;height:15px;width: {{entity.process}}%">
+          <!--   <span class="sj_progress_font">{{entity.process}}%</span> -->
         </div>
+        <div style="position:relative;text-align:right;width:100%;height:15px;line-height:90%">
+             <span>{{entity.process}}%</span>
+        </div>
+       
+      <!--  <div ng-show="entity.status ===3" class="progress-bar progress-bar-danger active sj_progress_bar" role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="30" aria-valuemax="100" style="width: 100%" title="{{entity.process}}%">
+             <span class="sj_progress_font">{{entity.process}}%</span>
+        </div> -->
     </div>
 </script>
 <!--迁移状态显示 -->
diff --git a/plugins/navigation/ts/navigationPlugin.ts b/plugins/navigation/ts/navigationPlugin.ts
index cccfe76..10b25c6 100644
--- a/plugins/navigation/ts/navigationPlugin.ts
+++ b/plugins/navigation/ts/navigationPlugin.ts
@@ -207,7 +207,7 @@ module Navigation {
                 </ul>
               </div>
               <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>               
+                <i class=" sj_menu_02" ></i><a href="{{subTab.href}}">{{subTab.label}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>               
               </div>
             </li>  
           </ul>