From e5ae04f417031b94df86084729b3379d0192341a Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Sun, 7 Nov 2010 11:16:24 -0800
Subject: [PATCH] bug 5883: added domain to both templates and iso details

---
 ui/jsp/iso.jsp                    | 10 ++++++++++
 ui/jsp/template.jsp               | 10 ++++++++++
 ui/scripts/cloud.core.iso.js      |  3 ++-
 ui/scripts/cloud.core.template.js |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index f699f8975b4..fe84bc9cb5a 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -161,6 +161,16 @@
 	                    <div class="row_celltitles" id="account">
 	                    </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 odd">
 	                <div class="grid_row_cell" style="width: 20%;">
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index 3211de19e5a..a3e2d13cefe 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -193,6 +193,16 @@
 	                    </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 odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 8b4ace3df95..89f38f8575c 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -234,7 +234,8 @@ function isoJsonToDetailsTab() {
     $thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
     $thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
     
-    $thisTab.find("#account").text(fromdb(jsonObj.account));
+    $thisTab.find("#account").text(fromdb(jsonObj.account));
+	$thisTab.find("#domain").text(fromdb(jsonObj.domain));
                       
     var status = "Ready";
 	if (jsonObj.isready == "false")
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index 589c4fc6670..a0c064041c3 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -274,7 +274,7 @@ function templateJsonToDetailsTab() {
     $thisTab.find("#ostypename_edit").val(jsonObj.ostypeid);    
     
     $thisTab.find("#account").text(fromdb(jsonObj.account));   
-    
+    $thisTab.find("#domain").text(fromdb(jsonObj.domain)); 
     setDateField(jsonObj.created, $thisTab.find("#created"));	
     
     //actions ***