From 6a362cf6a4bf10cccdac3fe2ded0494b90ca1a90 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 11 Oct 2010 11:47:12 -0700
Subject: [PATCH] new UI - alert page, event page - add tab_content_details.

---
 ui/new/jsp/alert.jsp                |  68 +++++------
 ui/new/jsp/event.jsp                | 168 ++++++++++++++--------------
 ui/new/scripts/cloud.core2.alert.js |  15 ++-
 ui/new/scripts/cloud.core2.event.js |  25 +++--
 4 files changed, 145 insertions(+), 131 deletions(-)

diff --git a/ui/new/jsp/alert.jsp b/ui/new/jsp/alert.jsp
index 68409619074..e5aa8da37fa 100644
--- a/ui/new/jsp/alert.jsp
+++ b/ui/new/jsp/alert.jsp
@@ -22,38 +22,40 @@
     <div class="tabbox" style="margin-top:15px;">
         <div class="content_tabs on">
             <%=t.t("Details")%></div>        
-    </div>
-    <div class="grid_container">
-        <div class="grid_rows odd">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Type")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="type">
-                </div>
-            </div>
-        </div>
-        <div class="grid_rows even">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Description")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="description">
-                    </div>
-            </div>
-        </div>
-        <div class="grid_rows odd">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Sent")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="sent">
-                </div>
-            </div>
-        </div>        
-    </div>
+    </div>    
+    <div id="tab_content_details">
+	    <div class="grid_container">
+	        <div class="grid_rows odd">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Type")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="type">
+	                </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows even">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Description")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="description">
+	                    </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows odd">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Sent")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="sent">
+	                </div>
+	            </div>
+	        </div>        
+	    </div>
+    </div>    
 </div>
 <!-- alert detail panel (end) -->
\ No newline at end of file
diff --git a/ui/new/jsp/event.jsp b/ui/new/jsp/event.jsp
index 5ab3dc3f466..efe330fb409 100644
--- a/ui/new/jsp/event.jsp
+++ b/ui/new/jsp/event.jsp
@@ -22,88 +22,90 @@
     <div class="tabbox" style="margin-top:15px;">
         <div class="content_tabs on">
             <%=t.t("Details")%></div>        
-    </div>
-    <div class="grid_container">
-        <div class="grid_rows odd">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("id")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="id">
-                </div>
-            </div>
-        </div>
-        <div class="grid_rows even">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Initiated.By")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="username">
-                </div>
-            </div>
-        </div>
-        <div class="grid_rows odd">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Owner.Account")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="account">
-                    </div>
-            </div>
-        </div>
-        <div class="grid_rows even">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Type")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="type">
-                </div>
-            </div>
-        </div>
-        <div class="grid_rows odd">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Level")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="level">
-                </div>
-            </div>
-        </div>
-        <div class="grid_rows even">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Description")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="description">
-                </div>
-            </div>
-        </div>
-        <div class="grid_rows odd">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("State")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="state">
-                </div>
-            </div>
-        </div>
-        <div class="grid_rows even">
-            <div class="grid_row_cell" style="width: 20%;">
-                <div class="row_celltitles">
-                    <%=t.t("Date")%>:</div>
-            </div>
-            <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="created">
-                </div>
-            </div>
-        </div>       
-    </div>
+    </div>    
+    <div id="tab_content_details">
+	    <div class="grid_container">
+	        <div class="grid_rows odd">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("id")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="id">
+	                </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows even">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Initiated.By")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="username">
+	                </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows odd">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Owner.Account")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="account">
+	                    </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows even">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Type")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="type">
+	                </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows odd">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Level")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="level">
+	                </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows even">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Description")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="description">
+	                </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows odd">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("State")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="state">
+	                </div>
+	            </div>
+	        </div>
+	        <div class="grid_rows even">
+	            <div class="grid_row_cell" style="width: 20%;">
+	                <div class="row_celltitles">
+	                    <%=t.t("Date")%>:</div>
+	            </div>
+	            <div class="grid_row_cell" style="width: 79%;">
+	                <div class="row_celltitles" id="created">
+	                </div>
+	            </div>
+	        </div>       
+	    </div>
+    </div>     
 </div>
 <!-- event detail panel (end) -->
\ No newline at end of file
diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js
index 0b497b3e7f9..caaf0eb1173 100644
--- a/ui/new/scripts/cloud.core2.alert.js
+++ b/ui/new/scripts/cloud.core2.alert.js
@@ -11,9 +11,14 @@ function alertToMidmenu(jsonObj, $midmenuItem1) {
 
 function alertToRigntPanel($midmenuItem) {      
     var jsonObj = $midmenuItem.data("jsonObj");
-    
-    var $rightPanelContent = $("#right_panel_content");    
-    $rightPanelContent.find("#type").text(jsonObj.type);
-    $rightPanelContent.find("#description").text(jsonObj.description);    
-    setDateField(jsonObj.sent, $rightPanelContent.find("#sent"));	
+    alertJsonToDetailsTab(jsonObj);   
+}
+
+function alertJsonToDetailsTab(jsonObj) {   
+    var $detailsTab = $("#right_panel_content #tab_content_details");   
+    $detailsTab.data("jsonObj", jsonObj);  
+        
+    $detailsTab.find("#type").text(jsonObj.type);
+    $detailsTab.find("#description").text(jsonObj.description);    
+    setDateField(jsonObj.sent, $detailsTab.find("#sent"));	
 }
\ No newline at end of file
diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js
index 93403044962..9efff3dc843 100644
--- a/ui/new/scripts/cloud.core2.event.js
+++ b/ui/new/scripts/cloud.core2.event.js
@@ -20,14 +20,19 @@ function eventToMidmenu(jsonObj, $midmenuItem1) {
 
 function eventToRigntPanel($midmenuItem) {      
     var jsonObj = $midmenuItem.data("jsonObj");
-    
-    var $rightPanelContent = $("#right_panel_content");
-    $rightPanelContent.find("#id").text(fromdb(jsonObj.id));
-    $rightPanelContent.find("#username").text(fromdb(jsonObj.username));
-    $rightPanelContent.find("#account").text(fromdb(jsonObj.account));
-    $rightPanelContent.find("#type").text(jsonObj.type);
-    $rightPanelContent.find("#level").text(jsonObj.level);   
-    $rightPanelContent.find("#description").text(fromdb(jsonObj.description));  
-    $rightPanelContent.find("#state").text(jsonObj.state);     
-    setDateField(jsonObj.created, $rightPanelContent.find("#created"));	
+    eventJsonToDetailsTab(jsonObj);   
+}
+
+function eventJsonToDetailsTab(jsonObj) {   
+    var $detailsTab = $("#right_panel_content #tab_content_details");   
+    $detailsTab.data("jsonObj", jsonObj);  
+      
+    $detailsTab.find("#id").text(fromdb(jsonObj.id));
+    $detailsTab.find("#username").text(fromdb(jsonObj.username));
+    $detailsTab.find("#account").text(fromdb(jsonObj.account));
+    $detailsTab.find("#type").text(jsonObj.type);
+    $detailsTab.find("#level").text(jsonObj.level);   
+    $detailsTab.find("#description").text(fromdb(jsonObj.description));  
+    $detailsTab.find("#state").text(jsonObj.state);     
+    setDateField(jsonObj.created, $detailsTab.find("#created"));	
 }
\ No newline at end of file