bug 4556: localized string replacement for dashboard.jsp, diskoffering.jsp, domain.jsp, event.jsp, globalsetting.jsp

This commit is contained in:
will 2011-01-21 17:25:01 -08:00
parent 28f6a5ddf7
commit e56accb970
7 changed files with 212 additions and 184 deletions

View File

@ -58,6 +58,7 @@ label.first.name=First Name
label.last.name=Last Name
label.timezone=Timezone
label.instance.limits=Instance Limits
label.instance=Instance
label.ip.limits=Public IP Limits
label.volume.limits=Volume Limits
label.snapshot.limits=Snapshot Limits
@ -67,7 +68,7 @@ label.sent=Sent
label.user=User
label.domain.admin=Domain Admin
label.admin=Admin
label.by.role=by role
label.by.role=By Role
label.type=Type
label.type.id=Type ID
label.description=Description
@ -89,6 +90,58 @@ label.path=Path
label.target.iqn=Target IQN
label.lun=LUN
label.tags=Tags
label.system.capacity=System Wide Capacity
label.public.ips=Public IP Addresses
label.allocated=Allocated
label.private.ips=Private IP Addresses
label.memory.allocated=Memory Allocated
label.cpu.allocated=CPU Allocated
label.primary.allocated=Primary Storage Allocated
label.used=Used
label.primary.used=Primary Storage Used
label.secondary.used=Secondary Storage Used
label.general.alerts=General Alerts
label.no.alerts=No Recent Alerts
label.host.alerts=Host Alerts
label.disk.volume=Disk Volume
label.snapshots=Snapshots
label.accounts=Accounts
label.recent.errors=Recent Errors
label.no.errors=No Recent Errors
label.resources=Resources
label.running.vms=Running VMs
label.stopped.vms=Stopped VMs
label.total.vms=Total VMs
label.available.public.ips=Available Public IP Addresses
label.owned.public.ips=Owned Public IP Addresses
label.my.account=My Account
label.account.id=Account ID
label.account=Account
label.display.text=Display Text
label.disk.size=Disk Size
label.add.disk.offering=Add Disk Offering
label.custom.disk.size=Custom Disk Size
label.no=No
label.yes=Yes
label.public=Public
label.admin.accounts=Admin Accounts
label.resource.limits=Resource Limits
label.instances=Instances
label.add.domain=Add Domain
label.parent.domain=Parent Domain
label.volumes=Volumes
label.initiated.by=Initiated By
label.owner.account=Owner Account
label.level=Level
label.date=Date
label.by.type=By Type
label.by.level=By Level
label.info=Info
label.warn=Warn
label.error=Error
label.value=Value
label.edit=Edit
label.lang.english=English
label.lang.chinese=Chinese
@ -149,6 +202,8 @@ message.new.user=Specify the following to add a new user to the account
message.edit.confirm=Please confirm your changes before clicking 'Save'
message.add.host=Please specify the following parameters to add a new host
message.add.primary=Please specify the following parameters to add a new primary storage
message.add.disk.offering=Please specify the following parameters to add a new disk offering
message.restart.mgmt.server=Please restart your management server(s) for your new settings to take effect.
#Errors
error.login=Your username/password does not match our records.

View File

