From 25407543b0e47c6339d8cd3ce66b8eb419168b48 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 10 Aug 2011 20:06:03 -0700
Subject: [PATCH] bug 11016: cloudStack - Host page - add "host tags" in grid.

---
 ui/jsp/host.jsp               | 26 ++++++++++++++++++--------
 ui/scripts/cloud.core.host.js |  5 +++--
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp
index 593bd7ae6f7..e81d95cb0b4 100644
--- a/ui/jsp/host.jsp
+++ b/ui/jsp/host.jsp
@@ -111,8 +111,18 @@ dictionary = {
 	                    <div class="row_celltitles" id="state">
 	                    </div>
 	                </div>
-	            </div>
+	            </div>	            
 	            <div class="grid_rows even">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="label.host.tags"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="hosttags">
+	                    </div>
+	                </div>
+	            </div>
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.type"/>:</div>
@@ -122,7 +132,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.zone"/>:</div>
@@ -132,7 +142,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.pod"/>:</div>
@@ -142,7 +152,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.cluster"/>:</div>
@@ -152,7 +162,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.ip.address"/>:</div>
@@ -162,7 +172,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.version"/>:</div>
@@ -172,7 +182,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.os.preference"/>:</div>
@@ -182,7 +192,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.last.disconnected"/>:</div>
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js
index 9dbea475c20..25ac7f9c8c3 100644
--- a/ui/scripts/cloud.core.host.js
+++ b/ui/scripts/cloud.core.host.js
@@ -127,8 +127,9 @@ function hostJsonToDetailsTab() {
                 
     $thisTab.find("#id").text(fromdb(jsonObj.id));
     $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
-    $thisTab.find("#name").text(fromdb(jsonObj.name));
-        
+    $thisTab.find("#name").text(fromdb(jsonObj.name));
+    $thisTab.find("#hosttags").text(fromdb(jsonObj.hosttags));    
+    
     setHostStateInRightPanel(fromdb(jsonObj.state), $thisTab.find("#state"));