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

new UI - VLAN page - fill up info dropdown.

Browse Source
This commit is contained in:
Jessica Wang 2010-10-25 19:35:52 -07:00
parent 01db4f3fd7
commit 2466501911
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1040,9 +1040,14 @@
<a href="#">Close</a> <a href="#">Close</a>
</div> </div>
<ul class="networkswitch_infodropdown_textbox"> <ul class="networkswitch_infodropdown_textbox">
<li><div class="networkswitch_infodropdown_textbox_label">Zone</div>: NC </li> <li id="vlan_container"><div class="networkswitch_infodropdown_textbox_label">VLAN ID:</div> <span id="vlan"></span></li>
<li><div class="networkswitch_infodropdown_textbox_label">Network Type</div>: Root</li> <li id="gateway_container"><div class="networkswitch_infodropdown_textbox_label">Gateway:</div> <span id="gateway"></span></li>
<li><div class="networkswitch_infodropdown_textbox_label">Account</div>: Admin</li> <li id="netmask_container"><div class="networkswitch_infodropdown_textbox_label">Netmask:</div> <span id="netmask"></span></li>
<li id="iprange_container"><div class="networkswitch_infodropdown_textbox_label">IP Range:</div> <span id="iprange"></span></li>
<li id="domainid_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Domain ID:</div> <span id="domainid"></span></li>
<li id="domain_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Domain:</div> <span id="domain"></span></li>
<li id="account_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Account:</div> <span id="account"></span></li>
<li id="podname_container" style="display:none"><div class="networkswitch_infodropdown_textbox_label">Pod:</div> <span id="podname"></span></li>
</ul> </ul>
</div> </div>

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

@ -463,8 +463,44 @@ function vlanJsonToTemplate(jsonObj, $template1) {
var $target = $(event.target); var $target = $(event.target);
var targetId = $target.attr("id"); var targetId = $target.attr("id");
switch(targetId) { switch(targetId) {
case "info_icon": case "info_icon":
$target.siblings("#info_dropdown").show(); var vlanName = jsonObj.id;
var vlanDisplayName = vlanName;
if (jsonObj.description != null) {
if (jsonObj.description.indexOf("-") == -1) {
vlanName = jsonObj.description;
vlanDisplayName = vlanName;
} else {
var ranges = jsonObj.description.split("-");
vlanName = ranges[0] + " -" + ranges[1];
vlanDisplayName = ranges[0] + " - " + ranges[1];
}
}
var $infoDropdown = $target.siblings("#info_dropdown");
$infoDropdown.find("#vlan").text(fromdb(jsonObj.vlan));
$infoDropdown.find("#gateway").text(fromdb(jsonObj.gateway));
$infoDropdown.find("#netmask").text(fromdb(jsonObj.netmask));
$infoDropdown.find("#iprange").text(fromdb(vlanDisplayName));
if(jsonObj.domainid != null) {
var $container = $infoDropdown.find("#domainid_container").show();
$container.find("#domainid").text(fromdb(jsonObj.domainid));
}
if(jsonObj.domain != null) {
var $container = $infoDropdown.find("#domain_container").show();
$container.find("#domain").text(fromdb(jsonObj.domain));
}
if(jsonObj.account != null) {
var $container = $infoDropdown.find("#account_container").show();
$container.find("#account").text(fromdb(jsonObj.account));
}
if(jsonObj.podname != null) {
var $container = $infoDropdown.find("#podname_container").show();
$container.find("#podname").text(fromdb(jsonObj.podname));
}
$infoDropdown.show();
break; break;
} }