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

bug 7448: Direct Network page - implement "IP Allocation" tab.

This commit is contained in:
Jessica Wang 2010-12-08 13:24:41 -08:00
parent d1331b26bf
commit b5cf31857f
2 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ui/jsp/network.jsp
View File

@ -177,3 +177,32 @@
</div>
<!-- ***** Direct Network (end) ***** -->
</div>
<!-- Direct Network - IP Allocation tab template (begin) -->
<div class="grid_container" id="directnetwork_iprange_template" style="display: none">
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Start IP:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="startip">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
End IP:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="endip">
</div>
</div>
</div>
</div>
<!-- Direct Network - IP Allocation tab template (end) -->

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

@ -72,9 +72,8 @@ function directNetworkToMidmenu(jsonObj, $midmenuItem1) {
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png");
*/
$midmenuItem1.find("#first_row").text("VLAN " + fromdb(jsonObj.vlan));
$midmenuItem1.find("#second_row").text(fromdb(getIpRange(jsonObj.startip, jsonObj.endip)));
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text("VLAN " + fromdb(jsonObj.vlan));
}
function directNetworkToRightPanel($midmenuItem1) {
@ -133,12 +132,34 @@ function directNetworkJsonToIpAllocationTab() {
var $thisTab = $("#right_panel_content #direct_network_page #tab_content_ipallocation");
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
$.ajax({
data: createURL("command=listVlanIpRanges&zoneid="+ jsonObj.zoneid + "&networkid="+jsonObj.id),
dataType: "json",
success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange;
var $container = $thisTab.find("#tab_container").empty();
var $template = $("#directnetwork_iprange_template");
if(items != null && items.length > 0) {
for(var i=0; i<items.length; i++) {
var $newTemplate = $template.clone();
directNetworkIprangeJsonToTemplate(items[i], $newTemplate);
$container.append($newTemplate.show());
}
}
$thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}
});
}
function directNetworkIprangeJsonToTemplate(jsonObj, $template) {
$template.attr("id", "directNetworkIprange_" + jsonObj.id);
var ipRange = getIpRange(jsonObj.startip, jsonObj.endip);
$template.find("#grid_header_title").text(ipRange);
$template.find("#startip").text(jsonObj.startip);
$template.find("#endip").text(jsonObj.endip);
}