@ -532,7 +532,7 @@
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<span id="label">
<fmt:message key="label.menu.my.accounts"/>
<fmt:message key="label.menu.all.accounts"/>
</span>
</div>
</div>

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_dashboardicon.gif"/></div>
<h1>
Dashboard
<fmt:message key="label.menu.dashboard"/>
</h1>
</div>
@ -22,23 +20,23 @@
<div class="rightpanel_mainloader_animatedicon">
</div>
<p>
Loading &hellip;
<fmt:message key="label.loading"/> &hellip;
</p>
</div>
<div class="grid_container" id="system_wide_capacity_container">
<div class="grid_header">
<div class="grid_header_cell" style="width: 40%; border: none;">
<div class="grid_header_title">
System Wide Capacity</div>
<fmt:message key="label.system.capacity"/></div>
</div>
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_formbox">
<label for="zone" class="label">
Zone:</label>
<fmt:message key="label.zone"/>:</label>
<select id="capacity_zone_select" class="select" style="width: 110px;">
</select>
<label for="pod" class="label">
Pod:</label>
<fmt:message key="label.pod"/>:</label>
<select id="capacity_pod_select" class="select" style="width: 110px;">
</select>
</div>
@ -48,10 +46,10 @@
<div class="dbrow_cell" style="width: 35%;">
<div class="dbgraph_titlebox">
<h2>
Public IP Addresses</h2>
<fmt:message key="label.public.ips"/></h2>
<div class="dbgraph_title_usedbox">
<p>
Allocated: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
<fmt:message key="label.allocated"/>: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
</p>
</div>
</div>
@ -69,10 +67,10 @@
<div class="dbrow_cell" style="width: 35%;">
<div class="dbgraph_titlebox">
<h2>
Private IP Addresses</h2>
<fmt:message key="label.private.ips"/></h2>
<div class="dbgraph_title_usedbox">
<p>
Allocated: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
<fmt:message key="label.allocated"/>: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
</p>
</div>
</div>
@ -90,10 +88,10 @@
<div class="dbrow_cell" style="width: 35%;">
<div class="dbgraph_titlebox">
<h2>
Memory Allocated</h2>
<fmt:message key="label.memory.allocated"/></h2>
<div class="dbgraph_title_usedbox">
<p>
Allocated: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
<fmt:message key="label.allocated"/>: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
</p>
</div>
</div>
@ -111,10 +109,10 @@
<div class="dbrow_cell" style="width: 35%;">
<div class="dbgraph_titlebox">
<h2>
CPU Allocated</h2>
<fmt:message key="label.cpu.allocated"/></h2>
<div class="dbgraph_title_usedbox">
<p>
Allocated: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
<fmt:message key="label.allocated"/>: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
</p>
</div>
</div>
@ -132,10 +130,10 @@
<div class="dbrow_cell" style="width: 35%;">
<div class="dbgraph_titlebox">
<h2>
Primary Storage Allocated</h2>
<fmt:message key="label.primary.allocated"/></h2>
<div class="dbgraph_title_usedbox">
<p>
Allocated: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
<fmt:message key="label.allocated"/>: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
</p>
</div>
</div>
@ -153,10 +151,10 @@
<div class="dbrow_cell" style="width: 35%;">
<div class="dbgraph_titlebox">
<h2>
Primary Storage Used</h2>
<fmt:message key="label.primary.used"/></h2>
<div class="dbgraph_title_usedbox">
<p>
Used: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
<fmt:message key="label.used"/>: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
</p>
</div>
</div>
@ -174,10 +172,10 @@
<div class="dbrow_cell" style="width: 35%;">
<div class="dbgraph_titlebox">
<h2>
Secondary Storage Used</h2>
<fmt:message key="label.secondary.used"/></h2>
<div class="dbgraph_title_usedbox">
<p>
Used: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
<fmt:message key="label.used"/>: <span id="capacityused">N</span>/<span id="capacitytotal">A</span>
</p>
</div>
</div>
@ -197,7 +195,7 @@
<div class="grid_header">
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_title">
General Alerts</div>
<fmt:message key="label.general.alerts"/></div>
</div>
<div class="grid_header_cell" style="width: 40%; border: none;">
<div class="grid_header_formbox">
@ -208,7 +206,7 @@
</div>
<div id="alert_grid_content">
<div style="height: 310px; text-align: center;">
<i>No Recent Alerts</i>
<i><fmt:message key="label.no.alerts"/></i>
</div>
</div>
</div>
@ -217,7 +215,7 @@
<div class="grid_header">
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_title">
Hosts Alerts</div>
<fmt:message key="label.host.alerts"/></div>
</div>
<div class="grid_header_cell" style="width: 40%; border: none;">
<div class="grid_header_formbox">
@ -230,7 +228,7 @@
</div>
<div id="host_alert_grid_content">
<div style="height: 310px; text-align: center;">
<i>No Recent Alerts</i>
<i><fmt:message key="label.no.alerts"/></i>
</div>
</div>
</div>
@ -244,7 +242,7 @@
<div class="rightpanel_mainloader_animatedicon">
</div>
<p>
Loading &hellip;
<fmt:message key="label.loading"/> &hellip;
</p>
</div>
<div class="grid_container" style="width: 49%; border: none;">
@ -254,7 +252,7 @@
<div class="domain_dbicons">
<img src="images/instance_dbdomain.png" /></div>
<h2>
Instance</h2>
<fmt:message key="label.instance"/></h2>
</div>
</div>
<div class="dbrow_cell" style="width: 25%; border: none; background: #cacaca repeat top left;">
@ -270,7 +268,7 @@
<div class="domain_dbicons">
<img src="images/diskvolume_dbdomain.png" /></div>
<h2>
Disk Volume</h2>
<fmt:message key="label.disk.volume"/></h2>
</div>
</div>
<div class="dbrow_cell" style="width: 25%; border: none; background: #cacaca repeat top left;">
@ -286,7 +284,7 @@
<div class="domain_dbicons">
<img src="images/snapshots_dbdomain.png" /></div>
<h2>
Snapshots</h2>
<fmt:message key="label.snapshots"/></h2>
</div>
</div>
<div class="dbrow_cell" style="width: 25%; border: none; background: #cacaca repeat top left;">
@ -302,7 +300,7 @@
<div class="domain_dbicons">
<img src="images/users_dbdomain.png" /></div>
<h2>
Accounts</h2>
<fmt:message key="label.accounts"/></h2>
</div>
</div>
<div class="dbrow_cell" style="width: 25%; border: none; background: #cacaca repeat top left;">
@ -319,14 +317,14 @@
<div class="grid_header">
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_title">
Recent Errors</div>
<fmt:message key="label.recent.errors"/></div>
</div>
<div class="grid_header_cell" style="width: 40%; border: none;">
</div>
</div>
<div id="alert_grid_content">
<div style="height: 310px; text-align: center;">
<i>No Recent Alerts</i>
<i><fmt:message key="label.no.errors"/></i>
</div>
</div>
</div>
@ -341,7 +339,7 @@
<div class="grid_header">
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_title">
Resources</div>
<fmt:message key="label.resources"/></div>
</div>
</div>
<div class="grid_rows" style="padding: 0; border: none;">
@ -355,7 +353,7 @@
</div>
<div class="db_resourcebox_textbox">
<p>
Running VMs:</div>
<fmt:message key="label.running.vms"/>:</div>
</div>
<div class="db_resourcebox_bot">
<div class="db_resourcebox_VMnumber running">
@ -373,7 +371,7 @@
</div>
<div class="db_resourcebox_textbox">
<p>
Stopped VMs:</div>
<fmt:message key="label.stopped.vms"/>:</div>
</div>
<div class="db_resourcebox_bot">
<div class="db_resourcebox_VMnumber stopped">
@ -391,7 +389,7 @@
</div>
<div class="db_resourcebox_textbox">
<p>
Total VMs:</div>
<fmt:message key="label.total.vms"/>:</div>
</div>
<div class="db_resourcebox_bot">
<div class="db_resourcebox_VMnumber total">
@ -406,13 +404,13 @@
<div class="grid_header">
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_title">
Public IPs</div>
<fmt:message key="label.public.ips"/></div>
</div>
</div>
<div class="grid_rows even" style="width: 50%;">
<div class="grid_row_cell" style="width: 40%; border: none;">
<div class="row_celltitles">
Available Public IPs:
<fmt:message key="label.available.public.ips"/>:
</div>
</div>
<div class="grid_row_cell" style="width: 59%; border: none;">
@ -424,7 +422,7 @@
<div class="grid_rows odd" style="width: 50%;">
<div class="grid_row_cell" style="width: 40%; border: none;">
<div class="row_celltitles">
Owned Public IPs:
<fmt:message key="label.owned.public.ips"/>:
</div>
</div>
<div class="grid_row_cell" style="width: 59%; border: none;">
@ -439,14 +437,14 @@
<div class="grid_header">
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_title">
Recent Errors</div>
<fmt:message key="label.recent.errors"/></div>
</div>
<div class="grid_header_cell" style="width: 40%; border: none;">
</div>
</div>
<div id="alert_grid_content">
<div style="height: 310px; text-align: center;">
<i>No Recent Alerts</i>
<i><fmt:message key="label.no.errors"/></i>
</div>
</div>
</div>
@ -459,13 +457,13 @@
</div>
<div class="grid_header_cell" style="width: 60%; border: none;">
<div class="grid_header_title" style="color: #FFF;">
My Account</div>
<fmt:message key="label.my.account"/></div>
</div>
</div>
<div class="dbaccounts_rows">
<div class="grid_row_cell" style="width: 30%;">
<div class="row_celltitles">
Account ID</div>
<fmt:message key="label.account.id"/></div>
</div>
<div class="grid_row_cell" style="width: 60%; border: none;">
<div class="row_celltitles">
@ -476,7 +474,7 @@
<div class="dbaccounts_rows">
<div class="grid_row_cell" style="width: 30%;">
<div class="row_celltitles">
Account</div>
<fmt:message key="label.account"/></div>
</div>
<div class="grid_row_cell" style="width: 60%; border: none;">
<div class="row_celltitles">
@ -487,7 +485,7 @@
<div class="dbaccounts_rows">
<div class="grid_row_cell" style="width: 30%;">
<div class="row_celltitles">
Type</div>
<fmt:message key="label.type"/></div>
</div>
<div class="grid_row_cell" style="width: 60%; border: none;">
<div class="row_celltitles">
@ -498,7 +496,7 @@
<div class="dbaccounts_rows">
<div class="grid_row_cell" style="width: 30%;">
<div class="row_celltitles">
Domain</div>
<fmt:message key="label.domain"/></div>
</div>
<div class="grid_row_cell" style="width: 60%; border: none;">
<div class="row_celltitles">

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">
@ -15,7 +11,7 @@
<img src="images/title_diskofferingicon.gif" /></div>
<h1>
Disk Offering
<fmt:message key="label.menu.disk.offerings"/>
</h1>
</div>
<div class="contentbox" id="right_panel_content">
@ -25,7 +21,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;">
@ -33,7 +29,7 @@
<div class="rightpanel_mainloader_animatedicon">
</div>
<p>
Loading &hellip;</p>
<fmt:message key="label.loading"/> &hellip;</p>
</div>
</div>
<div id="tab_container">
@ -43,7 +39,7 @@
<div id="action_link" class="grid_actionbox"><p>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>
@ -52,13 +48,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">
@ -68,7 +64,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">
@ -80,7 +76,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">
@ -92,7 +88,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("disk.size")%>:</div>
<fmt:message key="label.disk.size"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="disksize">
@ -102,7 +98,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("tags")%>:</div>
<fmt:message key="label.tags"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="tags">
@ -114,7 +110,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("domain")%>:</div>
<fmt:message key="label.domain"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="domain">
@ -123,18 +119,6 @@
</select>
</div>
</div>
<!--
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("customizable.during.VM.creation")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="isCustomized">
</div>
</div>
</div>
-->
</div>
<div class="grid_botactionpanel">
<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
@ -151,7 +135,7 @@
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add Disk Offering" /></div>
<div class="actionpanel_button_links">
Add Disk Offering
<fmt:message key="label.add.disk.offering"/>:</div>
</div>
</div>
</div>
@ -160,7 +144,7 @@
<!-- Add Disk Offering Dialog -->
<div id="dialog_add_disk" title="Add Disk Offering" style="display:none">
<p>Please fill in the following data to add a new disk Offering.</p>
<p><fmt:message key="message.add.disk.offering"/></p>
<div class="dialog_formcontent">
<form action="#" method="post" id="form1">
<ol>
@ -175,10 +159,10 @@
<div id="add_disk_description_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label>Custom disk size?:</label>
<label><fmt:message key="label.custom.disk.size"/>?:</label>
<select class="select" id="customized">
<option value="false">No</option>
<option value="true">Yes</option>
<option value="false"><fmt:message key="label.no"/></option>
<option value="true"><fmt:message key="label.yes"/></option>
</select>
</li>
<li id="add_disk_disksize_container">
@ -188,22 +172,22 @@
</li>
<li id="add_disk_tags_container">
<label for="add_disk_tags">
Tags:</label>
<fmt:message key="label.tags"/>:</label>
<input class="text" type="text" id="add_disk_tags" />
<div id="add_disk_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li>
<label>
Public?:</label>
<fmt:message key="label.public"/>?:</label>
<select class="select" id="public_dropdown">
<option value="true">Yes</option>
<option value="false">No</option>
<option value="true"><fmt:message key="label.yes"/></option>
<option value="false"><fmt:message key="label.no"/></option>
</select>
</li>
<li id="domain_dropdown_container" style="display: none">
<label>
Domain:</label>
<fmt:message key="label.domain"/>:</label>
<select class="select" id="domain_dropdown">
</select>
</li>

