From cd576af3be87edd7474d5dcbc895da737a54e02e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 25 Jan 2011 16:43:17 -0800
Subject: [PATCH] bug 7377: router page - add domain row.

---
 ui/jsp/router.jsp               | 14 +++++++++++++-
 ui/scripts/cloud.core.router.js |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index 39d17d3236b..ef072c16773 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -143,7 +143,19 @@
                         </div>
                     </div>
                 </div>
+                
                 <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("Domain")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="domain">
+                        </div>
+                    </div>
+                </div>
+                
+                <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <%=t.t("Account")%>:</div>
@@ -153,7 +165,7 @@
                         </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">
                             <%=t.t("Created")%>:</div>
diff --git a/ui/scripts/cloud.core.router.js b/ui/scripts/cloud.core.router.js
index f458a408f54..3caf0694879 100644
--- a/ui/scripts/cloud.core.router.js
+++ b/ui/scripts/cloud.core.router.js
@@ -104,6 +104,7 @@ function routerJsonToDetailsTab() {
     $thisTab.find("#guestipaddress").text(fromdb(jsonObj.guestipaddress));
     $thisTab.find("#hostname").text(fromdb(jsonObj.hostname));
     $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"));	 
     
@@ -146,6 +147,7 @@ function routerClearDetailsTab() {
     $thisTab.find("#guestipaddress").text("");
     $thisTab.find("#hostname").text("");
     $thisTab.find("#networkdomain").text("");
+    $thisTab.find("#domain").text("");  
     $thisTab.find("#account").text("");  
     $thisTab.find("#created").text("");   
     resetViewConsoleAction(null, $thisTab);