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

Pod page - show "Add IP Range" option if its zone is in basic-mode.

This commit is contained in:
Jessica Wang 2010-12-20 10:28:46 -08:00
parent 116ddb3cae
commit 09138f3173
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/jsp/pod.jsp
View File

@ -170,6 +170,15 @@
</div>
</div>
</div>
<div class="actionpanel_button_wrapper" id="add_iprange_button" style="display: none">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add IP Range" /></div>
<div class="actionpanel_button_links">
Add IP Range
</div>
</div>
</div>
</div>
<!-- top buttons (end) -->
@ -543,9 +552,9 @@
</div>
<!-- Add Primary Storage Dialog (end) -->
<!-- Add VLAN IP Range Dialog for pod (begin) -->
<div id="dialog_add_vlan_for_pod" title="Add Direct IP Range" style="display:none">
<p>Please enter the following info to add a new direct IP range on untagged VLAN to pod: <b><span id="pod_name_label"></span></b></p>
<!-- Add IP Range to pod (begin) -->
<div id="dialog_add_iprange_to_pod" title="Add IP Range to Pod" style="display:none">
<p>Add an IP range to pod: <b><span id="pod_name_label"></span></b></p>
<div class="dialog_formcontent">
<form action="#" method="post" id="form5">
<ol>
@ -587,5 +596,5 @@
(info)</div>
</div>
</div>
<!-- Add VLAN IP Range Dialog for pod (end) -->
<!-- Add IP Range to pod (end) -->
<!-- ***** dialogs (begin) ***** -->

26
ui/scripts/cloud.core.pod.js
View File

@ -25,7 +25,7 @@
initDialog("dialog_add_external_cluster");
initDialog("dialog_add_host");
initDialog("dialog_add_pool");
initDialog("dialog_add_vlan_for_pod");
initDialog("dialog_add_iprange_to_pod");
// if hypervisor is KVM, limit the server option to NFS for now
if (getHypervisorType() == 'kvm')
@ -107,11 +107,11 @@ function podJsonToDetailsTab() {
}
});
if(networkType == "Basic") { //basic-mode network (pod-wide VLAN)
$("#tab_network").show();
bindAddPodVLANButton($("#midmenu_add_directIpRange_button"), $leftmenuItem1);
$("#tab_network, #add_iprange_button").show();
bindAddIpRangeToPodButton($leftmenuItem1);
}
else if(networkType == "Advanced") { //advanced-mode network (zone-wide VLAN)
$("#tab_network").hide();
$("#tab_network, #add_iprange_button").hide();
$("#midmenu_add_directIpRange_button").unbind("click").hide();
}
@ -191,14 +191,14 @@ function podNetworkJsonToTemplate(jsonObj, template) {
var $actionMenu = $actionLink.find("#network_action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("Delete VLAN", podNetworkActionMap, $actionMenu, template);
buildActionLinkForSubgridItem("Delete IP Range", podNetworkActionMap, $actionMenu, template);
}
var podNetworkActionMap = {
"Delete VLAN": {
"Delete IP Range": {
api: "deleteVlanIpRange",
isAsyncJob: false,
inProcessText: "Deleting VLAN....",
inProcessText: "Deleting IP Range....",
afterActionSeccessFn: function(json, id, $subgridItem) {
$subgridItem.slideUp("slow", function() {
$(this).remove();
@ -731,10 +731,8 @@ function bindAddPrimaryStorageButton($button, currentPageInRightPanel, $leftmenu
});
}
function bindAddPodVLANButton($button, $leftmenuItem1) {
$button.find("#label").text("Add Direct IP Range");
$button.show();
$button.unbind("click").bind("click", function(event) {
function bindAddIpRangeToPodButton($leftmenuItem1) {
$("#add_iprange_button").unbind("click").bind("click", function(event) {
if($("#tab_content_network").css("display") == "none")
$("#tab_network").click();
@ -743,9 +741,9 @@ function bindAddPodVLANButton($button, $leftmenuItem1) {
var podId = podObj.id;
var podName = podObj.name;
$("#dialog_add_vlan_for_pod").find("#pod_name_label").text(podName);
$("#dialog_add_iprange_to_pod").find("#pod_name_label").text(podName);
$("#dialog_add_vlan_for_pod")
$("#dialog_add_iprange_to_pod")
.dialog('option', 'buttons', {
"Add": function() {
var $thisDialog = $(this);
@ -787,7 +785,7 @@ function bindAddPodVLANButton($button, $leftmenuItem1) {
var item = json.createvlaniprangeresponse.vlan;
var $subgridItem = $("#network_tab_template").clone(true);
podNetworkJsonToTemplate(item, $subgridItem);
$subgridItem.find("#after_action_info").text("Direct VLAN was added successfully.");
$subgridItem.find("#after_action_info").text("IP range was added successfully.");
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
$("#tab_content_network").find("#tab_container").append($subgridItem.fadeIn("slow"));
},