From ae1274e976ffaa6f982abc579399354b05c958a6 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 19 Nov 2010 11:23:49 -0800
Subject: [PATCH] bug 7064: resource pages - give every addXXX action a
 dedicate button.

---
 .../classes/resources/resource.properties     | 11 ++-
 ui/index.jsp                                  | 92 +++++++++++++++----
 ui/scripts/cloud.core.cluster.js              |  6 +-
 ui/scripts/cloud.core.host.js                 |  4 +-
 ui/scripts/cloud.core.js                      | 18 +++-
 ui/scripts/cloud.core.pod.js                  |  8 +-
 ui/scripts/cloud.core.primarystorage.js       |  4 +-
 ui/scripts/cloud.core.resource.js             |  9 +-
 ui/scripts/cloud.core.zone.js                 | 10 +-
 9 files changed, 119 insertions(+), 43 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index 806c97c4b98..260e5ca880e 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -155,4 +155,13 @@ physical.resources = Physical Resources
 virtual.resources = Virtual Resources
 virtual.routers = Virtual Routers
 system.vms = System VMs
-system.vm = System VM
\ No newline at end of file
+system.vm = System VM
+
+add.zone = Add Zone
+add.host = Add Host
+add.primarystorage = Add Primary Storage
+add.secondarystorage = Add Secondary Storage
+add.pod = Add pod
+add.vlan = Add VLAN
+add.direct.ip.range = Add Direct IP Range
+update.SSL.certificate = Update SSL Certificate
\ No newline at end of file
diff --git a/ui/index.jsp b/ui/index.jsp
index 03c1b4b4e0e..7c3874b8355 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -215,6 +215,7 @@ long milliseconds = new Date().getTime();
                                 </ul>
                             </div>
                         </div>
+                        
                         <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
                             <div class="actionpanel_button">
                                 <div class="actionpanel_button_icons">
@@ -223,6 +224,78 @@ long milliseconds = new Date().getTime();
                                     <%=t.t("add")%></div>
                             </div>
                         </div>
+                         
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_zone_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Add Zone" /></div>
+                                <div class="actionpanel_button_links" id="Div3">
+                                    <%=t.t("add.zone")%></div>
+                            </div>
+                        </div> 
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_host_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Add Host" /></div>
+                                <div class="actionpanel_button_links" id="label">
+                                    <%=t.t("add.host")%></div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_primarystorage_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
+                                <div class="actionpanel_button_links" id="Div2">
+                                    <%=t.t("add.primarystorage")%></div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_secondarystorage_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Add Secondary Storage" /></div>
+                                <div class="actionpanel_button_links" id="Div4">
+                                    <%=t.t("add.secondarystorage")%></div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_pod_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Add pod" /></div>
+                                <div class="actionpanel_button_links" id="Div6">
+                                    <%=t.t("add.pod")%></div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_vlan_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Add VLAN" /></div>
+                                <div class="actionpanel_button_links" id="Div8">
+                                    <%=t.t("add.vlan")%></div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_directIpRange_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Add Direct IP Range" /></div>
+                                <div class="actionpanel_button_links" id="Div10">
+                                    <%=t.t("add.direct.ip.range")%></div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_Update_SSL_Certificate_button" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/addvm_actionicon.png" alt="Update SSL Certificate" /></div>
+                                <div class="actionpanel_button_links" id="Div12">
+                                    <%=t.t("update.SSL.certificate")%></div>
+                            </div>
+                        </div>
+                        <!--  
                         <div class="actionpanel_button_wrapper" id="midmenu_add2_link" style="display: none;">
                             <div class="actionpanel_button">
                                 <div class="actionpanel_button_icons">
@@ -238,23 +311,8 @@ long milliseconds = new Date().getTime();
                                 <div class="actionpanel_button_links" id="label">
                                     <%=t.t("add")%></div>
                             </div>
