From d98f7ebfbd380f0ea95b285adc46c35b2703a19c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 15 Jun 2011 15:53:49 -0700
Subject: [PATCH] CloudStack UI - router page - add Redundant grid row that
 indicates whether this router is redundant or not. And if it's, redundant
 state will be shown on UI.

---
 client/WEB-INF/classes/resources/messages.properties |  2 ++
 .../WEB-INF/classes/resources/messages_es.properties |  3 ++-
 .../WEB-INF/classes/resources/messages_ja.properties |  2 ++
 .../classes/resources/messages_zh_CN.properties      |  2 ++
 ui/jsp/router.jsp                                    | 12 ++++++++++++
 ui/scripts/cloud.core.router.js                      | 12 ++++++++++--
 6 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 9064d945a8a..3c4bea0296f 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -3,6 +3,8 @@
 
 
 #Labels
+label.is.redundant.router=Redundant
+
 force.delete=Force Delete
 force.delete.domain.warning=Warning: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
 
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 34ae4534493..30f3b5b2993 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -1,5 +1,6 @@
 #New - Add all new parameters here.  
-
+label.is.redundant.router=redundante
+label.redundant.state=Redundant State
 
 
 #Labels
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 9c2b4c9e78b..3371ebba0be 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -3,6 +3,8 @@
 
 
 #Labels
+label.is.redundant.router=冗長
+
 force.delete=強制削除
 force.delete.domain.warning=警告：このオプションを選択するとすべての子ドメインおよび関連するすべてのアカウントとそのリソースの削除が発生します。
 
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 3dec87f4ebc..19edb821b16 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -3,6 +3,8 @@
 
 
 #Labels
+label.is.redundant.router=冗余
+
 force.delete=力删除
 force.delete.domain.warning=警告：选择此选项将导致所有子域和所有相关的帐户和资源删除。
 
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index 97e327b431e..5974587bcdf 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -208,6 +208,18 @@ 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.is.redundant.router"/>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="isredundantrouter">
+                        </div>
+                    </div>
+                </div>
+                                                                
             </div>           
         </div>
     </div>   
diff --git a/ui/scripts/cloud.core.router.js b/ui/scripts/cloud.core.router.js
index fadfb6948db..13469644aaa 100644
--- a/ui/scripts/cloud.core.router.js
+++ b/ui/scripts/cloud.core.router.js
@@ -182,7 +182,13 @@ function routerJsonToDetailsTab() {
     $thisTab.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
     $thisTab.find("#domain").text(fromdb(jsonObj.domain));  
     $thisTab.find("#account").text(fromdb(jsonObj.account));  
-    setDateField(jsonObj.created, $thisTab.find("#created"));	 
+    setDateField(jsonObj.created, $thisTab.find("#created"));	
+        
+    setBooleanReadField(jsonObj.isredundantrouter, $thisTab.find("#isredundantrouter"));
+    if(jsonObj.isredundantrouter == true) {
+    	var t = $thisTab.find("#isredundantrouter").text()+ " (" + fromdb(jsonObj.redundantstate) + ")";
+    	$thisTab.find("#isredundantrouter").text(t);
+    }   
     
     resetViewConsoleAction(jsonObj, $thisTab);   
     
@@ -231,7 +237,9 @@ function routerClearDetailsTab() {
     $thisTab.find("#networkdomain").text("");
     $thisTab.find("#domain").text("");  
     $thisTab.find("#account").text("");  
-    $thisTab.find("#created").text("");   
+    $thisTab.find("#created").text("");   
+    $thisTab.find("#isredundantrouter").text("");
+        
     resetViewConsoleAction(null, $thisTab);       
     
     var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");