From 63d869facb4948e5115cb1f0debdf8ff8f1eb4fc Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 22 Jul 2011 15:29:36 -0700
Subject: [PATCH] Bug 10418: cloudStack - service offering page, system service
 offering page - add "Host Tags" in details tab.

---
 ui/jsp/serviceoffering.jsp                     | 15 +++++++++++++--
 ui/jsp/systemserviceoffering.jsp               | 15 +++++++++++++--
 ui/scripts/cloud.core.serviceoffering.js       |  5 ++++-
 ui/scripts/cloud.core.systemserviceoffering.js |  7 +++++--
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index be0897923e3..96e4e714322 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -156,8 +156,19 @@ dictionary = {
 	                    </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.domain"/>:</div>
@@ -170,7 +181,7 @@ dictionary = {
 	                </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.created"/>:</div>
diff --git a/ui/jsp/systemserviceoffering.jsp b/ui/jsp/systemserviceoffering.jsp
index 0076384624f..4123cd0a0d9 100644
--- a/ui/jsp/systemserviceoffering.jsp
+++ b/ui/jsp/systemserviceoffering.jsp
@@ -158,6 +158,17 @@ dictionary = {
 	            </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.default.use"/>:</div>
@@ -168,7 +179,7 @@ dictionary = {
 	                </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.domain"/>:</div>
@@ -181,7 +192,7 @@ dictionary = {
 	                </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.created"/>:</div>
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index 15c4a9d7552..e843986c708 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -334,6 +334,8 @@ function serviceOfferingJsonToDetailsTab() {
     
     $thisTab.find("#tags").text(fromdb(jsonObj.tags)); 
     $thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
+    
+    $thisTab.find("#hosttags").text(fromdb(jsonObj.hosttags)); 
     
     $thisTab.find("#domain").text(fromdb(jsonObj.domain)); 
     $thisTab.find("#domain_edit").val(fromdb(jsonObj.domainid));   
@@ -368,7 +370,8 @@ function serviceOfferingClearDetailsTab() {
     $thisTab.find("#offerha").text("");
     $thisTab.find("#offerha_edit").val("");    
     $thisTab.find("#limitcpuuse").text("");
-    $thisTab.find("#tags").text("");  
+    $thisTab.find("#tags").text("");  
+    $thisTab.find("#hosttags").text(""); 
     $thisTab.find("#domain").text(""); 
     $thisTab.find("#domain_edit").val("");   
     $thisTab.find("#created").text(""); 
diff --git a/ui/scripts/cloud.core.systemserviceoffering.js b/ui/scripts/cloud.core.systemserviceoffering.js
index 7d14363e6cf..2a7841f361a 100644
--- a/ui/scripts/cloud.core.systemserviceoffering.js
+++ b/ui/scripts/cloud.core.systemserviceoffering.js
@@ -334,7 +334,9 @@ function systemServiceOfferingJsonToDetailsTab() {
     
     $thisTab.find("#tags").text(fromdb(jsonObj.tags)); 
     $thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
-       
+     
+    $thisTab.find("#hosttags").text(fromdb(jsonObj.hosttags)); 
+    
     setBooleanReadField(jsonObj.defaultuse,  $thisTab.find("#defaultuse"));
     
     $thisTab.find("#domain").text(fromdb(jsonObj.domain)); 
@@ -377,7 +379,8 @@ function systemServiceOfferingClearDetailsTab() {
     $thisTab.find("#offerha").text("");
     $thisTab.find("#offerha_edit").val("");  
     $thisTab.find("#limitcpuuse").text("");
-    $thisTab.find("#tags").text("");      
+    $thisTab.find("#tags").text(""); 
+    $thisTab.find("#hosttags").text(""); 
     $thisTab.find("#defaultuse").text("");     
     $thisTab.find("#domain").text(""); 
     $thisTab.find("#domain_edit").val("");