diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index a398b55ccb..ffde8ed5a1 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -588,7 +588,7 @@ function setupCreateAclDialog(){ var acl_json = { "acl" : acl_string }; Sunstone.runAction("Acl.create",acl_json); - $create_acl_dialog.trigger('close'); + $create_acl_dialog.foundation('reveal', 'close'); return false; }); } diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index d12c5ba0a5..b616980e7b 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -449,7 +449,7 @@ function setupCreateClusterDialog(){ // If it is successfull we refresh the list. Sunstone.runAction("Cluster.create",cluster_json); - $create_cluster_dialog.trigger('close') + $create_cluster_dialog.foundation('reveal', 'close') return false; }); } @@ -702,7 +702,7 @@ function fillPopPup(request,response){ } } - $create_cluster_dialog.trigger('close') + $create_cluster_dialog.foundation('reveal', 'close') Sunstone.runAction('Cluster.list'); diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js index b793b38a46..5a5837203c 100644 --- a/src/sunstone/public/js/plugins/config-tab.js +++ b/src/sunstone/public/js/plugins/config-tab.js @@ -254,7 +254,7 @@ function setupUpdatePassword() { } Sunstone.runAction("UserSettings.passwd",[-1],pw); - $('#settings_update_password',dialogs_context).trigger('close') + $('#settings_update_password',dialogs_context).foundation('reveal', 'close') return false; }); } diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 3a56b24289..bb0e8828f0 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -939,7 +939,7 @@ function setupCreateDatastoreDialog(){ Sunstone.runAction("Datastore.create",ds_obj); - $create_datastore_dialog.trigger('close') + $create_datastore_dialog.foundation('reveal', 'close') return false; }); @@ -959,12 +959,12 @@ function setupCreateDatastoreDialog(){ "cluster_id" : cluster_id }; Sunstone.runAction("Datastore.create",ds_obj); - $create_datastore_dialog.trigger('close') + $create_datastore_dialog.foundation('reveal', 'close') return false; }); $('#wizard_ds_reset_button').click(function(){ - $create_datastore_dialog.trigger('close'); + $create_datastore_dialog.foundation('reveal', 'close'); $create_datastore_dialog.html(""); setupCreateDatastoreDialog(); @@ -974,7 +974,7 @@ function setupCreateDatastoreDialog(){ }); $('#advanced_ds_reset_button').click(function(){ - $create_datastore_dialog.trigger('close'); + $create_datastore_dialog.foundation('reveal', 'close'); $create_datastore_dialog.html(""); setupCreateDatastoreDialog(); diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index 7ac85aa2cd..4e8fde3567 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -702,7 +702,7 @@ function setupCreateFileDialog(){ //Inform complete upload, destroy upload dialog, refresh file list - $('div#pb_dialog').trigger('close') + $('div#pb_dialog').foundation('reveal', 'close') return false; }, onCancel: function(id, fileName){ @@ -758,7 +758,7 @@ function setupCreateFileDialog(){ Sunstone.runAction("File.create", file_obj); }; - $create_file_dialog.trigger('close') + $create_file_dialog.foundation('reveal', 'close') return false; }); @@ -778,7 +778,7 @@ function setupCreateFileDialog(){ "ds_id" : ds_id }; Sunstone.runAction("File.create",file_obj); - $create_file_dialog.trigger('close') + $create_file_dialog.foundation('reveal', 'close') return false; }); diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 676c8be989..19be083954 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -781,7 +781,7 @@ function setup_add_rp_dialog(group){ } }); - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); dialog.html(""); }); @@ -796,7 +796,7 @@ function setup_add_rp_dialog(group){ $('#add_rp_close',dialog).die(); $('#add_rp_close',dialog).live( "click", function() { - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); dialog.html(""); }); @@ -1078,7 +1078,7 @@ function setupCreateGroupDialog(){ setupTips($create_group_dialog); $('#create_group_reset_button').click(function(){ - $create_group_dialog.trigger('close'); + $create_group_dialog.foundation('reveal', 'close'); $create_group_dialog.html(""); setupCreateGroupDialog(); @@ -1241,7 +1241,7 @@ function setupCreateGroupDialog(){ Sunstone.runAction("Group.create",group_json); - $create_group_dialog.trigger('close'); + $create_group_dialog.foundation('reveal', 'close'); return false; }); } diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index bb66a5844a..ed81c4bafd 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -92,11 +92,11 @@ var create_host_tmpl = \ \ \ -\ -
\ -
\ - \ - \ +
\ +
\ + \ + \ +
\
\ \
\ @@ -892,12 +892,12 @@ function setupCreateHostDialog(){ //Create the OpenNebula.Host. //If it is successfull we refresh the list. Sunstone.runAction("Host.create",host_json); - $create_host_dialog.trigger('close') + $create_host_dialog.foundation('reveal', 'close') return false; }); $('#wizard_host_reset_button').click(function(){ - $create_host_dialog.trigger('close'); + $create_host_dialog.foundation('reveal', 'close'); $create_host_dialog.html(""); setupCreateHostDialog(); diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 32aea30bb1..6a789831b2 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -241,7 +241,7 @@ var image_actions = { call: OpenNebula.Image.create, callback: function(request, response){ addImageElement(request, response); - $create_image_dialog.trigger('close') + $create_image_dialog.foundation('reveal', 'close') notifyCustom(tr("Image created"), " ID: " + response.IMAGE.ID, false) }, error: onError @@ -1109,7 +1109,7 @@ function initialize_create_image_dialog(dialog) { //we this is an image upload we trigger FileUploader //to start the upload if (upload){ - dialog.trigger('close') + dialog.foundation('reveal', 'close') uploader._onInputChange(file_input); } else { Sunstone.runAction("Image.create", img_obj); @@ -1140,7 +1140,7 @@ function initialize_create_image_dialog(dialog) { }); $('#wizard_image_reset_button').click(function(){ - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); //dialog.html(""); setupCreateImageDialog(); @@ -1148,7 +1148,7 @@ function initialize_create_image_dialog(dialog) { }); $('#advanced_image_reset_button').click(function(){ - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); dialog.html(""); setupCreateImageDialog(); @@ -1261,7 +1261,7 @@ function setupImageCloneDialog(){ } else { Sunstone.runAction('Image.clone',sel_elems[0],name) }; - dialog.trigger('close') + dialog.foundation('reveal', 'close') setTimeout(function(){ Sunstone.runAction('Image.refresh'); }, 1500); diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js index 507057e173..b9cb09f8d5 100644 --- a/src/sunstone/public/js/plugins/marketplace-tab.js +++ b/src/sunstone/public/js/plugins/marketplace-tab.js @@ -112,7 +112,7 @@ var market_actions = { if ($('a', $("dl#marketplace_import_dialog_tabs")).size > 0) { $('a', $("dl#marketplace_import_dialog_tabs")).first().click(); } else { - $marketplace_import_dialog.trigger('close'); + $marketplace_import_dialog.foundation('reveal', 'close'); } return false; }); @@ -148,7 +148,7 @@ var market_actions = { if ($('a', $("dl#marketplace_import_dialog_tabs")).size > 0) { $('a', $("dl#marketplace_import_dialog_tabs")).first().click(); } else { - $marketplace_import_dialog.trigger('close'); + $marketplace_import_dialog.foundation('reveal', 'close'); } return false; }); diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js index 1044814ceb..ee0ff2ae85 100644 --- a/src/sunstone/public/js/plugins/oneflow-services.js +++ b/src/sunstone/public/js/plugins/oneflow-services.js @@ -1690,7 +1690,7 @@ function setupScaleDialog(){ Sunstone.runAction('Role.update', roleElements(), obj); - $scale_dialog.trigger('close') + $scale_dialog.foundation('reveal', 'close') return false; }); }; diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index 01c9e0041f..3be1fd1528 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -1102,19 +1102,19 @@ function setupCreateServiceTemplateDialog(){ $('#create_service_template_submit',dialog).click(function(){ var json_template = generate_json_service_template_from_form(); Sunstone.runAction("ServiceTemplate.create", json_template ); - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); return false; }); $('#update_service_template_submit',dialog).click(function(){ var json_template = generate_json_service_template_from_form(); Sunstone.runAction("ServiceTemplate.update",service_template_to_update_id, JSON.stringify(json_template)); - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); return false; }); $('#create_service_template_reset', dialog).click(function(){ - $create_service_template_dialog.trigger('close'); + $create_service_template_dialog.foundation('reveal', 'close'); $create_service_template_dialog.html(""); setupCreateServiceTemplateDialog(); diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index e2309aaa69..2b4a280110 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -226,7 +226,7 @@ var template_actions = { type: "create", call: OpenNebula.Template.create, callback: function(request, response){ - $create_template_dialog.trigger('close') + $create_template_dialog.foundation('reveal', 'close') $create_template_dialog.empty(); addTemplateElement(request, response); notifyCustom(tr("Template created"), " ID: " + response.VMTEMPLATE.ID, false) @@ -322,7 +322,7 @@ var template_actions = { type: "single", call: OpenNebula.Template.update, callback: function(request, response){ - $create_template_dialog.trigger('close') + $create_template_dialog.foundation('reveal', 'close') notifyMessage(tr("Template updated correctly")); }, error: onError @@ -3515,14 +3515,14 @@ function initialize_create_template_dialog(dialog) { var tabs = $( "#template_create_tabs", dialog)//.tabs().addClass("ui-tabs-vertical"); $('#template_template_reset_button', dialog).click(function(){ - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); dialog.html(""); setupCreateTemplateDialog(); popUpCreateTemplateDialog(); }); $('#template_template_reset_button_update', dialog).click(function(){ - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); dialog.html(""); setupCreateTemplateDialog(); @@ -4544,7 +4544,7 @@ function setupTemplateCloneDialog(){ } else { Sunstone.runAction('Template.clone',sel_elems[0],name) }; - $(this).parents('#template_clone_dialog').trigger('close') + $(this).parents('#template_clone_dialog').foundation('reveal', 'close') setTimeout(function(){ Sunstone.runAction('Template.refresh'); }, 1500); @@ -4761,7 +4761,7 @@ function setupInstantiateTemplateDialog(easy_provision){ }; } - $instantiate_vm_template_dialog.trigger('close') + $instantiate_vm_template_dialog.foundation('reveal', 'close') return false; }); } diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index cfab2c84a1..395b061fd3 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -790,7 +790,7 @@ function setupCreateUserDialog(){ } Sunstone.runAction("User.create",user_json); - $create_user_dialog.trigger('close'); + $create_user_dialog.foundation('reveal', 'close'); return false; }); } @@ -818,7 +818,7 @@ function setupUpdatePasswordDialog(){ } Sunstone.runAction("User.passwd",getSelectedNodes(dataTable_users),pw); - $update_pw_dialog.trigger('close'); + $update_pw_dialog.foundation('reveal', 'close'); return false; }); }; @@ -850,7 +850,7 @@ function setupChangeAuthenticationDialog(){ } Sunstone.runAction("User.chauth",getSelectedNodes(dataTable_users), driver); - $change_auth_dialog.trigger('close'); + $change_auth_dialog.foundation('reveal', 'close'); return false; }); }; diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 8228f29e84..be39bc481d 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -2049,7 +2049,7 @@ function setupDateTimePicker(input_to_fill, time_str){ $(input_to_fill).val(date_str); $(input_to_fill).trigger("change"); - $date_time_picker_dialog.trigger('close') + $date_time_picker_dialog.foundation('reveal', 'close') return false; }); }; @@ -2285,7 +2285,7 @@ function setupSaveAsDialog(){ Sunstone.runAction('VM.saveas', vm_id, obj); - $save_as_dialog.trigger('close') + $save_as_dialog.foundation('reveal', 'close') return false; }); }; @@ -2362,7 +2362,7 @@ function setupAttachDiskDialog(){ var obj = {DISK: data} Sunstone.runAction('VM.attachdisk', vm_id, obj); - $attach_disk_dialog.trigger('close') + $attach_disk_dialog.foundation('reveal', 'close') return false; }); }; @@ -2619,7 +2619,7 @@ function setupAttachNicDialog(){ var obj = {NIC: data} Sunstone.runAction('VM.attachnic', vm_id, obj); - $attach_nic_dialog.trigger('close') + $attach_nic_dialog.foundation('reveal', 'close') return false; }); }; @@ -2683,30 +2683,37 @@ function printCapacity(vm_info){
' html += '\ -
\ - \ - \ - \ - \ - \ - \ +
\ +
\ +
'+tr("CPU")+''+tr("VCPU")+''+tr("MEMORY")+'
\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ \ - \ - \ - \ - \ - \ - \ - \ - \ -
'+tr("CPU")+''+tr("VCPU")+''+tr("MEMORY")+'
' + vm_info.TEMPLATE.CPU + '' + (vm_info.TEMPLATE.VCPU ? vm_info.TEMPLATE.VCPU : '-') + '' + humanize_size_from_mb(vm_info.TEMPLATE.MEMORY) + '
' + vm_info.TEMPLATE.CPU + '' + (vm_info.TEMPLATE.VCPU ? vm_info.TEMPLATE.VCPU : '-') + '' + humanize_size_from_mb(vm_info.TEMPLATE.MEMORY) + '
\ + \ + \ +
\ \ +
\
\
\ -

'+tr("REAL CPU")+'

\ +
\ +

'+tr("REAL CPU")+'

\ +
\
\
\ -
\ +
\ +
\ +
\
\
\
\ @@ -2727,6 +2734,7 @@ function printCapacity(vm_info){
\
\
\ +
\ '; return html; @@ -2804,7 +2812,7 @@ function setupResizeCapacityDialog(){ Sunstone.runAction('VM.resize', vm_id, obj); - $resize_capacity_dialog.trigger('close') + $resize_capacity_dialog.foundation('reveal', 'close') return false; }); }; @@ -2995,7 +3003,7 @@ function setupSnapshotDialog(){ Sunstone.runAction('VM.snapshot_create', vm_id, obj); - $snapshot_dialog.trigger('close') + $snapshot_dialog.foundation('reveal', 'close') return false; }); }; @@ -3231,7 +3239,7 @@ function setupCreateVMDialog(include_select_image){ setTimeout(function(){ Sunstone.runAction("VM.list"); },1500); - $create_vm_dialog.trigger('close') + $create_vm_dialog.foundation('reveal', 'close') return false; }); } @@ -3388,7 +3396,7 @@ function setupDeployVMDialog(){ Sunstone.runAction("VM.deploy_action", elem, extra_info); }); - $deploy_vm_dialog.trigger('close') + $deploy_vm_dialog.foundation('reveal', 'close') return false; }); } @@ -3486,7 +3494,7 @@ function setupMigrateVMDialog(live){ } }); - $migrate_vm_dialog.trigger('close') + $migrate_vm_dialog.foundation('reveal', 'close') return false; }); } diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 0f6992a61d..fa8e3f69fb 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1296,7 +1296,7 @@ function setupCreateVNetDialog() { }; Sunstone.runAction("Network.create",network_json); - $create_vn_dialog.trigger('close') + $create_vn_dialog.foundation('reveal', 'close') return false; }); @@ -1304,12 +1304,12 @@ function setupCreateVNetDialog() { var template=$('#template',dialog).val(); var vnet_json = {vnet: {vnet_raw: template}}; Sunstone.runAction("Network.create",vnet_json); - $create_vn_dialog.trigger('close') + $create_vn_dialog.foundation('reveal', 'close') return false; }); $('#wizard_vnet_reset_button').click(function(){ - $create_vn_dialog.trigger('close'); + $create_vn_dialog.foundation('reveal', 'close'); $create_vn_dialog.html(""); setupCreateVNetDialog(); @@ -1317,7 +1317,7 @@ function setupCreateVNetDialog() { }); $('#advanced_vnet_reset_button').click(function(){ - $create_vn_dialog.trigger('close'); + $create_vn_dialog.foundation('reveal', 'close'); $create_vn_dialog.html(""); setupCreateVNetDialog(); diff --git a/src/sunstone/public/js/plugins/zones-tab.js b/src/sunstone/public/js/plugins/zones-tab.js index fbe5a654c8..70741747a6 100644 --- a/src/sunstone/public/js/plugins/zones-tab.js +++ b/src/sunstone/public/js/plugins/zones-tab.js @@ -33,7 +33,7 @@ function setupCreateZoneDialog(){ var endpoint=$("#endpoint",this).val(); var zone_json = { "zone" : { "name" : name, "endpoint" : endpoint}}; Sunstone.runAction("Zone.create",zone_json); - $create_zone_dialog.trigger('close'); + $create_zone_dialog.foundation('reveal', 'close'); return false; }); diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 1ac1d3535e..795b01d210 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -134,6 +134,7 @@ var Sunstone = {
\
\ \ + \
\ \ '); @@ -895,7 +896,7 @@ function setupConfirmDialogs(){ } if (!error){ - context.trigger('close') + context.foundation('reveal', 'close') $('.button.dropdown').find('ul').removeClass('show-dropdown'); } @@ -2368,7 +2369,7 @@ function setupQuotasDialog(dialog){ var action = $('div.form_buttons button',this).val(); var sel_elems = SunstoneCfg["actions"][action].elements(); Sunstone.runAction(action,sel_elems,obj); - dialog.trigger('close'); + dialog.foundation('reveal', 'close'); return false; }); } @@ -3583,7 +3584,7 @@ $(document).ready(function(){ if (!error){ //proceed to close confirm dialog in //case it was open - $('div#confirm_dialog').trigger('close'); + $('div#confirm_dialog').foundation('reveal', 'close'); }; return false; @@ -3609,7 +3610,7 @@ $(document).ready(function(){ //Close overlay dialogs when clicking outside of them. $(".ui-widget-overlay").live("click", function (){ - $("div:ui-dialog:visible").trigger('close'); + $("div:ui-dialog:visible").foundation('reveal', 'close'); }); //Close select lists when clicking somewhere else.