apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 20:29:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

IP Address page - PF, LB tab - fix a bug that action_link was shifted to state column when state column doesn't have value.

Browse Source
This commit is contained in:
Jessica Wang 2011-02-11 10:54:05 -08:00
parent 6e9ef0d988
commit 0e8907c88f
1 changed files with 45 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
ui/jsp/ipaddress.jsp
View File

@ -259,11 +259,7 @@ dictionary = {
<div id="end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<select class="select" id="protocol" style="width:70%;"> <select class="select" id="protocol" style="width:70%;">
<!--
<option value="TCP">TCP</option>
<option value="UDP">UDP</option>
-->
</select> </select>
</div> </div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
@ -293,57 +289,53 @@ dictionary = {
<div id="tab_container"> <div id="tab_container">
<div class="grid_container" id="grid_container"> <div class="grid_container" id="grid_container">
<div class="grid_header"> <div class="grid_header">
<div class="grid_header_cell" style="width: 15%;"> <div class="grid_header_cell" style="width: 15%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.public.port"/></div> <fmt:message key="label.public.port"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 15%;"> <div class="grid_header_cell" style="width: 15%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.private.port"/></div> <fmt:message key="label.private.port"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 15%;"> <div class="grid_header_cell" style="width: 15%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.protocol"/></div> <fmt:message key="label.protocol"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 25%; border: none;"> <div class="grid_header_cell" style="width: 25%; padding: 1px; border: none;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.instance"/></div> <fmt:message key="label.instance"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 10%;"> <div class="grid_header_cell" style="width: 10%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.state"/></div> <fmt:message key="label.state"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 15%;"> <div class="grid_header_cell" style="width: 15%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.actions"/></div> <fmt:message key="label.actions"/></div>
</div> </div>
</div> </div>
<div class="grid_rows even" id="create_port_forwarding_row"> <div class="grid_rows even" id="create_port_forwarding_row">
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<input id="public_port" class="text" style="width: 70%;" type="text" /> <input id="public_port" class="text" style="width: 70%; padding: 1px;" type="text" />
<div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div> </div>
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%;">
<input id="private_port" class="text" style="width: 70%;" type="text" /> <input id="private_port" class="text" style="width: 70%; padding: 1px;" type="text" />
<div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div> </div>
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<select class="select" id="protocol" style="width:70%;"> <select class="select" id="protocol" style="width:70%;">
<!--
<option value="TCP">TCP</option>
<option value="UDP">UDP</option>
-->
</select> </select>
</div> </div>
<div class="grid_row_cell" style="width: 25%;"> <div class="grid_row_cell" style="width: 25%; padding: 1px;">
<select class="select" id="vm"> <select class="select" id="vm">
</select> </select>
<div id="vm_errormsg" class="errormsg" style="display: none;"></div> <div id="vm_errormsg" class="errormsg" style="display: none;"></div>
</div> </div>
<div class="grid_row_cell" style="width: 10%;"> <div class="grid_row_cell" style="width: 10%; padding: 1px;">
<div class="row_celltitles" id="state"></div> <div class="row_celltitles" id="state"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles"> <div class="row_celltitles">
<a id="add_link" href="#"><fmt:message key="label.add"/></a></div> <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
</div> </div>
@ -367,56 +359,51 @@ dictionary = {
<div id="tab_container"> <div id="tab_container">
<div class="grid_container"> <div class="grid_container">
<div class="grid_header"> <div class="grid_header">
<div class="grid_header_cell" style="width: 20%;"> <div class="grid_header_cell" style="width: 20%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.name"/></div> <fmt:message key="label.name"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 14%;"> <div class="grid_header_cell" style="width: 14%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.public.port"/></div> <fmt:message key="label.public.port"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 14%;"> <div class="grid_header_cell" style="width: 14%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.private.port"/></div> <fmt:message key="label.private.port"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 15%;"> <div class="grid_header_cell" style="width: 15%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.algorithm"/></div> <fmt:message key="label.algorithm"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 10%;"> <div class="grid_header_cell" style="width: 10%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.state"/></div> <fmt:message key="label.state"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 25%;"> <div class="grid_header_cell" style="width: 25%; padding: 1px;">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.actions"/></div> <fmt:message key="label.actions"/></div>
</div> </div>
</div> </div>
<div class="grid_rows even" id="create_load_balancer_row"> <div class="grid_rows even" id="create_load_balancer_row">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%; padding: 1px;">
<input id="name" class="text" style="width: 70%;" type="text" /> <input id="name" class="text" style="width: 70%; padding: 1px;" type="text" />
<div id="name_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="name_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div> </div>
<div class="grid_row_cell" style="width: 14%;"> <div class="grid_row_cell" style="width: 14%; padding: 1px;">
<input id="public_port" class="text" style="width: 70%;" type="text" /> <input id="public_port" class="text" style="width: 70%; padding: 1px;" type="text" />
<div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div> </div>
<div class="grid_row_cell" style="width: 14%;"> <div class="grid_row_cell" style="width: 14%; padding: 1px;">
<input id="private_port" class="text" style="width: 70%;" type="text" /> <input id="private_port" class="text" style="width: 70%; padding: 1px;" type="text" />
<div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div> </div>
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<select id="algorithm_select" class="select" style="width: 70%;"> <select id="algorithm_select" class="select" style="width: 70%;">
<!--
<option value="roundrobin">roundrobin</option>
<option value="leastconn">leastconn</option>
<option value="source">source</option>
-->
</select> </select>
</div> </div>
<div class="grid_row_cell" style="width: 10%;"> <div class="grid_row_cell" style="width: 10%; padding: 1px;">
</div> </div>
<div class="grid_row_cell" style="width: 25%;"> <div class="grid_row_cell" style="width: 25%; padding: 1px;">
<div class="row_celltitles"> <div class="row_celltitles">
<a id="add_link" href="#"><fmt:message key="label.add"/></a></div> <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
</div> </div>
@ -487,26 +474,26 @@ dictionary = {
<!-- Load Balancer Template (begin) --> <!-- Load Balancer Template (begin) -->
<div class="grid_rows odd" id="load_balancer_template" style="display:none"> <div class="grid_rows odd" id="load_balancer_template" style="display:none">
<div id="row_container"> <div id="row_container">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%; padding: 1px;">
<div class="row_celltitles" id="name"> <div class="row_celltitles" id="name">
LB#1</div> LB#1</div>
</div> </div>
<div class="grid_row_cell" style="width: 14%;"> <div class="grid_row_cell" style="width: 14%; padding: 1px;">
<div class="row_celltitles" id="public_port"> <div class="row_celltitles" id="public_port">
8080</div> 8080</div>
</div> </div>
<div class="grid_row_cell" style="width: 14%;"> <div class="grid_row_cell" style="width: 14%; padding: 1px;">
<div class="row_celltitles" id="private_port"> <div class="row_celltitles" id="private_port">
80</div> 80</div>
</div> </div>
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles" id="algorithm"> <div class="row_celltitles" id="algorithm">
(algorithm)</div> (algorithm)</div>
</div> </div>
<div class="grid_row_cell" style="width: 10%;"> <div class="grid_row_cell" style="width: 10%; padding: 1px;">
<div class="row_celltitles" id="state"></div> <div class="row_celltitles" id="state"></div>
</div> </div>
<div class="grid_row_cell" style="width: 25%;"> <div class="grid_row_cell" style="width: 25%; padding: 1px;">
<div class="row_celltitles"> <div class="row_celltitles">
<a id="manage_link" href="#" style="float:left;"><fmt:message key="label.manage"/></a> <a id="manage_link" href="#" style="float:left;"><fmt:message key="label.manage"/></a>
<a id="edit_link" href="#" style="float:left; margin-left:15px;"><fmt:message key="label.edit"/></a> <a id="edit_link" href="#" style="float:left; margin-left:15px;"><fmt:message key="label.edit"/></a>
@ -533,12 +520,7 @@ dictionary = {
<div class="row_celltitles" id="private_port"></div> <div class="row_celltitles" id="private_port"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<select id="algorithm_select" class="select" style="width: 70%;"> <select id="algorithm_select" class="select" style="width: 70%;">
<!--
<option value="roundrobin">roundrobin</option>
<option value="leastconn">leastconn</option>
<option value="source">source</option>
-->
</select> </select>
</div> </div>
<div class="grid_row_cell" style="width: 10%; padding: 1px;"> <div class="grid_row_cell" style="width: 10%; padding: 1px;">
@ -648,60 +630,24 @@ dictionary = {
<!-- Port Forwarding template (begin) --> <!-- Port Forwarding template (begin) -->
<div class="grid_rows odd" id="port_forwarding_template" style="display: none"> <div class="grid_rows odd" id="port_forwarding_template" style="display: none">
<div id="row_container"> <div id="row_container">
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles" id="public_port"></div> <div class="row_celltitles" id="public_port"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles" id="private_port"></div> <div class="row_celltitles" id="private_port"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%;">
<div class="row_celltitles" id="protocol"></div>
</div>
<div class="grid_row_cell" style="width: 25%;">
<div class="row_celltitles" id="vm_name"></div>
</div>
<div class="grid_row_cell" style="width: 10%;">
<div class="row_celltitles" id="state"></div>
</div>
<div class="grid_row_cell" style="width: 15%;">
<div class="row_celltitles">
<a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>
<!--
<a id="edit_link" href="#" style="float:left; margin-left:15px;">Edit</a>
-->
</div>
</div>
<div class="gridrow_loaderbox" style="display: none;" id="spinning_wheel">
<div class="gridrow_loader">
</div>
<p id="description">
<fmt:message key="label.waiting"/> &hellip;
</p>
</div>
</div>
<div id="row_container_edit" style="display:none">
<div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles" id="public_port"></div>
</div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;">
<input id="private_port" class="text" style="width: 70%;" type="text" />
<div id="private_port_errormsg" class="errormsg" style="display: none;">
Error msg will appear here</div>
</div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles" id="protocol"></div> <div class="row_celltitles" id="protocol"></div>
</div> </div>
<div class="grid_row_cell" style="width: 25%; padding: 1px;"> <div class="grid_row_cell" style="width: 25%; padding: 1px;">
<select class="select" id="vm"> <div class="row_celltitles" id="vm_name"></div>
</select> </div>
</div>
<div class="grid_row_cell" style="width: 10%; padding: 1px;"> <div class="grid_row_cell" style="width: 10%; padding: 1px;">
<div class="row_celltitles" id="state"></div> <div class="row_celltitles" id="state"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;"> <div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles"> <div class="row_celltitles">
<a id="save_link" href="#" style="float:left;"><fmt:message key="label.save"/> </a> <a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>
<a id="cancel_link" href="#" style="float:left; margin-left:15px;"><fmt:message key="label.cancel"/> </a>
</div> </div>
</div> </div>
<div class="gridrow_loaderbox" style="display: none;" id="spinning_wheel"> <div class="gridrow_loaderbox" style="display: none;" id="spinning_wheel">
@ -711,7 +657,7 @@ dictionary = {
<fmt:message key="label.waiting"/> &hellip; <fmt:message key="label.waiting"/> &hellip;
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<!-- Port Forwarding template (end) --> <!-- Port Forwarding template (end) -->