View File

@ -1,12 +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"/>
<!-- domain detail panel (begin) -->
<div class="main_title" id="right_panel_header">
@ -15,7 +12,7 @@
<img src="images/title_domainicon.gif" /></div>
<h1>
Domain
<fmt:message key="label.menu.domains"/>
</h1>
</div>
<div class="contentbox" id="right_panel_content">
@ -25,18 +22,18 @@
</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_admin_account">
<%=t.t("Admin.Accounts")%></div>
<fmt:message key="label.admin.accounts"/></div>
<div class="content_tabs off" id="tab_resource_limits">
<%=t.t("Resource.Limits")%></div>
<fmt:message key="label.resource.limits"/></div>
</div>
<!-- Details tab (start)-->
<div id="tab_content_details">
<div 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 class="grid_container">
@ -45,7 +42,7 @@
<div id="action_link" class="grid_actionbox"><p>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>
@ -54,14 +51,14 @@
<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">
@ -71,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">
@ -83,7 +80,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Accounts")%>:</div>
<fmt:message key="label.accounts"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="redirect_to_account_page">
@ -93,7 +90,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Instances")%>:</div>
<fmt:message key="label.instances"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="redirect_to_instance_page">
@ -103,7 +100,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Volume")%>:</div>
<fmt:message key="label.volumes"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="redirect_to_volume_page">
@ -123,7 +120,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">
@ -136,7 +133,7 @@
<div 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 class="grid_container">
@ -146,7 +143,7 @@
<div id="action_link" class="grid_actionbox"><p>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>
@ -155,14 +152,14 @@
<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("Instance.Limit")%>:</div>
<fmt:message key="label.instance.limits"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="limits_vm">
@ -174,7 +171,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Public.IP.Limit")%>:</div>
<fmt:message key="label.ip.limits"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="limits_ip">
@ -186,7 +183,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Disk.Volume.Limit")%>:</div>
<fmt:message key="label.volume.limits"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="limits_volume">
@ -198,7 +195,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Snapshot.Limit")%>:</div>
<fmt:message key="label.snapshot.limits"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="limits_snapshot">
@ -210,7 +207,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Template.Limit")%>:</div>
<fmt:message key="label.template.limits"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="limits_template">
@ -236,7 +233,7 @@
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add Domain" /></div>
<div class="actionpanel_button_links">
Add Domain
<fmt:message key="label.add.domain"/>
</div>
</div>
</div>
@ -253,7 +250,7 @@
<div class="grid_rows even">
<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">
@ -263,7 +260,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Role")%>:</div>
<fmt:message key="label.role"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="role">
@ -273,7 +270,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Account")%>:</div>
<fmt:message key="label.account"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="account">
@ -283,7 +280,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Domain")%>:</div>
<fmt:message key="label.domain"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="domain">
@ -293,7 +290,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("VMs")%>:</div>
<fmt:message key="label.vms"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="vm_total">
@ -303,7 +300,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("IPs")%>:</div>
<fmt:message key="label.ips"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ip_total">
@ -313,7 +310,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Bytes.Received")%>:</div>
<fmt:message key="label.bytes.received"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="bytes_received">
@ -323,7 +320,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Bytes.Sent")%>:</div>
<fmt:message key="label.bytes.sent"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="bytes_sent">
@ -333,7 +330,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("State")%>:</div>
<fmt:message key="label.state"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="state">
@ -350,12 +347,12 @@
<form action="#" method="post" id="form1">
<ol>
<li>
<label>Name:</label>
<label><fmt:message key="label.name"/>:</label>
<input class="text" type="text" id="add_domain_name"/>
<div id="add_domain_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label>Parent domain:</label>
<label><fmt:message key="label.parent.domain"/>:</label>
<select class="select" id="domain_dropdown">
</select>
</li>

