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

bug 4456: localized string replacement for networkoffering.jsp, pod.jsp 

- Standardized some vCenter naming conventions.
This commit is contained in:
will 2011-01-25 16:49:17 -08:00
parent cd576af3be
commit 26a0492cbe
5 changed files with 129 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/WEB-INF/classes/resources/messages.properties
View File

@ -20,8 +20,8 @@ label.add.zone=Add Zone
label.adding.zone=Adding Zone
label.add.host=Add Host
label.add.cluster=Add Cluster
label.add.primarystorage=Add Primary Storage
label.add.secondarystorage=Add Secondary Storage
label.add.primary.storage=Add Primary Storage
label.add.secondary.storage=Add Secondary Storage
label.add.pod=Add Pod
label.adding.pod=Adding Pod
label.add.vlan=Add VLAN
@ -80,11 +80,12 @@ label.hypervisor=Hypervisor
label.cluster.type=Cluster Type
label.host.name=Host Name
label.vcenter.datastore=vCenter Datastore
label.vcenter.address=vCenter Address
label.vcenter.host=vCenter Host
label.vcenter.username=vCenter Username
label.vcenter.password=vCenter Password
label.vcenter.datacenter=vCenter Datacenter
label.vcenter.host=vCenter Host
label.vcenter.cluster=vCenter Cluster
label.esx.host=ESX/ESXi Host
label.protocol=Protocol
label.nfs=NFS
label.iscsi=iSCSI
@ -100,6 +101,8 @@ label.allocated=Allocated
label.private.ips=Private IP Addresses
label.private.ip=Private IP Address
label.guest.ip=Guest IP Address
label.guest.ip.range=Guest IP Range
label.guest.netmask=Guest Netmask
label.memory.allocated=Memory Allocated
label.memory.used=Memory Used
label.cpu.allocated=CPU Allocated
@ -259,6 +262,18 @@ label.network.desc=Network Desc
label.zone.wide=Zone-Wide
label.account.specific=Account-Specific
label.ip.range=IP Range
label.network.offering=Network Offering
label.availability=Availability
label.require=Required
label.optional=Optional
label.unavailable=Unavailable
label.specify.vlan=Specify VLAN
label.network.rate=Network Rate
label.by.availability=By Availability
label.by.traffic.type=By Traffic Type
label.private.ip.range=Private IP Range
label.cloud.managed=Cloud.com Managed
label.vsphere.managed=vSphere Managed
label.lang.english=English
label.lang.chinese=Chinese
@ -366,6 +381,10 @@ message.add.firewall=Add a firewall to zone
message.add.load.balancer=Add a load balancer to zone
message.add.ip.range.direct.network=Add an IP range to direct network <b><span id="directnetwork_name"></span></b> in zone <b><span id="zone_name"></span></b>
message.add.network=Add a new network for zone: <b><span id="zone_name"></span></b>
message.add.host=Add a host for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
message.add.cluster=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
message.add.primary.storage=Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
message.add.ip.range.to.pod=<p>Add an IP range to pod: <b><span id="pod_name_label"></span></b></p>
#Errors
error.login=Your username/password does not match our records.

6
ui/jsp/cluster.jsp
View File

@ -132,7 +132,7 @@
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
<div class="actionpanel_button_links">
<fmt:message key="label.add.primarystorage"/>
<fmt:message key="label.add.primary.storage"/>
</div>
</div>
</div>
@ -177,7 +177,7 @@
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_address">
<fmt:message key="label.vcenter.address"/>:</label>
<fmt:message key="label.vcenter.host"/>:</label>
<input class="text" type="text" name="host_vcenter_address" id="host_vcenter_address" />
<div id="host_vcenter_address_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
@ -205,7 +205,7 @@
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_host">
<fmt:message key="label.vcenter.host"/>:</label>
<fmt:message key="label.esx.host"/>:</label>
<input class="text" type="text" name="host_vcenter_host" id="host_vcenter_host" />
<div id="host_vcenter_host_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>

4
ui/jsp/host.jsp
View File

