apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - name add host dialog, add primary storage dialog differently in source page and in pod page.

Browse Source
This commit is contained in:
Jessica Wang 2010-11-15 09:27:38 -08:00
parent d13b3c1535
commit e073c937b0
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/jsp/resource.jsp
View File

@ -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) -->

10
ui/scripts/cloud.core.resource.js
View File

@ -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);