From 1245d2fed20bf06de49252e5cce4be8c8f2744dd Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 24 Jan 2011 10:49:31 -0800
Subject: [PATCH] bug 7301: event page - add domain row.

---
 ui/jsp/event.jsp               | 20 +++++++++++++++-----
 ui/scripts/cloud.core.event.js |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ui/jsp/event.jsp b/ui/jsp/event.jsp
index 6b2935b3d49..53465a35e79 100644
--- a/ui/jsp/event.jsp
+++ b/ui/jsp/event.jsp
@@ -63,8 +63,18 @@
 		                <div class="row_celltitles" id="account">
 		                    </div>
 		            </div>
-		        </div>
+		        </div>		        
 		        <div class="grid_rows even">
+		            <div class="grid_row_cell" style="width: 20%;">
+		                <div class="row_celltitles">
+		                    <fmt:message key="label.owner.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">
 		                    <fmt:message key="label.type"/>:</div>
@@ -74,7 +84,7 @@
 		                </div>
 		            </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.level"/>:</div>
@@ -84,7 +94,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">
 		                    <fmt:message key="label.description"/>:</div>
@@ -94,7 +104,7 @@
 		                </div>
 		            </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.state"/>:</div>
@@ -104,7 +114,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">
 		                    <fmt:message key="label.date"/>:</div>
diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js
index 4a32f4ab411..46c88a1dc34 100644
--- a/ui/scripts/cloud.core.event.js
+++ b/ui/scripts/cloud.core.event.js
@@ -101,6 +101,7 @@ function eventJsonToDetailsTab() {
     $thisTab.find("#id").text(fromdb(jsonObj.id));
     $thisTab.find("#username").text(fromdb(jsonObj.username));
     $thisTab.find("#account").text(fromdb(jsonObj.account));
+    $thisTab.find("#domain").text(fromdb(jsonObj.domain));
     $thisTab.find("#type").text(fromdb(jsonObj.type));
     $thisTab.find("#level").text(fromdb(jsonObj.level));   
     $thisTab.find("#description").text(fromdb(jsonObj.description));