View File

@ -1,11 +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"/>
<!-- event detail panel (begin) -->
<div class="main_title" id="right_panel_header">
@ -13,7 +11,7 @@
<div class="main_titleicon">
<img src="images/title_eventsicon.gif"/></div>
<h1>Event
<h1> <fmt:message key="label.menu.events"/>
</h1>
</div>
<div class="contentbox" id="right_panel_content">
@ -23,7 +21,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;">
@ -31,7 +29,7 @@
<div class="rightpanel_mainloader_animatedicon">
</div>
<p>
Loading &hellip;</p>
<fmt:message key="label.loading"/> &hellip;</p>
</div>
</div>
<div id="tab_container">
@ -39,7 +37,7 @@
<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">
@ -49,7 +47,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Initiated.By")%>:</div>
<fmt:message key="label.initiated.by"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="username">
@ -59,7 +57,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Owner.Account")%>:</div>
<fmt:message key="label.owner.account"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="account">
@ -69,7 +67,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Type")%>:</div>
<fmt:message key="label.type"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="type">
@ -79,7 +77,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Level")%>:</div>
<fmt:message key="label.level"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="level">
@ -89,7 +87,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Description")%>:</div>
<fmt:message key="label.description"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="description">
@ -99,7 +97,7 @@
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("State")%>:</div>
<fmt:message key="label.state"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="state">
@ -109,7 +107,7 @@
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Date")%>:</div>
<fmt:message key="label.date"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="created">
@ -130,7 +128,7 @@
<ol>
<li>
<select class="select" id="adv_search_type">
<option value="">by type</option>
<option value=""><fmt:message key="label.by.type"/></option>
<option value="VM.CREATE">VM.CREATE</option>
<option value="VM.DESTROY">VM.DESTROY</option>
<option value="VM.START">VM.START</option>
@ -207,10 +205,10 @@
</li>
<li>
<select class="select" id="adv_search_level">
<option value="">by level</option>
<option value="INFO">INFO</option>
<option value="WARN">WARN</option>
<option value="ERROR">ERROR</option>
<option value=""><fmt:message key="label.by.level"/></option>
<option value="INFO"><fmt:message key="label.info"/></option>
<option value="WARN"><fmt:message key="label.warn"/></option>
<option value="ERROR"><fmt:message key="label.error"/></option>
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">

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">
@ -15,7 +11,7 @@
<img src="images/title_globalsettingsicon.gif" /></div>
<h1>
Global Settings
<fmt:message key="label.menu.global.settings"/>
</h1>
</div>
<div class="contentbox" id="right_panel_content">
@ -25,7 +21,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;">
@ -33,27 +29,27 @@
<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 class="grid_header_cell" style="width:35%; border:none;">
<div class="grid_header_title">Name</div>
<div class="grid_header_title"><fmt:message key="label.name"/></div>
</div>
<div class="grid_header_cell" style="width:23%; border:none;">
<div class="grid_header_title">Value</div>
<div class="grid_header_title"><fmt:message key="label.value"/></div>
</div>
<div class="grid_header_cell" style="width:27%; border:none;">
<div class="grid_header_title">Description</div>
<div class="grid_header_title"><fmt:message key="label.description"/></div>
</div>
<div class="grid_header_cell" style="width:15%; border:none;">
<div id="action_link" class="grid_actionbox"><p>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 id="edit_button">Edit</a></li>
<li><fmt:message key="label.no.actions"/></li>
<li id="edit_button"><fmt:message key="label.edit"/></a></li>
</ul>
</div>
</div>
@ -64,8 +60,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>
@ -118,6 +114,6 @@
<div id="dialog_alert_restart_management_server" title="Alert" style="display:none">
<p>
<%=t.t("please.restart.your.management.server.for.your.new.settings.to.take.effect")%>
<fmt:message key="message.restart.mgmt.server"/>
</p>
</div>