From fc6086067cb4f71e255633231c5d0e9936db41ef Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 22 Aug 2011 13:37:39 -0700
Subject: [PATCH] bug 11202: cloudStack - Service Offering page - add Network
 Rate in grid.

---
 ui/jsp/serviceoffering.jsp               | 20 +++++++++++++++-----
 ui/scripts/cloud.core.serviceoffering.js |  3 ++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 464fc77e21a..763e4c6cbdd 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -125,6 +125,16 @@ dictionary = {
 	                </div>
 	            </div>
 	            <div class="grid_rows odd">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="network.rate"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="network_rate">
+	                    </div>
+	                </div>
+	            </div>
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.offer.ha"/>:</div>
@@ -135,7 +145,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.CPU.cap"/>:</div>
@@ -146,7 +156,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.storage.tags"/>:</div>
@@ -157,7 +167,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.host.tags"/>:</div>
@@ -168,7 +178,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 +191,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 d02cba6254d..0bfd5e55d92 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -331,7 +331,8 @@ function serviceOfferingJsonToDetailsTab() {
     
     $thisTab.find("#storagetype").text(fromdb(jsonObj.storagetype));
     $thisTab.find("#cpu").text(jsonObj.cpunumber + " x " + convertHz(jsonObj.cpuspeed));
-    $thisTab.find("#memory").text(convertBytes(parseInt(jsonObj.memory)*1024*1024));
+    $thisTab.find("#memory").text(convertBytes(parseInt(jsonObj.memory)*1024*1024));
+    $thisTab.find("#network_rate").text(jsonObj.networkrate);
     
     setBooleanReadField(jsonObj.offerha, $thisTab.find("#offerha"));	
     setBooleanEditField(jsonObj.offerha, $thisTab.find("#offerha_edit"));