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

Network page - External Firewall tab, External Load Balancer tab - API has changed to return individual properties instead of a single URL property. Here is related UI change.

This commit is contained in:
Jessica Wang 2011-01-31 11:32:39 -08:00
parent 4281781a23
commit fb18ba9f0c
2 changed files with 110 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
ui/jsp/network.jsp
View File

@ -496,19 +496,77 @@ dictionary = {
<div class="row_celltitles" id="id">
</div>
</div>
</div>
<!--
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.ip"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="url">
<div class="row_celltitles" id="ip">
</div>
</div>
</div>
-->
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.username"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="username">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.public.interface"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="publicinterface">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.private.interface"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="privateinterface">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.usage.interface"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="usageinterface">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.public.zone"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="publiczone">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.private.zone"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="privatezone">
</div>
</div>
</div>
</div>
<!-- External Firewall template (end) -->
@ -560,18 +618,46 @@ dictionary = {
</div>
</div>
</div>
<!--
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.ip"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="url">
<div class="row_celltitles" id="ip">
</div>
</div>
</div>
-->
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.username"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="username">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.public.interface"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="publicinterface">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.private.interface"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="privateinterface">
</div>
</div>
</div>
</div>
<!-- Load Balancer template (end) -->

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

@ -283,6 +283,7 @@ function publicNetworkJsonToFirewallTab() {
});
}
/*
function publicNetworkParseUrl(url, $template) {
if(url == null)
return;
@ -319,13 +320,21 @@ function publicNetworkParseUrl(url, $template) {
}
}
}
*/
function publicNetworkFirewallJsonToTemplate(jsonObj, $template) {
$template.data("jsonObj", jsonObj);
$template.attr("id", "publicNetworkFirewall_" + jsonObj.id);
$template.find("#id").text(fromdb(jsonObj.id));
publicNetworkParseUrl(jsonObj.url, $template);
//publicNetworkParseUrl(jsonObj.url, $template);
$template.find("#ip").text(fromdb(jsonObj.ipaddress));
$template.find("#username").text(fromdb(jsonObj.username));
$template.find("#publicinterface").text(fromdb(jsonObj.publicinterface));
$template.find("#privateinterface").text(fromdb(jsonObj.privateinterface));
$template.find("#usageinterface").text(fromdb(jsonObj.usageinterface));
$template.find("#publiczone").text(fromdb(jsonObj.publiczone));
$template.find("#privatezone").text(fromdb(jsonObj.privatezone));
var $actionLink = $template.find("#firewall_action_link");
$actionLink.bind("mouseover", function(event) {
$(this).find("#firewall_action_menu").show();
@ -395,8 +404,12 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
$template.find("#grid_header_title").text(fromdb(jsonObj.url));
$template.find("#id").text(fromdb(jsonObj.id));
publicNetworkParseUrl(jsonObj.url, $template);
//publicNetworkParseUrl(jsonObj.url, $template);
$template.find("#ip").text(fromdb(jsonObj.ipaddress));
$template.find("#username").text(fromdb(jsonObj.username));
$template.find("#publicinterface").text(fromdb(jsonObj.publicinterface));
$template.find("#privateinterface").text(fromdb(jsonObj.privateinterface));
var $actionLink = $template.find("#loadbalancer_action_link");
$actionLink.bind("mouseover", function(event) {
$(this).find("#loadbalancer_action_menu").show();