From fdf94950b3e1865cf235f0ef8d3b6bdc97e032df Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Jul 2011 13:44:57 -0700
Subject: [PATCH] cloudStack - cluster page - add "Manged State".

---
 ui/jsp/cluster.jsp               | 14 ++++++++++++--
 ui/scripts/cloud.core.cluster.js |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp
index 2e5f4fe1e8b..baed33f2f43 100644
--- a/ui/jsp/cluster.jsp
+++ b/ui/jsp/cluster.jsp
@@ -128,13 +128,23 @@ dictionary = {
 		        <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <fmt:message key="label.state"/>:</div>
+		                    <fmt:message key="allocation.state"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="allocationstate">
 		                </div>
 		            </div>
-		        </div>				        		        	        
+		        </div>	
+		        <div class="grid_rows even">
+		            <div class="grid_row_cell" style="width: 20%;">
+		                <div class="row_celltitles">
+		                    <fmt:message key="managed.state"/>:</div>
+		            </div>
+		            <div class="grid_row_cell" style="width: 79%;">
+		                <div class="row_celltitles" id="managedstate">
+		                </div>
+		            </div>
+		        </div>			        		        		        	        
 		    </div>
 		</div>    
     </div>     
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index 982ceea6ede..3a76cd4d42f 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -73,6 +73,7 @@ function clusterJsonToDetailsTab() {
     $thisTab.find("#hypervisortype").text(fromdb(jsonObj.hypervisortype));
     $thisTab.find("#clustertype").text(fromdb(jsonObj.clustertype));
     $thisTab.find("#allocationstate").text(fromdb(jsonObj.allocationstate));
+    $thisTab.find("#managedstate").text(fromdb(jsonObj.managedstate));
     
     //actions ***   
     clusterBuildActionMenu(jsonObj);        
@@ -105,6 +106,8 @@ function clusterClearDetailsTab() {
     $thisTab.find("#podname").text("");     
     $thisTab.find("#hypervisortype").text("");
     $thisTab.find("#clustertype").text("");
+    $thisTab.find("#allocationstate").text("");
+    $thisTab.find("#managedstate").text("");
     
     //actions ***   
     var $actionMenu = $thisTab.find("#action_link #action_menu");