From ddfbfc104862e8e2ff4693a08171534123a2bcb8 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Sun, 7 Nov 2010 11:00:13 -0800
Subject: [PATCH] bug 5846: added domain to router details

---
 ui/jsp/instance.jsp               | 10 ++++++++++
 ui/scripts/cloud.core.instance.js |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 7e6c2563a11..27c842f8665 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1053,6 +1053,16 @@
             </div>
         </div>
     </div>
+	<div class="grid_rows even">
+		<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">
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index f6e7cc0e0b0..91eb72e1c48 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -1636,7 +1636,8 @@ function vmRouterJSONToTemplate(jsonObj, $template) {
     $template.find("#guestipaddress").text(fromdb(jsonObj.guestipaddress));
     $template.find("#hostname").text(fromdb(jsonObj.hostname));
     $template.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
-    $template.find("#account").text(fromdb(jsonObj.account));  
+    $template.find("#account").text(fromdb(jsonObj.account));  
+	$template.find("#domain").text(fromdb(jsonObj.domain));
     setDateField(jsonObj.created, $template.find("#created"));	
     
     //***** actions (begin) *****