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

cloudStack - IP Address page - Port Forwarding tab - add Source IDCR.

This commit is contained in:
Jessica Wang 2011-07-20 11:37:59 -07:00
parent 642b6012a4
commit 6f35fd45a0
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ui/jsp/ipaddress.jsp
View File

@ -40,8 +40,8 @@ dictionary = {
<fmt:message key="label.port.forwarding"/></div>
<div class="content_tabs off" id="tab_load_balancer" style="display: none">
<fmt:message key="label.load.balancer"/></div>
<!-- <div class="content_tabs off" id="tab_vpn" style="display: none">
<fmt:message key="label.vpn"/></div> -->
<div class="content_tabs off" id="tab_vpn" style="display: none">
<fmt:message key="label.vpn"/></div>
</div>
<div id="tab_content_details">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
@ -289,15 +289,15 @@ dictionary = {
<div id="tab_container">
<div class="grid_container" id="grid_container">
<div class="grid_header">
<div class="grid_header_cell" style="width: 24%; ">
<div class="grid_header_title">
<fmt:message key="label.cidr.list"/></div>
</div>
<div class="grid_header_cell" style="width: 10%; ">
<div class="grid_header_cell" style="width: 25%; ">
<div class="grid_header_title">
<fmt:message key="label.cidr.list"/></div>
</div>
<div class="grid_header_cell" style="width: 15%; ">
<div class="grid_header_title">
<fmt:message key="label.public.port"/></div>
</div>
<div class="grid_header_cell" style="width: 10%; ">
<div class="grid_header_cell" style="width: 15%; ">
<div class="grid_header_title">
<fmt:message key="label.private.port"/></div>
</div>
@ -305,55 +305,55 @@ dictionary = {
<div class="grid_header_title">
<fmt:message key="label.protocol"/></div>
</div>
<div class="grid_header_cell" style="width: 20%; border: none;">
<div class="grid_header_cell" style="width: 15%; border: none;">
<div class="grid_header_title">
<fmt:message key="label.instance"/></div>
</div>
<div class="grid_header_cell" style="width: 10%; ">
<div class="grid_header_cell" style="width: 5%; ">
<div class="grid_header_title">
<fmt:message key="label.state"/></div>
</div>
<div class="grid_header_cell" style="width: 15%; ">
<div class="grid_header_cell" style="width: 10%; ">
<div class="grid_header_title">
<fmt:message key="label.actions"/></div>
</div>
</div>
<div class="grid_rows even" id="create_port_forwarding_row">
<div class="grid_row_cell" style="width: 24%; ">
<div class="grid_row_cell" style="width: 25%; ">
<input id="cidr" class="text" type="text" />
<div id="cidr_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div>
<div class="grid_row_cell" style="width: 10%; ">
<input id="public_port" class="text" style="width: 60%; " type="text" />
<div class="grid_row_cell" style="width: 15%; ">
<input id="public_port" class="text" style="width: 30%; " type="text" />
<div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
<!--
<span style="float:left;padding-left:10px"> - </span>
<input id="public_end_port" class="text" style="width: 30%; " type="text" />
<div id="public_end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
-->
</div>
<div class="grid_row_cell" style="width: 10%;">
<input id="private_port" class="text" style="width: 60%; " type="text" />
</div>
<div class="grid_row_cell" style="width: 15%;">
<input id="private_port" class="text" style="width: 30%; " type="text" />
<div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
<!--
<span style="float:left;padding-left:10px"> - </span>
<input id="private_end_port" class="text" style="width: 30%; " type="text" />
<div id="private_end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
-->
</div>
</div>
<div class="grid_row_cell" style="width: 10%; ">
<select class="select" id="protocol" style="width:70%;">
</select>
</div>
<div class="grid_row_cell" style="width: 20%; ">
<div class="grid_row_cell" style="width: 15%; ">
<select class="select" id="vm">
</select>
<div id="vm_errormsg" class="errormsg" style="display: none;"></div>
</div>
<div class="grid_row_cell" style="width: 10%; ">
<div class="grid_row_cell" style="width: 5%; ">
<div class="row_celltitles" id="state" style="padding:1px;"></div>
</div>
<div class="grid_row_cell" style="width: 15%; ">
<div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles">
<a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
</div>
@ -649,25 +649,25 @@ dictionary = {
<!-- Port Forwarding template (begin) -->
<div class="grid_rows odd" id="port_forwarding_template" style="display: none">
<div id="row_container">
<div class="grid_row_cell" style="width: 24%; ">
<div class="grid_row_cell" style="width: 25%; ">
<div class="row_celltitles" id="cidr" style="padding:1px;"></div>
</div>
<div class="grid_row_cell" style="width: 10%; ">
<div class="grid_row_cell" style="width: 15%; ">
<div class="row_celltitles" id="public_port"></div>
</div>
<div class="grid_row_cell" style="width: 10%; ">
<div class="grid_row_cell" style="width: 15%; ">
<div class="row_celltitles" id="private_port"></div>
</div>
<div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles" id="protocol"></div>
</div>
<div class="grid_row_cell" style="width: 20%; ">
<div class="grid_row_cell" style="width: 15%; ">
<div class="row_celltitles" id="vm_name"></div>
</div>
<div class="grid_row_cell" style="width: 10%; ">
<div class="grid_row_cell" style="width: 5%; ">
<div class="row_celltitles" id="state" style="padding:1px;"></div>
</div>
<div class="grid_row_cell" style="width: 15%; ">
<div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles">
<a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>
</div>
@ -855,4 +855,4 @@ dictionary = {
</div>
</div>
<!-- advanced search popup (end) -->
</div>
</div>

12
ui/scripts/cloud.core.ipaddress.js
View File

@ -285,10 +285,10 @@ function afterLoadIpJSP() {
isValid &= validateCIDRList("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional
isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required
//isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
isValid &= validateInteger("Private Port", $createPortForwardingRow.find("#private_port"), $createPortForwardingRow.find("#private_port_errormsg"), 1, 65535, false); //required
//isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional
isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional
isValid &= validateDropDownBox("Instance", $createPortForwardingRow.find("#vm"), $createPortForwardingRow.find("#vm_errormsg"));
if (!isValid)
@ -1516,13 +1516,13 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
$template.find("#cidr").text(fromdb(jsonObj.cidrlist));
var publicPort = fromdb(jsonObj.publicport);
//if(jsonObj.publicendport != null && jsonObj.publicendport.length > 0)
// publicPort += (" - " + fromdb(jsonObj.publicendport));
if(jsonObj.publicendport != null && jsonObj.publicendport.length > 0)
publicPort += (" - " + fromdb(jsonObj.publicendport));
$template.find("#public_port").text(publicPort);
var privatePort = fromdb(jsonObj.privateport);
//if(jsonObj.privateendport != null && jsonObj.privateendport.length > 0)
// privatePort += (" - " + fromdb(jsonObj.privateendport));
if(jsonObj.privateendport != null && jsonObj.privateendport.length > 0)
privatePort += (" - " + fromdb(jsonObj.privateendport));
$template.find("#private_port").text(privatePort);
$template.find("#protocol").text(fromdb(jsonObj.protocol));