@ -684,7 +684,7 @@
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_address">
<fmt:message key="label.vcenter.address"/>:</label>
<fmt:message key="label.vcenter.host"/>:</label>
<input class="text" type="text" name="host_vcenter_address" id="host_vcenter_address" />
<div id="host_vcenter_address_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
@ -712,7 +712,7 @@
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_host">
<fmt:message key="label.vcenter.host"/>:</label>
<fmt:message key="label.esx.host"/>:</label>
<input class="text" type="text" name="host_vcenter_host" id="host_vcenter_host" />
<div id="host_vcenter_host_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>

64
ui/jsp/networkoffering.jsp
View File

@ -1,13 +1,9 @@
<%@ page import="java.util.*" %>
<%@ page import="com.cloud.utils.*" %>
<%
Locale browserLocale = request.getLocale();
CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<c:if test="${!empty cookie.lang}">
<fmt:setLocale value="${cookie.lang.value}" />
</c:if>
<fmt:setBundle basename="resources/messages"/>
<div class="main_title" id="right_panel_header">
@ -16,7 +12,7 @@
<img src="images/title_networkoffering.gif" alt="Network Offering" /></div>
<h1>
Network Offering
<fmt:message key="label.network.offering"/>
</h1>
</div>
<div class="contentbox" id="right_panel_content">
@ -26,7 +22,7 @@
</div>
<div class="tabbox" style="margin-top: 15px;">
<div class="content_tabs on">
<%=t.t("details")%></div>
<fmt:message key="label.details"/></div>
</div>
<div id="tab_content_details">
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
@ -34,17 +30,17 @@
<div class="rightpanel_mainloader_animatedicon">
</div>
<p>
Loading &hellip;</p>
<fmt:message key="label.loading"/> &hellip;</p>
</div>
</div>
<div id="tab_container">
<div class="grid_container">
<div class="grid_header">
<div id="grid_header_title" class="grid_header_title">(title)</div>
<div id="action_link" class="grid_actionbox"><p>Actions</p>
<div id="action_link" class="grid_actionbox"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
<li><%=t.t("no.available.actions")%></li>
<li><fmt:message key="label.no.actions"/></li>
</ul>
</div>
</div>
@ -53,13 +49,13 @@
<div class="gridheader_loader" id="Div1">
</div>
<p id="description">
Waiting &hellip;</p>
<fmt:message key="label.waiting"/> &hellip;</p>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("ID")%>:</div>
<fmt:message key="label.id"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
@ -69,7 +65,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("name")%>:</div>
<fmt:message key="label.name"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="name">
@ -81,7 +77,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("display.text")%>:</div>
<fmt:message key="label.display.text"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="displaytext">
@ -94,15 +90,15 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Availability:</div>
<fmt:message key="label.availability"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="availability">
</div>
<select class="select" id="availability_edit" style="width: 202px; display: none;">
<option value="Required">Required</option>
<option value="Optional">Optional</option>
<option value="Unavailable">Unavailable</option>
<option value="Required"><fmt:message key="label.required"/></option>
<option value="Optional"><fmt:message key="label.optional"/></option>
<option value="Unavailable"><fmt:message key="label.unavailable"/></option>
</select>
</div>
</div>
@ -110,7 +106,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Is Default:</div>
<fmt:message key="label.is.default"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="isdefault">
@ -121,7 +117,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Specify VLAN:</div>
<fmt:message key="label.specify.vlan"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="specifyvlan">
@ -132,7 +128,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Network Rate:</div>
<fmt:message key="label.network.rate"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="rate">
@ -143,7 +139,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Traffic Type:</div>
<fmt:message key="label.traffic.type"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="traffictype">
@ -153,8 +149,8 @@
</div>
<div class="grid_botactionpanel">
<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
<div class="gridbot_buttons" id="cancel_button" style="display:none;">Cancel</div>
<div class="gridbot_buttons" id="save_button" style="display:none;"><fmt:message key="label.save"/></div>
<div class="gridbot_buttons" id="cancel_button" style="display:none;"><fmt:message key="label.cancel"/></div>
</div>
</div>
</div>
@ -169,15 +165,15 @@
<ol>
<li>
<select class="select" id="adv_search_availability">
<option value="">by availability</option>
<option value="Required">Required</option>
<option value="Optional">Optional</option>
<option value="Unavailable">Unavailable</option>
<option value=""><fmt:message key="label.by.availability"/></option>
<option value="Required"><fmt:message key="label.required"/></option>
<option value="Optional"><fmt:message key="label.optional"/></option>
<option value="Unavailable"><fmt:message key="label.unavailable"/></option>
</select>
</li>
<li>
<select class="select" id="adv_search_traffictype">
<option value="">by traffic type</option>
<option value=""><fmt:message key="label.by.traffic.type"/></option>
<option value="Public">Public</option>
<option value="Guest">Guest</option>
<option value="Storage">Storage</option>

