From d5f71af1ec5a20b2011fd5e37e86ba1f660a948f Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 12 Nov 2010 10:18:49 -0800 Subject: [PATCH] new UI - retire old Add Zone Dialog box (being replaced with new Add Zone Pod Wizard) --- ui/scripts/cloud.core.resource.js | 136 ------------------------------ 1 file changed, 136 deletions(-) diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index 1a5b2efa01b..c03047066fd 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -684,139 +684,3 @@ function initUpdateConsoleCertButton($midMenuAddLink2) { return false; }); } - -function initAddZoneButton($midmenuAddLink1) { - $midmenuAddLink1.find("#label").text("Add Zone"); - $midmenuAddLink1.show(); - initAddZoneDialog($("#dialog_add_zone"), $midmenuAddLink1); -} - -function initAddZoneDialog($addZoneDialog, $addZoneLink) { - $addZoneDialog.find("#add_zone_public").unbind("change").bind("change", function(event) { - if($(this).val() == "true") { //public zone - $addZoneDialog.find("#domain_dropdown_container").hide(); - } - else { //private zone - $addZoneDialog.find("#domain_dropdown_container").show(); - } - return false; - }); - - var domainDropdown = $addZoneDialog.find("#domain_dropdown").empty(); - $.ajax({ - data: createURL("command=listDomains"+maxPageSize), - dataType: "json", - async: false, - success: function(json) { - var domains = json.listdomainsresponse.domain; - if (domains != null && domains.length > 0) { - for (var i = 0; i < domains.length; i++) { - domainDropdown.append(""); - } - } - } - }); - - $addZoneLink.unbind("click").bind("click", function(event) { - if($("#leftmenu_physical_resource").find("#physical_resource_arrow").hasClass("expanded_close") == true) - $("#leftmenu_physical_resource").click(); //if Physical Resource arrow shows closed (i.e. zonetree is hidden), expand and show zonetree. - - $addZoneDialog.find("#info_container").hide(); - - $addZoneDialog - .dialog('option', 'buttons', { - "Add": function() { - var $thisDialog = $(this); - - // validate values - var isValid = true; - isValid &= validateString("Name", $thisDialog.find("#add_zone_name"), $thisDialog.find("#add_zone_name_errormsg")); - isValid &= validateIp("DNS 1", $thisDialog.find("#add_zone_dns1"), $thisDialog.find("#add_zone_dns1_errormsg"), false); //required - isValid &= validateIp("DNS 2", $thisDialog.find("#add_zone_dns2"), $thisDialog.find("#add_zone_dns2_errormsg"), true); //optional - isValid &= validateIp("Internal DNS 1", $thisDialog.find("#add_zone_internaldns1"), $thisDialog.find("#add_zone_internaldns1_errormsg"), false); //required - isValid &= validateIp("Internal DNS 2", $thisDialog.find("#add_zone_internaldns2"), $thisDialog.find("#add_zone_internaldns2_errormsg"), true); //optional - if (getNetworkType() != "vnet") { - isValid &= validateString("Zone - Start VLAN Range", $thisDialog.find("#add_zone_startvlan"), $thisDialog.find("#add_zone_startvlan_errormsg"), false); //required - isValid &= validateString("Zone - End VLAN Range", $thisDialog.find("#add_zone_endvlan"), $thisDialog.find("#add_zone_endvlan_errormsg"), true); //optional - } - isValid &= validateCIDR("Guest CIDR", $thisDialog.find("#add_zone_guestcidraddress"), $thisDialog.find("#add_zone_guestcidraddress_errormsg"), false); //required - if (!isValid) - return; - - $thisDialog.find("#spinning_wheel").show(); - - var moreCriteria = []; - - var name = trim($thisDialog.find("#add_zone_name").val()); - moreCriteria.push("&name="+todb(name)); - - var dns1 = trim($thisDialog.find("#add_zone_dns1").val()); - moreCriteria.push("&dns1="+encodeURIComponent(dns1)); - - var dns2 = trim($thisDialog.find("#add_zone_dns2").val()); - if (dns2 != null && dns2.length > 0) - moreCriteria.push("&dns2="+encodeURIComponent(dns2)); - - var internaldns1 = trim($thisDialog.find("#add_zone_internaldns1").val()); - moreCriteria.push("&internaldns1="+encodeURIComponent(internaldns1)); - - var internaldns2 = trim($thisDialog.find("#add_zone_internaldns2").val()); - if (internaldns2 != null && internaldns2.length > 0) - moreCriteria.push("&internaldns2="+encodeURIComponent(internaldns2)); - - if (getNetworkType() != "vnet") { - var vlanStart = trim($thisDialog.find("#add_zone_startvlan").val()); - var vlanEnd = trim($thisDialog.find("#add_zone_endvlan").val()); - if (vlanEnd != null && vlanEnd.length > 0) - moreCriteria.push("&vlan=" + encodeURIComponent(vlanStart + "-" + vlanEnd)); - else - moreCriteria.push("&vlan=" + encodeURIComponent(vlanStart)); - } - - var guestcidraddress = trim($thisDialog.find("#add_zone_guestcidraddress").val()); - moreCriteria.push("&guestcidraddress="+encodeURIComponent(guestcidraddress)); - - if($thisDialog.find("#domain_dropdown_container").css("display") != "none") { - var domainId = trim($thisDialog.find("#domain_dropdown").val()); - moreCriteria.push("&domainid="+domainId); - } - - $.ajax({ - data: createURL("command=createZone"+moreCriteria.join("")), - dataType: "json", - success: function(json) { - $thisDialog.find("#spinning_wheel").hide(); - $thisDialog.dialog("close"); - - var template = $("#leftmenu_zone_node_template").clone(true); - var $zoneTree = $("#leftmenu_zone_tree").find("#tree_container"); - $zoneTree.prepend(template); - template.fadeIn("slow"); - - var item = json.createzoneresponse.zone; - zoneJSONToTreeNode(item, template); - }, - error: function(XMLHttpResponse) { - handleError(XMLHttpResponse, function() { - handleErrorInDialog(XMLHttpResponse, $thisDialog); - }); - } - }); - }, - "Cancel": function() { - var $thisDialog = $(this); - $thisDialog.dialog("close"); - /* - cleanErrMsg($thisDialog.find("#add_zone_name"), $thisDialog.find("#add_zone_name_errormsg")); - cleanErrMsg($thisDialog.find("#add_zone_dns1"), $thisDialog.find("#add_zone_dns1_errormsg")); - cleanErrMsg($thisDialog.find("#add_zone_dns2"), $thisDialog.find("#add_zone_dns2_errormsg")); - cleanErrMsg($thisDialog.find("#add_zone_internaldns1"), $thisDialog.find("#add_zone_internaldns1_errormsg")); - cleanErrMsg($thisDialog.find("#add_zone_internaldns2"), $thisDialog.find("#add_zone_internaldns2_errormsg")); - cleanErrMsg($thisDialog.find("#add_zone_startvlan"), $thisDialog.find("#add_zone_startvlan_errormsg")); - cleanErrMsg($thisDialog.find("#add_zone_guestcidraddress"), $thisDialog.find("#add_zone_guestcidraddress_errormsg")); - */ - } - }).dialog("open"); - return false; - }); -} \ No newline at end of file