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

new UI - resources page - zone page - implement network tab.

This commit is contained in:
Jessica Wang 2010-10-14 19:59:28 -07:00
parent 80090990a6
commit 729685e87e
2 changed files with 86 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
ui/new/jsp/resource.jsp
View File

@ -121,9 +121,9 @@
<div class="network_dgbox">
<div class="networkdg_zonepanel">
<div class="networkdg_zonebox">
<div class="networkdg_zonecloud">
<div class="networkdg_zonecloud" id="zone_cloud">
<p>
Zone 1</p>
<%=t.t("zone")%> <span id="zone_name"></span></p>
</div>
<div class="networkdg_zoneconnect">
</div>
@ -131,51 +131,11 @@
<div class="networkswitchpanel">
<div class="networkswitch_titlebox">
<p>
Guest VLAN 1000 -1001</p>
Guest VLAN <span id="zone_vlan"></span></p>
</div>
<div class="networkswitch_top">
</div>
<div class="networkswitch_midpanel">
<div class="networkswitch_vlanpanel">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon">
</div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
VM Group:</div>
<span>VLAN 10</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
IP:</div>
<span>10.101.24.231</span>
</div>
</div>
<div class="networkswitch_typeicon direct">
</div>
</div>
</div>
<div class="networkswitch_vlanpanel">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon">
</div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
VM Group:</div>
<span>VLAN 10</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
IP:</div>
<span>10.101.24.231</span>
</div>
</div>
<div class="networkswitch_typeicon virtual">
</div>
</div>
</div>
<div class="networkswitch_midpanel" id="vlan_container">
</div>
<div class="networkswitch_end">
</div>
@ -923,3 +883,47 @@
</div>
</div>
<!-- SystemVM Template (end) -->
<!-- Direct VLAN Template (begin) -->
<div class="networkswitch_vlanpanel" id="direct_vlan_template" style="display: none">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon">
</div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
VLAN:</div>
<span id="vlan_id">n</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
IP:</div>
<span id="ipaddress">n.n.n.n</span>
</div>
</div>
<div class="networkswitch_typeicon direct">
</div>
</div>
</div>
<!-- Direct VLAN Template (end) -->
<!-- Public VLAN Template (begin) -->
<div class="networkswitch_vlanpanel" id="virtual_vlan_template" style="display: none">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon">
</div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
VLAN:</div>
<span id="vlan_id">n</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
IP:</div>
<span id="ipaddress">n.n.n.n</span>
</div>
</div>
<div class="networkswitch_typeicon virtual">
</div>
</div>
</div>
<!-- Public VLAN Template (begin) -->

39
ui/new/scripts/cloud.core2.resource.js
View File

@ -193,7 +193,8 @@ function afterLoadResourceJSP() {
target.parent().parent().parent().addClass("selected");
showPage($zonePage);
var jsonObj = target.data("jsonObj");
zoneJsonToDetailsTab(jsonObj);
zoneJsonToDetailsTab(jsonObj);
zoneJsonToNetworkTab(jsonObj);
break;
@ -317,6 +318,42 @@ function afterLoadResourceJSP() {
$detailsTab.find("#vlan").text(fromdb(jsonObj.vlan));
$detailsTab.find("#guestcidraddress").text(fromdb(jsonObj.guestcidraddress));
}
function zoneJsonToNetworkTab(jsonObj) {
var $networkTab = $zonePage.find("#tab_content_network");
$networkTab.find("#zone_cloud").find("#zone_name").text(jsonObj.name);
$networkTab.find("#zone_vlan").text(jsonObj.vlan);
$.ajax({
data: createURL("command=listVlanIpRanges&zoneId="+jsonObj.id),
dataType: "json",
success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange;
var $vlanContainer = $networkTab.find("#vlan_container").empty();
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
var item = items[i];
var $template1;
if(item.forvirtualnetwork == "false")
$template1 = $("#direct_vlan_template").clone();
else
$template1 = $("#virtual_vlan_template").clone();
vlanjsontotemplate(item, $template1);
$vlanContainer.append($template1.show());
}
}
}
});
}
function vlanjsontotemplate(jsonObj, $template1) {
$template1.data("jsonObj", jsonObj);
$template1.find("#vlan_id").text(jsonObj.vlan);
$template1.find("#ipaddress").text(jsonObj.description);
}
//***** zone page (end) *******************************************************************************************************
//***** pod page (begin) ******************************************************************************************************