apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - add secondary storage - do not show action info inside subgrid item (action info will be shown in dialog if action fails).

Browse Source
This commit is contained in:
Jessica Wang 2010-10-26 09:33:08 -07:00
parent cfdd6999ad
commit 9a2380c337
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/new/scripts/cloud.core2.js
View File

@ -884,8 +884,8 @@ function handleErrorInDialog(XMLHttpResponse, $thisDialog) {
else else
$infoContainer.find("#info").text("action failed"); $infoContainer.find("#info").text("action failed");
$thisDialog.find("#spinning_wheel").fadeOut("slow"); $thisDialog.find("#spinning_wheel").hide();
$infoContainer.fadeIn("slow"); $infoContainer.show();
} }

19
ui/new/scripts/cloud.core2.resource.js
View File

@ -904,7 +904,7 @@ function initAddVLANButton($addButton) {
return; return;
//$thisDialog.dialog("close"); //only close dialog when this action succeeds //$thisDialog.dialog("close"); //only close dialog when this action succeeds
$thisDialog.find("#spinning_wheel").fadeIn("slow"); $thisDialog.find("#spinning_wheel").show()
var vlan = trim($thisDialog.find("#add_publicip_vlan_vlan").val()); var vlan = trim($thisDialog.find("#add_publicip_vlan_vlan").val());
if (isTagged) { if (isTagged) {
@ -978,7 +978,7 @@ function initAddSecondaryStorageButton($addButton) {
if (!isValid) if (!isValid)
return; return;
$thisDialog.find("#spinning_wheel").fadeIn("slow"); $thisDialog.find("#spinning_wheel").show()
var zoneId = zoneObj.id; var zoneId = zoneObj.id;
var nfs_server = trim($thisDialog.find("#nfs_server").val()); var nfs_server = trim($thisDialog.find("#nfs_server").val());
@ -993,15 +993,10 @@ function initAddSecondaryStorageButton($addButton) {
$thisDialog.dialog("close"); $thisDialog.dialog("close");
var $subgridItem = $("#secondary_storage_tab_template").clone(true); var $subgridItem = $("#secondary_storage_tab_template").clone(true);
var $spinningWheel = $subgridItem.find("#spinning_wheel");
$spinningWheel.find("#description").text("Adding Secondary Storage....");
$spinningWheel.show();
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").hide();
$("#zone_page").find("#tab_content_secondarystorage").append($subgridItem.show());
secondaryStorageJSONToTemplate(json.addsecondarystorageresponse.secondarystorage[0], $subgridItem); secondaryStorageJSONToTemplate(json.addsecondarystorageresponse.secondarystorage[0], $subgridItem);
$subgridItem.find("#after_action_info").text("Secondary storage was added successfully."); $subgridItem.find("#after_action_info").text("Secondary storage was added successfully.");
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show(); $subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
$("#zone_page").find("#tab_content_secondarystorage").append($subgridItem.show());
}, },
error: function(XMLHttpResponse) { error: function(XMLHttpResponse) {
handleErrorInDialog(XMLHttpResponse, $thisDialog); handleErrorInDialog(XMLHttpResponse, $thisDialog);
@ -1080,7 +1075,7 @@ function initAddZoneButton($midmenuAddLink1) {
if (!isValid) if (!isValid)
return; return;
$thisDialog.find("#spinning_wheel").fadeIn("slow"); $thisDialog.find("#spinning_wheel").show()
var moreCriteria = []; var moreCriteria = [];
@ -1175,7 +1170,7 @@ function initAddPodButton($midmenuAddLink1) {
if (!isValid) if (!isValid)
return; return;
$thisDialog.find("#spinning_wheel").fadeIn("slow"); $thisDialog.find("#spinning_wheel").show()
var name = trim($thisDialog.find("#add_pod_name").val()); var name = trim($thisDialog.find("#add_pod_name").val());
var cidr = trim($thisDialog.find("#add_pod_cidr").val()); var cidr = trim($thisDialog.find("#add_pod_cidr").val());
@ -1277,7 +1272,7 @@ function initAddHostButton($midmenuAddLink1) {
return; return;
//$thisDialog.dialog("close"); //only close dialog when this action succeeds //$thisDialog.dialog("close"); //only close dialog when this action succeeds
$thisDialog.find("#spinning_wheel").fadeIn("slow"); $thisDialog.find("#spinning_wheel").show()
var array1 = []; var array1 = [];
array1.push("&zoneId="+podObj.zoneid); array1.push("&zoneId="+podObj.zoneid);
@ -1394,7 +1389,7 @@ function initAddPrimaryStorageButton($midmenuAddLink2) {
if (!isValid) if (!isValid)
return; return;
$thisDialog.find("#spinning_wheel").fadeIn("slow"); $thisDialog.find("#spinning_wheel").show()
var array1 = []; var array1 = [];
array1.push("&zoneId="+podObj.zoneid); array1.push("&zoneId="+podObj.zoneid);