Skip to content

O
Openfire
Commit ac5e704f authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Admin console UI updates. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7698 b35dd754-fafc-0310-a699-88a17e54d16e
parent 0088a599
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 74 deletions
Admin.iml
View file @ ac5e704f
......@@ -222,6 +222,7 @@
<url>file://$MODULE_DIR$/target/resources</url>
</containerElement>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/web/WEB-INF/web.xml" optional="false" version="2.3" />
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/web/META-INF/context.xml" optional="false" version="5.x" />
<webroots>
<root url="file://$MODULE_DIR$/src/web" relative="/" />
<root url="file://$MODULE_DIR$/src/web/WEB-INF" relative="/WEB-INF" />
......
src/i18n/openfire_i18n_en.properties
View file @ ac5e704f
......@@ -161,6 +161,7 @@
## Removed key: 'stun.settings.change'
## Removed key: 'stun.external.add'
## Removed key: 'stun.external.delete'
## Removed key: 'httpbind.settings.enabled.legend'
# Openfire
......@@ -918,7 +919,7 @@ offline.messages.never_store=Never store offline messages and drop messages so t
offline.messages.storage_wildfire=Store offline messages for later retrieval. Messages will be delivered \
the next time the recipient logs in. Choose a storage policy and storage store max size below.
offline.messages.always_store=Always Store
offline.messages.always_store_info=Always store messages,even if the max storage size has been exceeded.
offline.messages.always_store_info=Always store messages, even if the max storage size has been exceeded.
offline.messages.bounce=Store or Bounce
offline.messages.bounce_info=Store messages up to the max storage size. After the max size has been exceeded, \
bounce the message back to the sender.
......@@ -1178,11 +1179,11 @@ session.conflict.info=XMPP allows multiple logins to the same user account by as
allows them to request a different resource name.
session.conflict.policy=Set Conflict Policy
session.conflict.always_kick=Always kick
session.conflict.always_kick_info=If there is a resource conflict,immediately kick the other resource.
session.conflict.always_kick_info=If there is a resource conflict, immediately kick the other resource.
session.conflict.never_kick=Never kick
session.conflict.never_kick_info=If there is a resource conflict, don't allow the new resource to log in.
session.conflict.allow_one=Allow one login attempt
session.conflict.resource_conflict=If there is a resource conflict,report an error one time but don't \
session.conflict.resource_conflict=If there is a resource conflict, report an error one time but don't \
kick the existing connection.
session.conflict.kick_value=Assign kick value
session.conflict.kick_value_info=Specify the number of login attempts allowed before conflicting \
......@@ -2183,7 +2184,6 @@ plugin.enterprise.installed = Enterprise plugin installed successfully. Refreshi
# http bind settings page
httpbind.settings.enabled.legend=Service Enabled
httpbind.settings.title=HTTP Bind Settings
httpbind.settings.info=HTTP binding allows clients using the HTTP protocol to connect to Openfire.
httpbind.settings.label_disable=Disabled
......
src/web/connection-managers-settings.jsp
View file @ ac5e704f
......@@ -197,6 +197,8 @@
</form>
<% if (managerEnabled) { %>
<br>
<style type="text/css">
......@@ -259,5 +261,8 @@
</tbody>
</table>
<% } %>
</body>
</html>
src/web/external-components-settings.jsp
View file @ ac5e704f
......@@ -213,8 +213,8 @@
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
<tr>
<td width="1%" valign="top" nowrap>
<input type="radio" name="componentEnabled" value="false" id="rb01"
<%= (!componentEnabled ? "checked" : "") %>>
</td>
......@@ -224,8 +224,8 @@
</label>
</td>
</tr>
<tr valign="middle">
<td width="1%" nowrap>
<tr>
<td width="1%" valign="top" nowrap>
<input type="radio" name="componentEnabled" value="true" id="rb02"
<%= (componentEnabled ? "checked" : "") %>>
</td>
......@@ -269,6 +269,8 @@
</form>
<!-- END 'Services Enabled' -->
<% if (componentEnabled) { %>
<br>
<!-- BEGIN 'Allowed to Connect' -->
......@@ -280,7 +282,7 @@
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="permissionFilter" value="<%= ExternalComponentManager.PermissionPolicy.blacklist %>" id="rb03"
<%= (ExternalComponentManager.PermissionPolicy.blacklist.toString().equals(permissionFilter) ? "checked" : "") %>>
......@@ -291,7 +293,7 @@
</label>
</td>
</tr>
<tr valign="middle">
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="permissionFilter" value="<%= ExternalComponentManager.PermissionPolicy.whitelist %>" id="rb04"
<%= (ExternalComponentManager.PermissionPolicy.whitelist.toString().equals(permissionFilter) ? "checked" : "") %>>
......@@ -445,6 +447,7 @@
</div>
<!-- END 'Not Allowed to Connect' -->
<% } %>
</body>
</html>
src/web/http-bind.jsp
View file @ ac5e704f
......@@ -82,28 +82,11 @@
} %>
<form action="http-bind.jsp" method="post">
<div class="jive-contentBoxHeader">
<fmt:message key="httpbind.settings.enabled.legend"/>
</div>
<div class="jive-contentBox">
<div class="jive-contentBox" style="-moz-border-radius: 3px;">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="httpBindEnabled" value="false" id="rb01"
onclick="enabled = false; setEnabled();"
<%= (!isHttpBindEnabled ? "checked" : "") %>>
</td>
<td width="99%" colspan="2">
<label for="rb01">
<b>
<fmt:message key="httpbind.settings.label_disable"/>
</b> -
<fmt:message key="httpbind.settings.label_disable_info"/>
</label>
</td>
</tr>
<tr valign="middle">
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="httpBindEnabled" value="true" id="rb02"
onclick="enabled = true; setEnabled();"
......@@ -116,37 +99,51 @@
</b> -
<fmt:message key="httpbind.settings.label_enable_info"/>
</label>
<table border="0">
<tr>
<td>
<label for="port">
<fmt:message key="httpbind.settings.vanilla_port"/>
</label>
</td><td>
<input id="port" type="text" size="5" maxlength="10" name="port"
value="<%=port%>" />
</td>
</tr>
<tr>
<td>
<label for="securePort">
<fmt:message key="httpbind.settings.secure_port"/>
</label>
</td><td>
<input id="securePort" type="text" size="5" maxlength="10" name="securePort"
value="<%=securePort%>" />
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="1%">
&nbsp;
</td>
<td colspan="2">
<label for="port">
<fmt:message key="httpbind.settings.vanilla_port"/>
</label>
<input id="port" type="text" size="5" maxlength="10" name="port"
value="<%=port%>" />
</td>
</tr>
<tr>
<td width="1%">
&nbsp;
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="httpBindEnabled" value="false" id="rb01"
onclick="enabled = false; setEnabled();"
<%= (!isHttpBindEnabled ? "checked" : "") %>>
</td>
<td colspan="2">
<label for="securePort">
<fmt:message key="httpbind.settings.secure_port"/>
<td width="99%" colspan="2">
<label for="rb01">
<b>
<fmt:message key="httpbind.settings.label_disable"/>
</b> -
<fmt:message key="httpbind.settings.label_disable_info"/>
</label>
<input id="securePort" type="text" size="5" maxlength="10" name="securePort"
value="<%=securePort%>" />
</td>
</tr>
</tbody>
</table>
<input type="submit" id="settingsUpdate" name="update"
value="<fmt:message key="global.save_settings" />">
</div>
<input type="submit" id="settingsUpdate" name="update"
value="<fmt:message key="global.save_settings" />">
</form>
</body>
</html>
\ No newline at end of file
src/web/manage-updates.jsp
View file @ ac5e704f
......@@ -126,23 +126,23 @@ else if (updateSucess) { %>
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="serviceEnabled" value="false" id="rb01"
<%= (!serviceEnabled ? "checked" : "") %>>
<input type="radio" name="serviceEnabled" value="true" id="rb02"
<%= (serviceEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01">
<b><fmt:message key="manage-updates.label_disable"/></b> - <fmt:message key="manage-updates.label_disable_info"/>
<label for="rb02">
<b><fmt:message key="manage-updates.label_enable"/></b> - <fmt:message key="manage-updates.label_enable_info"/>
</label>
</td>
</tr>
<tr valign="middle">
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="serviceEnabled" value="true" id="rb02"
<%= (serviceEnabled ? "checked" : "") %>>
<input type="radio" name="serviceEnabled" value="false" id="rb01"
<%= (!serviceEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb02">
<b><fmt:message key="manage-updates.label_enable"/></b> - <fmt:message key="manage-updates.label_enable_info"/>
<label for="rb01">
<b><fmt:message key="manage-updates.label_disable"/></b> - <fmt:message key="manage-updates.label_disable_info"/>
</label>
</td>
</tr>
......@@ -157,23 +157,23 @@ else if (updateSucess) { %>
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="notificationsEnabled" value="false" id="rb03"
<%= (!notificationsEnabled ? "checked" : "") %>>
<input type="radio" name="notificationsEnabled" value="true" id="rb04"
<%= (notificationsEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb03">
<b><fmt:message key="manage-updates.notif.label_disable"/></b> - <fmt:message key="manage-updates.notif.label_disable_info"/>
<label for="rb04">
<b><fmt:message key="manage-updates.notif.label_enable"/></b> - <fmt:message key="manage-updates.notif.label_enable_info"/>
</label>
</td>
</tr>
<tr valign="middle">
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="notificationsEnabled" value="true" id="rb04"
<%= (notificationsEnabled ? "checked" : "") %>>
<input type="radio" name="notificationsEnabled" value="false" id="rb03"
<%= (!notificationsEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb04">
<b><fmt:message key="manage-updates.notif.label_enable"/></b> - <fmt:message key="manage-updates.notif.label_enable_info"/>
<label for="rb03">
<b><fmt:message key="manage-updates.notif.label_disable"/></b> - <fmt:message key="manage-updates.notif.label_disable_info"/>
</label>
</td>
</tr>
......
src/web/session-conflict.jsp
View file @ ac5e704f
......@@ -91,7 +91,7 @@
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
<td width="1%">
<td valign="top" width="1%">
<input type="radio" name="kickPolicy" value="0" id="rb01"
<%= ((kickPolicy==0) ? "checked" : "") %>>
</td>
......@@ -101,7 +101,7 @@
</td>
</tr>
<tr valign="middle">
<td width="1%">
<td valign="top" width="1%">
<input type="radio" name="kickPolicy" value="<%= SessionManager.NEVER_KICK %>" id="rb02"
<%= ((kickPolicy==SessionManager.NEVER_KICK) ? "checked" : "") %>>
</td>
......@@ -111,7 +111,7 @@
</td>
</tr>
<tr valign="middle">
<td width="1%">
<td valign="top" width="1%">
<input type="radio" name="kickPolicy" value="1" id="rb04"
<%= ((kickPolicy==1) ? "checked" : "") %>>
</td>
......@@ -127,7 +127,7 @@
}
%>
<tr valign="middle">
<td width="1%">
<td valign="top" width="1%">
<input type="radio" name="kickPolicy" value="<%= Integer.MAX_VALUE %>" id="rb03"
onfocus="this.form.kickValue.focus();"
<%= ((assignedKickPolicy) ? "checked" : "") %>>
......
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