-                        </div>
-                        <div class="actionpanel_button_wrapper" id="midmenu_add4_link" style="display: none;">
-                            <div class="actionpanel_button">
-                                <div class="actionpanel_button_icons">
-                                    <img src="images/addvm_actionicon.png" alt="Add" /></div>
-                                <div class="actionpanel_button_links" id="label">
-                                    <%=t.t("add")%></div>
-                            </div>
-                        </div>
-                        <div class="actionpanel_button_wrapper" id="midmenu_add5_link" style="display: none;">
-                            <div class="actionpanel_button">
-                                <div class="actionpanel_button_icons">
-                                    <img src="images/addvm_actionicon.png" alt="Add" /></div>
-                                <div class="actionpanel_button_links" id="label">
-                                    <%=t.t("add")%></div>
-                            </div>
-                        </div>
+                        </div>                        
+                        -->
                         <div class="actionpanel_button_wrapper" id="midmenu_startvm_link" style="display: none;">
                             <div class="actionpanel_button">
                                 <div class="actionpanel_button_icons">
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index 5eaed4fd1ff..e36b6304358 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -19,9 +19,9 @@
 function afterLoadClusterJSP($midmenuItem1) {
     showMiddleMenu();
      
-    initAddHostButton($("#midmenu_add_link"), "cluster_page"); 
-    initAddPrimaryStorageButton($("#midmenu_add2_link"), "cluster_page");  
-    $("#midmenu_add3_link").unbind("click").hide();   
+    clearAddButtonsOnTop(); 
+    initAddHostButton($("#midmenu_add_host_button"), "cluster_page"); 
+    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "cluster_page");  
     
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");    
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js
index 3af4c73a02e..ccbf6612b31 100644
--- a/ui/scripts/cloud.core.host.js
+++ b/ui/scripts/cloud.core.host.js
@@ -39,8 +39,8 @@ function hostToRightPanel($midmenuItem1) {
 }
 
 function afterLoadHostJSP($midmenuItem1) {
-    initAddHostButton($("#midmenu_add_link"), "host_page"); 
-    initAddPrimaryStorageButton($("#midmenu_add2_link"), "host_page");          
+    initAddHostButton($("#midmenu_add_host_button"), "host_page"); 
+    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "host_page");          
 
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 35390e529fa..039abc5c870 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -571,11 +571,21 @@ function clearMiddleMenu() {
 }
 
 function clearAddButtonsOnTop() {
-    $("#midmenu_add_link").unbind("click").hide();    
+    $("#midmenu_add_link").unbind("click").hide(); 
+    
+    $("#midmenu_add_zone_button").unbind("click").hide();   
+    $("#midmenu_add_host_button").unbind("click").hide();   
+    $("#midmenu_add_primarystorage_button").unbind("click").hide(); 
+    $("#midmenu_add_secondarystorage_button").unbind("click").hide(); 
+    $("#midmenu_add_pod_button").unbind("click").hide(); 
+    $("#midmenu_add_vlan_button").unbind("click").hide(); 
+    $("#midmenu_add_directIpRange_button").unbind("click").hide(); 
+    $("#midmenu_Update_SSL_Certificate_button").unbind("click").hide();   
+    /*   
     $("#midmenu_add2_link").unbind("click").hide();     
-    $("#midmenu_add3_link").unbind("click").hide();   
-    $("#midmenu_add4_link").unbind("click").hide(); 
-    $("#midmenu_add5_link").unbind("click").hide();        
+    $("#midmenu_add3_link").unbind("click").hide(); 
+    */       
+    
     $("#midmenu_startvm_link").unbind("click").hide();     
     $("#midmenu_stopvm_link").unbind("click").hide(); 
     $("#midmenu_rebootvm_link").unbind("click").hide(); 
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index af808424999..b55dc8ce665 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -19,8 +19,8 @@
  function afterLoadPodJSP($leftmenuItem1) {   
     hideMiddleMenu();	
           	
-    initAddHostButton($("#midmenu_add_link"), "pod_page"); 
-    initAddPrimaryStorageButton($("#midmenu_add2_link"), "pod_page");  
+    initAddHostButton($("#midmenu_add_host_button"), "pod_page"); 
+    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "pod_page");  
            
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
@@ -94,11 +94,11 @@ function podJsonToDetailsTab() {
 	});	
     if(networkType == "Basic") { //basic-mode network (pod-wide VLAN)
         $("#tab_network").show();  
-        initAddPodVLANButton($("#midmenu_add3_link"));  
+        initAddPodVLANButton($("#midmenu_add_directIpRange_button"));  
     }
     else if(networkType == "Advanced") { //advanced-mode network (zone-wide VLAN)
         $("#tab_network").hide();
-        $("#midmenu_add3_link").unbind("click").hide();         
+        $("#midmenu_add_directIpRange_button").unbind("click").hide();         
     }
     
     
diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js
index 9188c921827..5eb47e0af98 100644
--- a/ui/scripts/cloud.core.primarystorage.js
+++ b/ui/scripts/cloud.core.primarystorage.js
@@ -39,8 +39,8 @@ function primarystorageToRightPanel($midmenuItem1) {
 }
 
  function afterLoadPrimaryStorageJSP($midmenuItem1) {
-    initAddHostButton($("#midmenu_add_link"), "primarystorage_page"); 
-    initAddPrimaryStorageButton($("#midmenu_add2_link"), "primarystorage_page");  
+    initAddHostButton($("#midmenu_add_host_button"), "primarystorage_page"); 
+    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "primarystorage_page");  
     
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index a919d78cf0d..89c23a7d2d1 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -245,14 +245,13 @@ function resourceLoadPage(pageToShow, $midmenuItem1) {   //$midmenuItem1 is eith
 
 function afterLoadResourceJSP($midmenuItem1) {
     hideMiddleMenu();        
-    
-    //initAddZoneButton($("#midmenu_add_link")); 
-    $("#midmenu_add_link").show().find("#label").text("Add Zone");   
+        
+    $("#midmenu_add_zone_button").show();   
     
     initAddZoneWizard();  
 	initAddZoneLinks();	 
     
-	initUpdateConsoleCertButton($("#midmenu_add2_link"));
+	initUpdateConsoleCertButton($("#midmenu_Update_SSL_Certificate_button"));
 	initDialog("dialog_update_cert", 450);	
 		
 	initAddPodShortcut();
@@ -527,7 +526,7 @@ function initAddPodShortcut() {
 }      
 
 function initAddZoneLinks() {     
-    $("#add_zone_shortcut,#midmenu_add_link").unbind("click").bind("click", function(event) {              
+    $("#add_zone_shortcut,#midmenu_add_zone_button").unbind("click").bind("click", function(event) {              
         if($("#leftmenu_physical_resource").find("#physical_resource_arrow").hasClass("expanded_close") == true)
 			expandOrCollapseZoneTree(); //if Physical Resource arrow shows closed (i.e. zonetree is hidden), expand and show zonetree.    
 			       
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index bc0c4ea0da1..afb8a284439 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -19,9 +19,9 @@
  function afterLoadZoneJSP($midmenuItem1) {
     hideMiddleMenu();  
                  
-    initAddPodButton($("#midmenu_add_link"));                  
-    initAddVLANButton($("#midmenu_add2_link"));
-    initAddSecondaryStorageButton($("#midmenu_add3_link"));
+    initAddPodButton($("#midmenu_add_pod_button"));                  
+    initAddVLANButton($("#midmenu_add_vlan_button"));
+    initAddSecondaryStorageButton($("#midmenu_add_secondarystorage_button"));
    
     initDialog("dialog_add_pod", 320); 
     initDialog("dialog_add_vlan_for_zone");
@@ -83,10 +83,10 @@ function zoneJsonToDetailsTab($leftmenuItem1) {
     
     $detailsTab.find("#networktype").text(fromdb(jsonObj.networktype));
     if(jsonObj.networktype == "Basic") {
-        $("#midmenu_add2_link, #tab_network, #tab_content_details #vlan_container").hide();
+        $("#midmenu_add_vlan_button, #tab_network, #tab_content_details #vlan_container").hide();
     }
     else if(jsonObj.networktype == "Advanced") {
-        $("#midmenu_add2_link, #tab_network, #tab_content_details #vlan_container").show();           
+        $("#midmenu_add_vlan_button, #tab_network, #tab_content_details #vlan_container").show();           
         
         var vlan = jsonObj.vlan; 
         $detailsTab.find("#vlan").text(fromdb(vlan));