From ab1dcb1270e3b5b336c5bf933cdbb2956ec70974 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 17 Sep 2010 14:17:48 -0700
Subject: [PATCH] new UI - ISO page - when creating ISO for all zones, generate
 as many ISO in middle menu.

---
 ui/new/scripts/cloud.core2.init.js | 10 ++++-----
 ui/new/scripts/cloud.core2.iso.js  | 34 ++++++++++++++++--------------
 ui/new/scripts/cloud.core2.js      |  9 +++++---
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index d2d69e6729c..42eaef2bf64 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -17,7 +17,7 @@ $(document).ready(function() {
     $("#accordion_menu").show();
        
     var $midmenuItem = $("#midmenu_item");
-    function listMidMenuItems(leftmenuId, commandString, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSP, toMidmenu, toRightPanel) { 
+    function listMidMenuItems(leftmenuId, commandString, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSP, toMidmenu, toRightPanel, getMidmenuId) { 
         $("#"+leftmenuId).bind("click", function(event) {
             if(selected_leftmenu_id != null && selected_leftmenu_id.length > 0)
                 $("#"+selected_leftmenu_id).removeClass("selected");
@@ -60,7 +60,7 @@ $(document).ready(function() {
                                 var $midmenuItem1 = $midmenuItem.clone();  
                                 $midmenuItem1.data("toRightPanelFn", toRightPanel);                             
                                 toMidmenu(items[i], $midmenuItem1);    
-                                bindClickToMidMenu($midmenuItem1, toRightPanel);             
+                                bindClickToMidMenu($midmenuItem1, toRightPanel, getMidmenuId);             
                                 $("#midmenu_container").append($midmenuItem1.show());                            
                             }  
                         }  
@@ -82,9 +82,9 @@ $(document).ready(function() {
     listMidMenuItems("leftmenu_submenu_featured_template", "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
     listMidMenuItems("leftmenu_submenu_community_template", "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel);
     
-    listMidMenuItems("leftmenu_submenu_my_iso", "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel);
-    listMidMenuItems("leftmenu_submenu_featured_iso", "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel);
-    listMidMenuItems("leftmenu_submenu_community_iso", "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel);
+    listMidMenuItems("leftmenu_submenu_my_iso", "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel, isoGetMidmenuId);
+    listMidMenuItems("leftmenu_submenu_featured_iso", "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel, isoGetMidmenuId);
+    listMidMenuItems("leftmenu_submenu_community_iso", "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel, isoGetMidmenuId);
         
     $("#leftmenu_instance_group_header").bind("click", function(event) {  
         showMiddleMenu();
diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js
index adc57f4eb32..3f3e5fed503 100644
--- a/ui/new/scripts/cloud.core2.iso.js
+++ b/ui/new/scripts/cloud.core2.iso.js
@@ -33,27 +33,24 @@ function afterLoadIsoJSP() {
 			    var bootable = thisDialog.find("#add_iso_bootable").val();			
     		    				    
 		        var $midmenuItem1 = beforeAddingMidMenuItem() ;				    
-    		    				
+    		       		    				
 			    $.ajax({
 			        data: createURL("command=registerIso&name="+encodeURIComponent(name)+"&displayText="+encodeURIComponent(desc)+"&url="+encodeURIComponent(url)+"&zoneId="+zoneId+"&isPublic="+isPublic+"&osTypeId="+osType+"&bootable="+bootable+"&response=json"),
 				    dataType: "json",
 				    success: function(json) {					
-				        var items = json.registerisoresponse.iso;
+				        var items = json.registerisoresponse.iso;				       
 				        isoToMidmenu(items[0], $midmenuItem1);
-						bindClickToMidMenu($midmenuItem1, isoToRigntPanel);  
-						
-                        /*
+						bindClickToMidMenu($midmenuItem1, isoToRigntPanel, isoGetMidmenuId);  
+						afterAddingMidMenuItem($midmenuItem1, true);
+						                        
                         if(items.length > 1) {                               
-                            for(var i=1; i<items.length; i++) {         
-                                var template2 = $("#vm_iso_template").clone(true);                                                               
-                                isoJSONToTemplate(items[i], template2);	
-                                submenuContent.find("#grid_content").prepend(template2.fadeIn("slow"));	 
-                                changeGridRowsTotal(submenuContent.find("#grid_rows_total"), 1); 	 
+                            for(var i=1; i<items.length; i++) {   
+                                var $midmenuItem2 = $("#midmenu_item").clone();
+                                isoToMidmenu(items[i], $midmenuItem2);
+                                bindClickToMidMenu($midmenuItem2, isoToRigntPanel, isoGetMidmenuId); 
+                                $("#midmenu_container").append($midmenuItem2.show());
                             }                                    
-                        }      
-                        */
-                        
-                        afterAddingMidMenuItem($midmenuItem1, true);							
+                        }  						
 				    }, 
 					error: function(XMLHttpResponse) {					    
 					    handleErrorInMidMenu(XMLHttpResponse, $midmenuItem1);					  
@@ -174,8 +171,13 @@ function afterLoadIsoJSP() {
 	}));
 }
 
+function isoGetMidmenuId(jsonObj) {
+    return "midmenuItem_" + jsonObj.id + "_" + fromdb(jsonObj.zonename).replace(/\s/g, ""); //remove all spaces in zonename
+}
+
 function isoToMidmenu(jsonObj, $midmenuItem1) {    
-    $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));  
+    var id = isoGetMidmenuId(jsonObj);
+    $midmenuItem1.attr("id", id);   
     $midmenuItem1.data("jsonObj", jsonObj); 
         
     var $iconContainer = $midmenuItem1.find("#icon_container").show();
@@ -276,7 +278,7 @@ var isoActionMap = {
         asyncJobResponse: "deleteisosresponse",
         inProcessText: "Deleting ISO....",
         afterActionSeccessFn: function(jsonObj) {          
-            var $midmenuItem1 = $("#midmenuItem_"+jsonObj.id);
+            var $midmenuItem1 = $("#"+isoGetMidmenuId(jsonObj)); 
             $midmenuItem1.remove();
             clearRightPanel();
             isoClearRightPanel();
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index c56c8aa816b..9b307abad5a 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -582,13 +582,16 @@ function afterAddingMidMenuItem($midmenuItem1, isSuccessful, extraMessage) {
 	}
 }
 
-function bindClickToMidMenu($midmenuItem1, toRightPanel) {
+function bindClickToMidMenu($midmenuItem1, toRightPanel, getMidmenuId) {
     $midmenuItem1.bind("click", function(event){  
         var thisMidmenuItem = $(this);
-        
+
         if(selected_midmenu_id != null && selected_midmenu_id.length > 0)
             $("#"+selected_midmenu_id).find("#content").removeClass("selected");
-        selected_midmenu_id = ("midmenuItem_"+thisMidmenuItem.data("jsonObj").id);
+        if(getMidmenuId == null)
+            selected_midmenu_id = "midmenuItem_"+thisMidmenuItem.data("jsonObj").id;
+        else
+            selected_midmenu_id = getMidmenuId(thisMidmenuItem.data("jsonObj"));
     
         thisMidmenuItem.find("#content").addClass("selected");                                               
         clearRightPanel();