Skip to content

O
Openfire
Commit e0d20302 authored by Bill Lynch's avatar Bill Lynch Committed by bill
Browse files
Options

Refactored page to allow user to chooose language before continuing. 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1082 b35dd754-fafc-0310-a699-88a17e54d16e
parent 365d7303
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 108 deletions
src/web/setup-index.jsp
View file @ e0d20302
...@@ -24,18 +24,30 @@ ...@@ -24,18 +24,30 @@
<%@ include file="setup-env-check.jspf" %> <%@ include file="setup-env-check.jspf" %>
<% // Get parameters <% // Get parameters
// Handle a continue: String localeCode = ParamUtils.getParameter(request,"localeCode");
if (request.getParameter("continue") != null) { boolean save = request.getParameter("save") != null;
// update the sidebar status
session.setAttribute("jive.setup.sidebar.1","done");
session.setAttribute("jive.setup.sidebar.2","in_progress");
// redirect
response.sendRedirect("setup-host-settings.jsp");
return;
}
Map errors = new HashMap(); Map errors = new HashMap();
if (save) {
Locale newLocale = null;
if (localeCode != null) {
newLocale = LocaleUtils.localeCodeToLocale(localeCode.trim());
if (newLocale == null) {
errors.put("localeCode","");
}
else {
JiveGlobals.setLocale(newLocale);
// update the sidebar status
session.setAttribute("jive.setup.sidebar.1","done");
session.setAttribute("jive.setup.sidebar.2","in_progress");
// redirect
response.sendRedirect("setup-host-settings.jsp");
return;
}
}
}
// Error checking // Error checking
Map messengerHomeErrors = new HashMap(); Map messengerHomeErrors = new HashMap();
// Get a handle on the messengerHome directory // Get a handle on the messengerHome directory
...@@ -52,6 +64,8 @@ ...@@ -52,6 +64,8 @@
messengerHomeErrors.put("write","write"); messengerHomeErrors.put("write","write");
} }
} }
Locale locale = JiveGlobals.getLocale();
%> %>
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
...@@ -74,112 +88,62 @@ ...@@ -74,112 +88,62 @@
<% } %> <% } %>
<table cellpadding="3" cellspacing="2" border="0" width="100%"> <br/>
<tr>
<th width="98%">&nbsp;</th>
<th width="1%" nowrap class="jive-setup-checklist-box"><fmt:message key="setup.index.success" /> </th>
<th width="1%" nowrap class="jive-setup-checklist-box"><fmt:message key="setup.index.error" /></th>
</tr>
<tr>
<td colspan="3" class="jive-setup-category-header">
<fmt:message key="setup.index.vm" />
</td>
</tr>
<tr>
<td class="jive-setup-category">
<fmt:message key="setup.index.jdk" />
<br>
<span class="jive-info">
<fmt:message key="setup.index.found" /> <%= System.getProperty("java.version") %> - <%= System.getProperty("java.vendor") %>
</span>
</td>
<td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
<td align="center" class="jive-setup-checklist-box"><img src="images/blank.gif" width="13" height="13" border="0"></td>
</tr>
<tr>
<td colspan="3" class="jive-setup-category-header">
<fmt:message key="title" /> <fmt:message key="setup.index.class" />
</td>
</tr>
<tr>
<td class="jive-setup-category">
messenger.jar
<br>
<span class="jive-info">
<fmt:message key="title" /> <fmt:message key="setup.index.class" />.
</span>
</td>
<td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
<td align="center" class="jive-setup-checklist-box"><img src="images/blank.gif" width="13" height="13" border="0"></td>
</tr>
<tr>
<td colspan="3" class="jive-setup-category-header">
<fmt:message key="title" /> <fmt:message key="setup.index.con_file" />
</td>
</tr>
<tr>
<td class="jive-setup-category">
<fmt:message key="setup.index.dir" />
<br>
<span class="jive-info">
<% boolean messengerHomeOK = true;
if (messengerHomeErrors.size() == 0) {
%>
<fmt:message key="setup.index.valid_conf" />
<% } else {
messengerHomeOK = false;
%>
<% if (messengerHomeErrors.get("exists") != null) { %>
<fmt:message key="setup.index.unable_locate_dir" />
<% } else if (messengerHomeErrors.get("read") != null) { %>
<fmt:message key="setup.index.not_permission" />
<% } else if (messengerHomeErrors.get("write") != null) { %>
<fmt:message key="setup.index.not_write_permission" />
<% } %>
<% } %>
</span>
</td>
<% if (messengerHomeOK) { %>
<td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
<td align="center" class="jive-setup-checklist-box"><img src="images/blank.gif" width="13" height="13" border="0"></td>
<% } else { %>
<td align="center" class="jive-setup-checklist-box"><img src="images/blank.gif" width="13" height="13" border="0"></td>
<td align="center" class="jive-setup-checklist-box"><img src="images/x.gif" width="13" height="13" border="0"></td>
<% } %>
</tr>
</table>
<br><br> <b>System Summary</b>
<hr size="0"> <ul>
JDK: <%= System.getProperty("java.version") %> - <%= System.getProperty("java.vendor") %>,
Appserver: <%= application.getServerInfo() %>.
</ul>
<form action="setup-index.jsp"> <br/>
<div align="right">
<% if (!messengerHomeOK) { %>
<input type="submit" value=" Continue " disabled onclick="return false;"> <form action="setup-index.jsp" name="sform">
<% } else { %> <b>Choose Language</b>
<input type="submit" name="continue" value=" Continue "> <% boolean usingPreset = false;
Locale[] locales = Locale.getAvailableLocales();
for (int i=0; i<locales.length; i++) {
usingPreset = locales[i].equals(locale);
if (usingPreset) { break; }
}
%>
<% } %> <ul>
<table cellpadding="4" cellspacing="0" border="0">
<tbody>
<tr>
<td>
<input type="radio" name="localeCode" value="en" <%= ("en".equals(locale.toString()) ? "checked" : "") %>
id="loc01" />
</td>
<td colspan="2">
<label for="loc01">English (en)</label>
</td>
</tr>
<tr>
<td>
<input type="radio" name="localeCode" value="zh_CN" <%= ("zh_CN".equals(locale.toString()) ? "checked" : "") %>
id="loc02" />
</td>
<td>
<a href="#" onclick="document.sform.localeCode[1].checked=true; return false;"><img src="images/language_zh_CN.gif" border="0" /></a>
</td>
<td>
<label for="loc02">Simplified Chinese (zh_CN)</label>
</td>
</tr>
</tbody>
</table>
</ul>
<br/>
<hr size="0">
<div align="right">
<input type="submit" name="save" value=" Continue ">
</div> </div>
</form> </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023