From e073c937b09d19983a0590fda322f7ed8a9e7bfa Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 15 Nov 2010 09:27:38 -0800
Subject: [PATCH] new UI - name add host dialog, add primary storage dialog
 differently in source page and in pod page.

---
 ui/jsp/resource.jsp               | 12 +++++++-----
 ui/scripts/cloud.core.resource.js | 10 +++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index c4fd4df2f7f..48353733dca 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -491,8 +491,8 @@
 </div>
 <!-- Add Pod Dialog in resource page (end) -->
 
-<!-- Add Host Dialog (begin) -->
-<div id="dialog_add_host" title="Add Host" style="display: none">   
+<!-- Add Host Dialog in resource page (begin) -->
+<div id="dialog_add_host_in_resource_page" title="Add Host" style="display: none">   
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>
@@ -573,10 +573,10 @@
             (info)</div>
     </div>
 </div>
-<!-- Add Host Dialog (end) -->
+<!-- Add Host Dialog in resource page (end) -->
 
-<!-- Add Primary Storage Dialog -->
-<div id="dialog_add_pool" title="Add Primary Storage" style="display: none">    
+<!-- Add Primary Storage Dialog  in resource page (begin) -->
+<div id="dialog_add_pool_in_resource_page" title="Add Primary Storage" style="display: none">    
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>
@@ -673,3 +673,5 @@
             (info)</div>
     </div>
 </div>
+<!-- Add Primary Storage Dialog  in resource page (end) -->
+
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 9e83fd686b5..91541e5541a 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -366,8 +366,8 @@ function initAddPodShortcut() {
 }    
 
  function initAddHostShortcut() {
-    initDialog("dialog_add_host");    
-    var $dialogAddHost = $("#dialog_add_host");    
+    initDialog("dialog_add_host_in_resource_page");    
+    var $dialogAddHost = $("#dialog_add_host_in_resource_page");    
     
     $.ajax({
         data: createURL("command=listZones&available=true"),
@@ -978,8 +978,8 @@ function initUpdateConsoleCertButton($midMenuAddLink2) {
 
 
 function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel) {    
-	initDialog("dialog_add_pool");
-	var $dialogAddPool = $("#dialog_add_pool");    
+	initDialog("dialog_add_pool_in_resource_page");
+	var $dialogAddPool = $("#dialog_add_pool_in_resource_page");    
 	
     // if hypervisor is KVM, limit the server option to NFS for now
     if (getHypervisorType() == 'kvm') 
@@ -1047,7 +1047,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
         $dialogAddPool.find("#zone_dropdown").change(); //refresh cluster dropdown (do it here to avoid race condition)     
         $dialogAddPool.find("#info_container").hide();	
                        
-        $("#dialog_add_pool")
+        $("#dialog_add_pool_in_resource_page")
 	    .dialog('option', 'buttons', { 				    
 		    "Add": function() { 	
 		    	var $thisDialog = $(this);