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

bug 7841: Network page - public network - IP Allocation tab - add gateway, netmask row.

Browse Source
This commit is contained in:
Jessica Wang 2011-01-04 18:55:27 -08:00
parent c74fd529be
commit 8ec1a329bf
2 changed files with 90 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
ui/jsp/network.jsp
View File

@ -539,8 +539,88 @@
</div>
<!-- Load Balancer template (end) -->
<!-- IP Range template (begin) -->
<div class="grid_container" id="iprange_template" style="display: none">
<!-- Public IP Range template (begin) -->
<div class="grid_container" id="public_iprange_template" style="display: none">
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
<div class="grid_actionbox" id="iprange_action_link"><p>Actions</p>
<div class="grid_actionsdropdown_box" id="iprange_action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
</ul>
</div>
</div>
<div class="gridheader_loaderbox" id="spinning_wheel" style="display: none; height: 18px;">
<div class="gridheader_loader" id="icon">
</div>
<p id="description">
Waiting &hellip;
</p>
</div>
</div>
<div class="grid_rows" id="after_action_info_container" style="display:none">
<div class="grid_row_cell" style="width: 90%; border: none;">
<div class="row_celltitles">
<strong id="after_action_info">Message will appear here</strong></div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
ID:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
VLAN:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="vlan">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Gateway:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="gateway">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Netmask:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="netmask">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
IP Range:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="iprange">
</div>
</div>
</div>
</div>
<!-- Public IP Range template (end) -->
<!-- Direct IP Range template (begin) -->
<div class="grid_container" id="direct_iprange_template" style="display: none">
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
@ -597,7 +677,7 @@
</div>
</div>
</div>
<!-- IP Range template (end) -->
<!-- Direct IP Range template (end) -->
<!-- Add IP Range for public netework dialog (begin) -->

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

@ -191,7 +191,7 @@ function publicNetworkJsonToIpAllocationTab() {
success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange;
var $container = $thisTab.find("#tab_container").empty();
var $template = $("#iprange_template");
var $template = $("#public_iprange_template");
if(items != null && items.length > 0) {
for(var i=0; i<items.length; i++) {
var $newTemplate = $template.clone();
@ -213,7 +213,9 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) {
$template.find("#grid_header_title").text(ipRange);
$template.find("#id").text(jsonObj.id);
$template.find("#vlan").text(jsonObj.vlan);
$template.find("#vlan").text(jsonObj.vlan);
$template.find("#gateway").text(jsonObj.gateway);
$template.find("#netmask").text(jsonObj.netmask);
$template.find("#iprange").text(ipRange);
var $actionLink = $template.find("#iprange_action_link");
@ -547,7 +549,7 @@ function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
$thisDialog.dialog("close");
var item = json.createvlaniprangeresponse.vlan;
var $newTemplate = $("#iprange_template").clone();
var $newTemplate = $("#public_iprange_template").clone();
publicNetworkIprangeJsonToTemplate(item, $newTemplate);
$("#public_network_page").find("#tab_content_ipallocation").find("#tab_container").prepend($newTemplate.show());
},
@ -936,7 +938,7 @@ function directNetworkJsonToIpAllocationTab() {
success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange;
var $container = $thisTab.find("#tab_container").empty();
var $template = $("#iprange_template");
var $template = $("#direct_iprange_template");
if(items != null && items.length > 0) {
for(var i=0; i<items.length; i++) {
var $newTemplate = $template.clone();
@ -1195,7 +1197,7 @@ function bindAddIpRangeToDirectNetworkButton($button, $midmenuItem1) {
$thisDialog.dialog("close");
var item = json.createvlaniprangeresponse.vlan;
var $newTemplate = $("#iprange_template").clone();
var $newTemplate = $("#direct_iprange_template").clone();
directNetworkIprangeJsonToTemplate(item, $newTemplate);
$("#right_panel_content #direct_network_page #tab_content_ipallocation").find("#tab_container").prepend($newTemplate.show());
},