From 962c966937744181bc3aa7d8f2b46146cc375ec3 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 20 Jul 2011 11:38:39 -0700
Subject: [PATCH] cloudStack - Network Offering page - add redundant router.

---
 ui/jsp/networkoffering.jsp               | 17 ++++++++++++++---
 ui/scripts/cloud.core.networkoffering.js |  8 +++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index 7cac2e7414f..689854935e8 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -108,6 +108,17 @@ dictionary = {
 	            </div>
 	            
 	            <div class="grid_rows odd">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="label.redundant.router"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="redundantrouter">
+	                    </div>	                   
+	                </div>
+	            </div>
+	            	            
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.is.default"/>:</div>
@@ -118,7 +129,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.specify.vlan"/>:</div>
@@ -129,7 +140,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.network.rate"/>:</div>
@@ -140,7 +151,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.traffic.type"/>:</div>
diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js
index 3ead89afaa9..3811d5ab184 100644
--- a/ui/scripts/cloud.core.networkoffering.js
+++ b/ui/scripts/cloud.core.networkoffering.js
@@ -76,7 +76,7 @@ function doEditNetworkOffering2($actionLink, $detailsTab, $midmenuItem1, $readon
 	
 	var availability = $detailsTab.find("#availability_edit").val();
     array1.push("&availability="+todb(availability));	
-	
+	    
 	$.ajax({
 	    data: createURL("command=updateNetworkOffering&id="+id+array1.join("")),
 		dataType: "json",
@@ -159,7 +159,8 @@ function networkOfferingJsonToDetailsTab() {
      
     $thisTab.find("#availability").text(fromdb(jsonObj.availability));     
     $thisTab.find("#availability_edit").val(fromdb(jsonObj.availability)); 
-     
+         
+    setBooleanReadField(jsonObj.redundantrouter, $thisTab.find("#redundantrouter"));	    
     setBooleanReadField(jsonObj.isdefault, $thisTab.find("#isdefault"));
     setBooleanReadField(jsonObj.specifyvlan, $thisTab.find("#specifyvlan"));
       
@@ -190,7 +191,8 @@ function networkOfferingClearDetailsTab() {
     $thisTab.find("#grid_header_title").text("");
     $thisTab.find("#name").text("");   
     $thisTab.find("#displaytext").text("");
-    $thisTab.find("#displaytext_edit").val("");    
+    $thisTab.find("#displaytext_edit").val("");   
+    $thisTab.find("#redundantrouter").text("");
     $thisTab.find("#disksize").text("");
     $thisTab.find("#tags").text("");   
     $thisTab.find("#domain").text("");