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

Network page - IP Range tab - add ID row.

This commit is contained in:
Jessica Wang 2010-12-10 09:52:12 -08:00
parent 8ac694bf55
commit b485796e8b
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/jsp/network.jsp
View File

@ -548,6 +548,16 @@
</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>
@ -557,26 +567,16 @@
</div>
</div>
</div>
<div class="grid_rows even">
<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 odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
End IP:</div>
IP Range:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="endip">
<div class="row_celltitles" id="iprange">
</div>
</div>
</div>
</div>
</div>
<!-- IP Range template (end) -->

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

@ -191,9 +191,9 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) {
var ipRange = getIpRange(fromdb(jsonObj.startip), fromdb(jsonObj.endip));
$template.find("#grid_header_title").text(ipRange);
$template.find("#vlan").text(jsonObj.vlan)
$template.find("#startip").text(fromdb(jsonObj.startip));
$template.find("#endip").text(fromdb(jsonObj.endip));
$template.find("#id").text(jsonObj.id);
$template.find("#vlan").text(jsonObj.vlan);
$template.find("#iprange").text(ipRange);
var $actionLink = $template.find("#iprange_action_link");
$actionLink.bind("mouseover", function(event) {
@ -941,10 +941,10 @@ function directNetworkIprangeJsonToTemplate(jsonObj, $template) {
var ipRange = getIpRange(fromdb(jsonObj.startip), fromdb(jsonObj.endip));
$template.find("#grid_header_title").text(ipRange);
$template.find("#vlan").text(jsonObj.vlan)
$template.find("#startip").text(fromdb(jsonObj.startip));
$template.find("#endip").text(fromdb(jsonObj.endip));
$template.find("#id").text(jsonObj.id)
$template.find("#vlan").text(jsonObj.vlan);
$template.find("#iprange").text(ipRange);
var $actionLink = $template.find("#iprange_action_link");
$actionLink.bind("mouseover", function(event) {
$(this).find("#iprange_action_menu").show();