apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - VLAN page - Direct VLAN and Virtual VLAN share the same template.

Browse Source
This commit is contained in:
Jessica Wang 2010-10-25 15:28:27 -07:00
parent 5b2aa1d4a1
commit 31a5c77692
2 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1000,12 +1000,12 @@
<!-- Add VLAN IP Range Dialog for zone (end) -->
<!-- Add VLAN IP Range button -->
<div class="networkswitch_vlanadd">
<div class="networkswitch_vlan_addbutton"></div>
</div>
<div id="add_vlan_button" class="networkswitch_vlanadd" style="display:none">
<div class="networkswitch_vlan_addbutton"></div>
</div>
<!-- Direct VLAN Template (begin) -->
<div class="networkswitch_vlanpanel" id="direct_vlan_template" style="display: block;">
<!-- VLAN Template (begin) -->
<div class="networkswitch_vlanpanel" id="vlan_template" style="display:none;">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_closeicon"></div>
@ -1035,35 +1035,12 @@
<span id="ip_range">n.n.n.n - m.m.m.m</span>
</div>
</div>
<div class="networkswitch_typeicon direct">
</div>
<div id="vlan_type_icon" class="networkswitch_typeicon">
</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">
<%=t.t("ip.address.range")%>:</div>
<span id="ip_range">n.n.n.n - m.m.m.m</span>
</div>
</div>
<div class="networkswitch_typeicon virtual">
</div>
</div>
</div>
<!-- Public VLAN Template (begin) -->
<!-- VLAN Template (end) -->
<!-- secondary storage tab template (begin) -->

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

@ -402,11 +402,11 @@ function zoneJsonToNetworkTab(jsonObj) {
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();
var $template1 = $("#vlan_template").clone();
if(item.forvirtualnetwork == false) //direct
$template1.find("#vlan_type_icon").removeClass("virtual").addClass("direct");
else //virtual
$template1.find("#vlan_type_icon").removeClass("direct").addClass("virtual");
vlanJsonToTemplate(item, $template1);
$vlanContainer.append($template1.show());
@ -884,12 +884,12 @@ function initAddVLANButton($midmenuAdd2Link) {
var netmask = trim(thisDialog.find("#add_publicip_vlan_netmask").val());
var startip = trim(thisDialog.find("#add_publicip_vlan_startip").val());
var endip = trim(thisDialog.find("#add_publicip_vlan_endip").val());
var $template1;
if(type == "false") //direct
$template1 = $("#direct_vlan_template").clone();
else //public
$template1 = $("#virtual_vlan_template").clone();
var $template1 = $("#vlan_template").clone();
if(type == "false") //direct
$template1.find("#vlan_type_icon").removeClass("virtual").addClass("direct");
else //virtual
$template1.find("#vlan_type_icon").removeClass("direct").addClass("virtual");
if($vlanContainer != null)
$vlanContainer.prepend($template1.show());