From f1db650aef71493da21ef6cb4e4f8327fcd2b5a6 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 15 Dec 2010 19:13:20 -0800
Subject: [PATCH] Security Group page - implement details tab.

---
 ui/jsp/securitygroup.jsp               | 48 +++++---------------------
 ui/scripts/cloud.core.securitygroup.js | 26 ++++----------
 2 files changed, 15 insertions(+), 59 deletions(-)

diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp
index 5b899eae75b..98715f1a864 100644
--- a/ui/jsp/securitygroup.jsp
+++ b/ui/jsp/securitygroup.jsp
@@ -72,9 +72,7 @@
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="name">
-	                    </div>                    
-	                    <input class="text" id="name_edit" style="width: 200px; display: none;" type="text" />
-	                    <div id="name_edit_errormsg" style="display:none"></div>                       
+	                    </div>                        
 	                </div>
 	            </div>
 	            <div class="grid_rows odd">
@@ -84,33 +82,9 @@
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="displaytext">
-	                    </div>                    
-	                    <input class="text" id="displaytext_edit" style="width: 200px; display: none;" type="text" />
-	                    <div id="displaytext_edit_errormsg" style="display:none"></div>                       
+	                    </div>          
 	                </div>
-	            </div>
-	            <div class="grid_rows even">
-	                <div class="grid_row_cell" style="width: 20%;">
-	                    <div class="row_celltitles">
-	                        <%=t.t("disk.size")%>:</div>
-	                </div>
-	                <div class="grid_row_cell" style="width: 79%;">
-	                    <div class="row_celltitles" id="disksize">
-	                    </div>
-	                </div>
-	            </div>  
-	            <div class="grid_rows odd">
-	                <div class="grid_row_cell" style="width: 20%;">
-	                    <div class="row_celltitles">
-	                        <%=t.t("tags")%>:</div>
-	                </div>
-	                <div class="grid_row_cell" style="width: 79%;">
-	                    <div class="row_celltitles" id="tags">
-	                    </div>
-	                    <input class="text" id="tags_edit" style="width: 200px; display: none;" type="text" />
-	                    <div id="tags_edit_errormsg" style="display:none"></div>  
-	                </div>
-	            </div>
+	            </div>	            
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
@@ -118,23 +92,19 @@
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="domain">
-	                    </div>
-	                    <select class="select" id="domain_edit" style="width: 202px; display: none;">	                       
-	                    </select>	
+	                    </div>	                    
 	                </div>
-	            </div>      
-	            <!-- 	            
+	            </div>   	            
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("customizable.during.VM.creation")%>:</div>
+	                        <%=t.t("account")%>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
-	                    <div class="row_celltitles" id="isCustomized">
-	                    </div>
+	                    <div class="row_celltitles" id="account">
+	                    </div>          
 	                </div>
-	            </div>  
-	             -->   
+	            </div>	 
 	        </div>        
 	        <div class="grid_botactionpanel">
 	        	<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js
index 192ba0d8106..f3d0e74b7c8 100644
--- a/ui/scripts/cloud.core.securitygroup.js
+++ b/ui/scripts/cloud.core.securitygroup.js
@@ -153,30 +153,16 @@ function securityGroupJsonToDetailsTab() {
     });   
     */    
  
-    $thisTab.find("#id").text(fromdb(jsonObj.id));
-    
-    /*
+    $thisTab.find("#id").text(fromdb(jsonObj.id));     
     $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
-    $thisTab.find("#name").text(fromdb(jsonObj.name));
-    $thisTab.find("#name_edit").val(fromdb(jsonObj.name));
-    
-    $thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
-    $thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
-    
-    var diskSize = securityGroupGetDiskSize(jsonObj);   
-    $thisTab.find("#disksize").text(diskSize);    
-        
-    $thisTab.find("#tags").text(fromdb(jsonObj.tags));    
-    $thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));    
-      
+    $thisTab.find("#name").text(fromdb(jsonObj.name)); 
+    $thisTab.find("#displaytext").text(fromdb(jsonObj.description));       
     $thisTab.find("#domain").text(fromdb(jsonObj.domain));   
-    $thisTab.find("#domain_edit").val(fromdb(jsonObj.domainid));   
-    */
-    
+    $thisTab.find("#account").text(fromdb(jsonObj.account));   
+        
     //actions ***
     var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
-    $actionMenu.find("#action_list").empty();    
-    buildActionLinkForTab("Edit Security Group", securityGroupActionMap, $actionMenu, $midmenuItem1, $thisTab);	  
+    $actionMenu.find("#action_list").empty();  
     buildActionLinkForTab("Delete Security Group", securityGroupActionMap, $actionMenu, $midmenuItem1, $thisTab);	  
     
     $thisTab.find("#tab_spinning_wheel").hide();