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

External Firewall, External Load Balancer - change lable from "URL" to "IP" since what API returns is actually IP instead of URL.

This commit is contained in:
Jessica Wang 2010-12-10 19:51:31 -08:00
parent d341ea4218
commit 4ea8424332
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/jsp/network.jsp
View File

@ -439,23 +439,13 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
URL:</div>
IP:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="url">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Type:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="type">
</div>
</div>
</div>
</div>
</div>
<!-- External Firewall template (end) -->
@ -500,23 +490,13 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
URL:</div>
IP:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="url">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Type:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="type">
</div>
</div>
</div>
</div>
</div>
<!-- Load Balancer template (end) -->

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

@ -248,8 +248,7 @@ function publicNetworkFirewallJsonToTemplate(jsonObj, $template) {
$template.attr("id", "publicNetworkFirewall_" + jsonObj.id);
$template.find("#grid_header_title").text(fromdb(jsonObj.url));
$template.find("#id").text(fromdb(jsonObj.id));
$template.find("#type").text(fromdb(jsonObj.type));
$template.find("#id").text(fromdb(jsonObj.id));
$template.find("#url").text(fromdb(jsonObj.url));
var $actionLink = $template.find("#firewall_action_link");
@ -320,8 +319,7 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
$template.attr("id", "publicNetworkLoadBalancer_" + jsonObj.id);
$template.find("#grid_header_title").text(fromdb(jsonObj.url));
$template.find("#id").text(fromdb(jsonObj.id));
$template.find("#type").text(fromdb(jsonObj.type));
$template.find("#id").text(fromdb(jsonObj.id));
$template.find("#url").text(fromdb(jsonObj.url));
var $actionLink = $template.find("#loadbalancer_action_link");