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

bug 7448: zone tree - network - direct network page - details tab - remove IP range row.

This commit is contained in:
Jessica Wang 2010-12-09 11:47:44 -08:00
parent 198cab4dee
commit 5662ea7d90
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/jsp/network.jsp
View File

@ -355,18 +355,8 @@
<div class="row_celltitles" id="netmask">
</div>
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("iprange")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="iprange">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("domain")%>:</div>
@ -376,7 +366,7 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("account")%>:</div>

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

@ -99,7 +99,7 @@ function publicNetworkToMidmenu(jsonObj, $midmenuItem1) {
*/
$midmenuItem1.find("#first_row").text("Public Network");
$midmenuItem1.find("#second_row").text("VLAN: multiple");
$midmenuItem1.find("#second_row").text("VLAN: Multiple");
}
function publicNetworkToRightPanel($midmenuItem1) {
@ -551,9 +551,7 @@ function directNetworkJsonToDetailsTab() {
$thisTab.find("#vlan").text(fromdb(jsonObj.vlan));
$thisTab.find("#gateway").text(fromdb(jsonObj.gateway));
$thisTab.find("#netmask").text(fromdb(jsonObj.netmask));
var ipRange = getIpRange(fromdb(jsonObj.startip), fromdb(jsonObj.endip));
$thisTab.find("#iprange").text(ipRange);
$thisTab.find("#domain").text(fromdb(jsonObj.domain)); //might be null
$thisTab.find("#account").text(fromdb(jsonObj.account)); //might be null