157
ui/jsp/pod.jsp
View File

@ -1,17 +1,15 @@
<%@ page import="java.util.*" %>
<%@ page import="com.cloud.utils.*" %>
<%
Locale browserLocale = request.getLocale();
CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<c:if test="${!empty cookie.lang}">
<fmt:setLocale value="${cookie.lang.value}" />
</c:if>
<fmt:setBundle basename="resources/messages"/>
<div class="main_title" id="right_panel_header">
<div class="main_titleicon">
<img src="images/title_podicon.gif" /></div>
<h1>
Pod
<fmt:message key="label.pod"/>
</h1>
</div>
<div class="contentbox" id="right_panel_content">
@ -21,9 +19,9 @@
</div>
<div class="tabbox" style="margin-top: 15px;">
<div class="content_tabs on" id="tab_details">
<%=t.t("details")%></div>
<fmt:message key="label.details"/></div>
<div class="content_tabs off" id="tab_ipallocation">
IP Allocation</div>
<fmt:message key="label.ip.allocations"/></div>
</div>
<!-- Details tab (start)-->
@ -33,7 +31,7 @@
<div class="rightpanel_mainloader_animatedicon">
</div>
<p>
Loading &hellip;</p>
<fmt:message key="label.loading"/> &hellip;</p>
</div>
</div>
<div id="tab_container">
@ -41,11 +39,11 @@
<div class="grid_header">
<div id="grid_header_title" class="grid_header_title">
(title)</div>
<div id="action_link" class="grid_actionbox"><p>Actions</p>
<div id="action_link" class="grid_actionbox"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
<li>
<%=t.t("no.available.actions")%></li>
<fmt:message key="label.no.actions"/></li>
</ul>
</div>
</div>
@ -54,13 +52,13 @@
<div class="gridheader_loader" id="icon">
</div>
<p id="description">
Waiting &hellip;</p>
<fmt:message key="label.waiting"/> &hellip;</p>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("ID")%>:</div>
<fmt:message key="label.id"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
@ -70,7 +68,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("name")%>:</div>
<fmt:message key="label.name"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="name">
@ -82,7 +80,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Netmask:</div>
<fmt:message key="label.netmask"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="netmask">
@ -94,7 +92,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("private.ip.range")%>:</div>
<fmt:message key="label.private.ip.range"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ipRange">
@ -108,7 +106,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("gateway")%>:</div>
<fmt:message key="label.gateway"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="gateway">
@ -119,8 +117,8 @@
</div>
</div>
<div class="grid_botactionpanel">
<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
<div class="gridbot_buttons" id="cancel_button" style="display:none;">Cancel</div>
<div class="gridbot_buttons" id="save_button" style="display:none;"><fmt:message key="label.save"/></div>
<div class="gridbot_buttons" id="cancel_button" style="display:none;"><fmt:message key="label.cancel"/></div>
</div>
</div>
</div>
@ -131,7 +129,7 @@
<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
<p><fmt:message key="label.loading"/> &hellip;</p>
</div>
</div>
<div id="tab_container">
@ -148,7 +146,7 @@
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add Cluster" /></div>
<div class="actionpanel_button_links">
Add Cluster
<fmt:message key="label.add.cluster"/>
</div>
</div>
</div>
@ -157,7 +155,7 @@
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add Host" /></div>
<div class="actionpanel_button_links">
Add Host
<fmt:message key="label.add.host"/>
</div>
</div>
</div>
@ -166,7 +164,7 @@
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
<div class="actionpanel_button_links">
Add Primary Storage
<fmt:message key="label.add.primary.storage"/>
</div>
</div>
</div>
@ -175,7 +173,7 @@
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add IP Range" /></div>
<div class="actionpanel_button_links">
Add IP Range
<fmt:message key="label.add.ip.range"/>
</div>
</div>
</div>
@ -187,7 +185,7 @@
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
<div class="grid_actionbox" id="network_action_link"><p>Actions</p>
<div class="grid_actionbox" id="network_action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="network_action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
</ul>
@ -197,7 +195,7 @@
<div class="gridheader_loader" id="icon">
</div>
<p id="description">
Waiting &hellip;
<fmt:message key="label.waiting"/> &hellip;
</p>
</div>
</div>
@ -212,7 +210,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
ID:</div>
<fmt:message key="label.id"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
@ -222,7 +220,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Guest IP Range:</div>
<fmt:message key="label.guest.ip.range"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="iprange">
@ -232,7 +230,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Guest Netmask:</div>
<fmt:message key="label.guest.netmask"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="netmask">
@ -242,7 +240,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Gateway:</div>
<fmt:message key="label.gateway"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="gateway">
@ -252,7 +250,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Pod:</div>
<fmt:message key="label.pod"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="podname">
@ -267,25 +265,14 @@
<!-- Add Host Dialog (begin) -->
<div id="dialog_add_host" title="Add Host" style="display: none">
<p>
Add a host for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name">
</span></b>
<fmt:message key="message.add.host"/>
</p>
<div class="dialog_formcontent">
<form action="#" method="post" id="form_acquire">
<ol>
<!--
<li>
<label for="host_hypervisor">Hypervisor:</label>
<select class="select" id="host_hypervisor">
<option value="XenServer" SELECTED>Xen Server</option>
<option value="KVM">KVM</option>
<option value="VmWare">VMware</option>
</select>
</li>
-->
<li>
<label>
Cluster:</label>
<fmt:message key="label.cluster"/>:</label>
<select class="select" id="cluster_select">
</select>
<div id="cluster_select_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@ -293,56 +280,56 @@
</li>
<li input_group="general">
<label for="host_hostname">
Host name:</label>
<fmt:message key="label.host.name"/>:</label>
<input class="text" type="text" name="host_hostname" id="host_hostname" />
<div id="host_hostname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="general">
<label for="user_name">
User name:</label>
<fmt:message key="label.username"/>:</label>
<input class="text" type="text" name="host_username" id="host_username" />
<div id="host_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="general">
<label for="user_name">
Password:</label>
<fmt:message key="label.password"/>:</label>
<input class="text" type="password" name="host_password" id="host_password" autocomplete="off" />
<div id="host_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_address">
vCenter Address:</label>
<fmt:message key="label.vcenter.host"/>:</label>
<input class="text" type="text" name="host_vcenter_address" id="host_vcenter_address" />
<div id="host_vcenter_address_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_username">
vCenter User:</label>
<fmt:message key="label.vcenter.username"/>:</label>
<input class="text" type="text" name="host_vcenter_username" id="host_vcenter_username" />
<div id="host_vcenter_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_password">
vCenter Password:</label>
<fmt:message key="label.vcenter.password"/>:</label>
<input class="text" type="password" name="host_vcenter_password" id="host_vcenter_password" autocomplete="off" />
<div id="host_vcenter_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_dc">
vCenter Datacenter:</label>
<fmt:message key="label.vcenter.datacenter"/>:</label>
<input class="text" type="text" name="host_vcenter_dc" id="host_vcenter_dc" />
<div id="host_vcenter_dc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" style="display: none;">
<label for="host_vcenter_host">
vCenter Host:</label>
<fmt:message key="label.esx.host"/>:</label>
<input class="text" type="text" name="host_vcenter_host" id="host_vcenter_host" />
<div id="host_vcenter_host_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
@ -355,7 +342,7 @@
<div class="ui_dialog_loader">
</div>
<p>
Adding....</p>
<fmt:message key="label.adding"/>....</p>
</div>
<!--Confirmation msg box-->
<!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error. -->
@ -371,14 +358,13 @@
<!-- Add Hypervisor managed cluster Dialog (begin) -->
<div id="dialog_add_external_cluster" title="Add Cluster" style="display: none">
<p>
Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name">
</span></b>
<fmt:message key="message.add.cluster"/>
</p>
<div class="dialog_formcontent">
<form action="#" method="post" id="form_acquire">
<ol>
<li>
<label for="cluster_hypervisor">Hypervisor:</label>
<label for="cluster_hypervisor"><fmt:message key="label.hypervisor"/>:</label>
<select class="select" id="cluster_hypervisor">
<option value="XenServer" SELECTED>Xen Server</option>
<option value="KVM">KVM</option>
@ -387,38 +373,38 @@
</li>
<li input_group="vmware">
<label>
Cluster Type:</label>
<fmt:message key="label.cluster.type"/>:</label>
<select class="select" id="type_dropdown">
<option value="CloudManaged">Cloud.com Managed</option>
<option value="ExternalManaged" SELECTED>vSphere Managed</option>
<option value="CloudManaged"><fmt:message key="label.cloud.managed"/></option>
<option value="ExternalManaged" SELECTED><fmt:message key="label.vsphere.managed"/></option>
</select>
<div id="pod_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" input_sub_group="external">
<label for="cluster_hostname">
vCenter Server:</label>
<fmt:message key="label.vcenter.host"/>:</label>
<input class="text" type="text" name="cluster_hostname" id="cluster_hostname" />
<div id="cluster_hostname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" input_sub_group="external">
<label for="cluster_username">
vCenter User:</label>
<fmt:message key="label.vcenter.username"/>:</label>
<input class="text" type="text" name="cluster_username" id="cluster_username" />
<div id="cluster_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" input_sub_group="external">
<label for="cluster_password">
Password:</label>
<fmt:message key="label.vcenter.password"/>:</label>
<input class="text" type="password" name="cluster_password" id="cluster_password" autocomplete="off" />
<div id="cluster_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmware" input_sub_group="external">
<label for="cluster_datacenter">
vCenter Datacenter:</label>
<fmt:message key="label.vcenter.datacenter"/>:</label>
<input class="text" type="text" name="cluster_datacenter" id="cluster_datacenter" />
<div id="cluster_datacenter_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
@ -426,7 +412,7 @@
<li>
<label for="cluster_name" id="cluster_name_label">
vCenter Cluster:</label>
<fmt:message key="label.vcenter.cluster"/>:</label>
<input class="text" type="text" name="cluster_name" id="cluster_name" />
<div id="cluster_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
@ -439,7 +425,7 @@
<div class="ui_dialog_loader">
</div>
<p>
Adding....</p>
<fmt:message key="label.adding"/>....</p>
</div>
<!--Confirmation msg box-->
<!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error. -->
@ -455,15 +441,14 @@
<!-- Add Primary Storage Dialog (begin) -->
<div id="dialog_add_pool" title="Add Primary Storage" style="display: none">
<p>
Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span
id="pod_name"></span></b>
<fmt:message key="message.add.primary.storage"/>
</p>
<div class="dialog_formcontent">
<form action="#" method="post" id="form_acquire">
<ol>
<li id="pool_cluster_container">
<label for="pool_cluster">
Cluster:</label>
<fmt:message key="label.cluster"/>:</label>
<select class="select" id="pool_cluster">
</select>
<div id="pool_cluster_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@ -471,14 +456,14 @@
</li>
<li>
<label for="user_name">
Name:</label>
<fmt:message key="label.name"/>:</label>
<input class="text" type="text" name="add_pool_name" id="add_pool_name" />
<div id="add_pool_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li>
<label for="add_pool_protocol">
Protocol:</label>
<fmt:message key="label.protocol"/>:</label>
<select class="select" id="add_pool_protocol">
<option value="nfs">NFS</option>
<option value="iscsi">ISCSI</option>
@ -487,49 +472,49 @@
</li>
<li id="add_pool_server_container">
<label for="add_pool_nfs_server" >
Server:</label>
<fmt:message key="label.server"/>:</label>
<input class="text" type="text" name="add_pool_nfs_server" id="add_pool_nfs_server" />
<div id="add_pool_nfs_server_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li id="add_pool_path_container" input_group="nfs">
<label for="add_pool_path">
Path:</label>
<fmt:message key="label.path"/>:</label>
<input class="text" type="text" name="add_pool_path" id="add_pool_path" />
<div id="add_pool_path_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li id="add_pool_iqn_container" style="display: none" input_group="iscsi">
<label for="add_pool_iqn">
Target IQN:</label>
<fmt:message key="label.target.iqn"/>:</label>
<input class="text" type="text" name="add_pool_iqn" id="add_pool_iqn" />
<div id="add_pool_iqn_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li id="add_pool_lun_container" style="display: none" input_group="iscsi">
<label for="add_pool_lun">
LUN #:</label>
<fmt:message key="label.lun"/> #:</label>
<input class="text" type="text" name="add_pool_lun" id="add_pool_lun" />
<div id="add_pool_lun_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmfs">
<label for="add_pool_vmfs_dc">
vCenter Datacenter:</label>
<fmt:message key="label.vcenter.datacenter"/>:</label>
<input class="text" type="text" name="add_pool_vmfs_dc" id="add_pool_vmfs_dc" />
<div id="add_pool_vmfs_dc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li input_group="vmfs">
<label for="add_pool_vmfs_ds">
vCenter Datastore:</label>
<fmt:message key="label.vcenter.datastore"/>:</label>
<input class="text" type="text" name="add_pool_vmfs_ds" id="add_pool_vmfs_ds" />
<div id="add_pool_vmfs_ds_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li id="add_pool_tags_container">
<label for="add_pool_tags">
Tags:</label>
<fmt:message key="label.tags"/>:</label>
<input class="text" type="text" id="add_pool_tags" />
<div id="add_pool_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
@ -542,7 +527,7 @@
<div class="ui_dialog_loader">
</div>
<p>
Adding....</p>
<fmt:message key="label.adding"/>....</p>
</div>
<!--Confirmation msg box-->
<!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error. -->
@ -557,25 +542,25 @@
<!-- Add IP Range to pod (begin) -->
<div id="dialog_add_iprange_to_pod" title="Add IP Range to Pod" style="display:none">
<p>Add an IP range to pod: <b><span id="pod_name_label"></span></b></p>
<fmt:message key="message.add.iprange.to.pod"/>
<div class="dialog_formcontent">
<form action="#" method="post" id="form5">
<ol>
<li>
<label>Guest IP Range:</label>
<label><fmt:message key="label.guest.ip.range"/>:</label>
<input class="text" style="width:67px" type="text" id="startip"/><span>-</span>
<input class="text" style="width:67px" type="text" id="endip"/>
<div id="startip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
<div id="endip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label for="netmask">Guest Netmask:</label>
<label for="netmask"><fmt:message key="label.guest.netmask"/>:</label>
<input class="text" type="text" id="netmask"/>
<div id="netmask_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label>Guest Gateway:</label>
<label><fmt:message key="label.guest.gateway"/>:</label>
<input class="text" type="text" id="guestgateway"/>
<div id="guestgateway_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
@ -588,7 +573,7 @@
<div class="ui_dialog_loader">
</div>
<p>
Adding....</p>
<fmt:message key="label.adding"/>....</p>
</div>
<!--Confirmation msg box-->
<!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error. -->