etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudStack UI - zone tree - basic zone - add network tab. “Add IP Range” button and “Add Firewall” button are available.

This commit is contained in:
Jessica Wang 2011-04-27 15:29:03 -07:00
parent 6f322474c1
commit c851253969
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/index.jsp
View File

@ -867,7 +867,7 @@
</div>
</div>
<div id="network_header" class="leftmenu_content" style="display: none">
<div id="network_header" class="leftmenu_content">
<div class="leftmenu_fourthindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="network_arrow">
</div>

56
ui/scripts/cloud.core.network.js
View File

@ -505,32 +505,25 @@ function doDeleteExternalLoadBalancer($actionLink, $subgridItem) {
function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
//***** binding Event Handler (begin) ******
var $dialogAddIpRangeToPublicNetwork = $("#dialog_add_iprange_to_publicnetwork");
//***** binding Event Handler (begin) ******
if (zoneObj.networktype == "Advanced") {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_tagged").change(function(event) {
if ($(this).val() == "tagged") {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").show();
//$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_pod_container").hide();
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
}
else if($(this).val() == "untagged") {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").hide();
//$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_pod_container").hide();
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>');
}
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#domain_container", "#add_publicip_vlan_account_container".
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change();
return false;
});
}
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_tagged").change(function(event) {
if ($(this).val() == "tagged") {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").show();
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
}
else if($(this).val() == "untagged") {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").hide();
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>');
}
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#domain_container", "#add_publicip_vlan_account_container".
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change();
return false;
});
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change(function(event) {
if($(this).val() == "zone-wide") {
$dialogAddIpRangeToPublicNetwork.find("#domain_container").hide();
@ -542,7 +535,15 @@ function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
}
return false;
});
//***** binding Event Handler (end) ******
//***** binding Event Handler (end) ******
if (zoneObj.networktype == "Basic") {
$("#add_network_button,#add_load_balancer_button,#tab_loadbalancer").hide();
}
else { // zoneObj.networktype == "Advanced"
$("#add_network_button,#add_load_balancer_button,#tab_loadbalancer").show();
}
$button.show();
$button.unbind("click").bind("click", function(event) {
if($("#public_network_page").find("#tab_content_ipallocation").css("display") == "none")
@ -860,8 +861,7 @@ function bindAddLoadBalancerButton($button, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var $dialogAddLoadBalancer = $("#dialog_add_load_balancer");
$button.show();
$button.unbind("click").bind("click", function(event) {
if($("#public_network_page").find("#tab_content_loadbalancer").css("display") == "none")
$("#public_network_page").find("#tab_loadbalancer").click();

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

@ -334,13 +334,16 @@ function zoneJSONToTreeNode(jsonObj, $zoneNode) {
$zoneNode.data("jsonObj", jsonObj);
$zoneNode.find("#secondarystorage_header").data("zoneObj", jsonObj);
$zoneNode.find("#network_header").data("jsonObj", jsonObj);
/*
if(jsonObj.networktype == "Advanced") { //Advanced Zone
$zoneNode.find("#network_header").show().data("jsonObj", jsonObj);
}
else { //Basic Zone
$zoneNode.find("#network_header").hide();
}
*/
$zoneNode.data("id", zoneid).data("name", fromdb(jsonObj.name));
var zoneName = $zoneNode.find("#zone_name").text(fromdb(jsonObj.name));
zoneName.data("jsonObj", jsonObj);