Skip to content

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

Cleanup, put default choices first. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7696 b35dd754-fafc-0310-a699-88a17e54d16e
parent ac544243
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 77 deletions
src/web/compression-settings.jsp
View file @ 0088a599
...@@ -69,9 +69,7 @@ ...@@ -69,9 +69,7 @@
<!-- BEGIN compression settings --> <!-- BEGIN compression settings -->
<form action="compression-settings.jsp"> <form action="compression-settings.jsp">
<!--<div class="jive-contentBoxHeader">
</div>-->
<div class="jive-contentBox" style="-moz-border-radius: 3px;"> <div class="jive-contentBox" style="-moz-border-radius: 3px;">
<h4><fmt:message key="compression.settings.client.policy" /></h4> <h4><fmt:message key="compression.settings.client.policy" /></h4>
......
src/web/offline-messages.jsp
View file @ 0088a599
...@@ -193,24 +193,6 @@ ...@@ -193,24 +193,6 @@
<div class="jive-contentBox"> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="strategy" value="<%= BOUNCE %>" id="rb01"
<%= ((strategy==BOUNCE) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01"><b><fmt:message key="offline.messages.bounce_option" /></b></label> - <fmt:message key="offline.messages.never_back" />
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="strategy" value="<%= DROP %>" id="rb02"
<%= ((strategy==DROP) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb02"><b><fmt:message key="offline.messages.drop_option" /></b></label> - <fmt:message key="offline.messages.never_store" />
</td>
</tr>
<tr valign="top" class=""> <tr valign="top" class="">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="strategy" value="<%= STORE %>" id="rb03" <input type="radio" name="strategy" value="<%= STORE %>" id="rb03"
...@@ -229,22 +211,22 @@ ...@@ -229,22 +211,22 @@
<table cellpadding="4" cellspacing="0" border="0"> <table cellpadding="4" cellspacing="0" border="0">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="storeStrategy" value="<%= ALWAYS_STORE %>" id="rb05" <input type="radio" name="storeStrategy" value="<%= STORE_AND_BOUNCE%>" id="rb06"
onclick="this.form.strategy[2].checked=true;" onclick="this.form.strategy[2].checked=true;"
<%= ((storeStrategy==ALWAYS_STORE) ? "checked" : "") %>> <%= ((storeStrategy==STORE_AND_BOUNCE) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb05"><b><fmt:message key="offline.messages.always_store" /></b></label> - <fmt:message key="offline.messages.always_store_info" /> <label for="rb06"><b><fmt:message key="offline.messages.bounce" /></b></label> - <fmt:message key="offline.messages.bounce_info" />
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="storeStrategy" value="<%= STORE_AND_BOUNCE%>" id="rb06" <input type="radio" name="storeStrategy" value="<%= ALWAYS_STORE %>" id="rb05"
onclick="this.form.strategy[2].checked=true;" onclick="this.form.strategy[2].checked=true;"
<%= ((storeStrategy==STORE_AND_BOUNCE) ? "checked" : "") %>> <%= ((storeStrategy==ALWAYS_STORE) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb06"><b><fmt:message key="offline.messages.bounce" /></b></label> - <fmt:message key="offline.messages.bounce_info" /> <label for="rb05"><b><fmt:message key="offline.messages.always_store" /></b></label> - <fmt:message key="offline.messages.always_store_info" />
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
...@@ -269,7 +251,25 @@ ...@@ -269,7 +251,25 @@
</table> </table>
</td> </td>
</tr> </tr>
</tbody> <tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="strategy" value="<%= BOUNCE %>" id="rb01"
<%= ((strategy==BOUNCE) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01"><b><fmt:message key="offline.messages.bounce_option" /></b></label> - <fmt:message key="offline.messages.never_back" />
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="strategy" value="<%= DROP %>" id="rb02"
<%= ((strategy==DROP) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb02"><b><fmt:message key="offline.messages.drop_option" /></b></label> - <fmt:message key="offline.messages.never_store" />
</td>
</tr>
</tbody>
</table> </table>
</div> </div>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />"> <input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
......
src/web/server2server-settings.jsp
View file @ 0088a599
...@@ -245,17 +245,6 @@ ...@@ -245,17 +245,6 @@
<div class="jive-contentBox"> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="s2sEnabled" value="false" id="rb01"
<%= (!s2sEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01">
<b><fmt:message key="server2server.settings.label_disable" /></b> - <fmt:message key="server2server.settings.label_disable_info" />
</label>
</td>
</tr>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="s2sEnabled" value="true" id="rb02" <input type="radio" name="s2sEnabled" value="true" id="rb02"
...@@ -267,14 +256,25 @@ ...@@ -267,14 +256,25 @@
</label> <input type="text" size="5" maxlength="10" name="port" value="<%= port %>"> </label> <input type="text" size="5" maxlength="10" name="port" value="<%= port %>">
</td> </td>
</tr> </tr>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="s2sEnabled" value="false" id="rb01"
<%= (!s2sEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01">
<b><fmt:message key="server2server.settings.label_disable" /></b> - <fmt:message key="server2server.settings.label_disable_info" />
</label>
</td>
</tr>
</tbody> </tbody>
</table> </table>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />"> <br/>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</form> </form>
<!-- END 'Service Enabled' --> <!-- END 'Service Enabled' -->
<br>
<!-- BEGIN 'Idle Connection Settings' --> <!-- BEGIN 'Idle Connection Settings' -->
<form action="server2server-settings.jsp?closeSettings" method="post"> <form action="server2server-settings.jsp?closeSettings" method="post">
...@@ -284,15 +284,6 @@ ...@@ -284,15 +284,6 @@
<div class="jive-contentBox"> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="closeEnabled" value="false" id="rb03"
<%= ((webManager.getSessionManager().getServerSessionIdleTime() < 0) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb03"><fmt:message key="server2server.settings.never_close" /></label>
</td>
</tr>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="closeEnabled" value="true" id="rb04" <input type="radio" name="closeEnabled" value="true" id="rb04"
...@@ -306,15 +297,23 @@ ...@@ -306,15 +297,23 @@
<fmt:message key="global.minutes" />. <fmt:message key="global.minutes" />.
</td> </td>
</tr> </tr>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="closeEnabled" value="false" id="rb03"
<%= ((webManager.getSessionManager().getServerSessionIdleTime() < 0) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb03"><fmt:message key="server2server.settings.never_close" /></label>
</td>
</tr>
</tbody> </tbody>
</table> </table>
<input type="submit" value="<fmt:message key="global.save_settings" />"> <br/>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</div> </div>
</form> </form>
<!-- END 'Idle Connection Settings' --> <!-- END 'Idle Connection Settings' -->
<br>
<!-- BEGIN 'Allowed to Connect' --> <!-- BEGIN 'Allowed to Connect' -->
<div class="jive-contentBoxHeader"> <div class="jive-contentBoxHeader">
<fmt:message key="server2server.settings.allowed" /> <fmt:message key="server2server.settings.allowed" />
...@@ -324,7 +323,7 @@ ...@@ -324,7 +323,7 @@
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="permissionFilter" value="<%= RemoteServerManager.PermissionPolicy.blacklist %>" id="rb05" <input type="radio" name="permissionFilter" value="<%= RemoteServerManager.PermissionPolicy.blacklist %>" id="rb05"
<%= (RemoteServerManager.PermissionPolicy.blacklist.toString().equals(permissionFilter) ? "checked" : "") %>> <%= (RemoteServerManager.PermissionPolicy.blacklist.toString().equals(permissionFilter) ? "checked" : "") %>>
...@@ -335,7 +334,7 @@ ...@@ -335,7 +334,7 @@
</label> </label>
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="permissionFilter" value="<%= RemoteServerManager.PermissionPolicy.whitelist %>" id="rb06" <input type="radio" name="permissionFilter" value="<%= RemoteServerManager.PermissionPolicy.whitelist %>" id="rb06"
<%= (RemoteServerManager.PermissionPolicy.whitelist.toString().equals(permissionFilter) ? "checked" : "") %>> <%= (RemoteServerManager.PermissionPolicy.whitelist.toString().equals(permissionFilter) ? "checked" : "") %>>
...@@ -348,7 +347,7 @@ ...@@ -348,7 +347,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br> <br/>
<input type="submit" name="permissionUpdate" value="<fmt:message key="global.save_settings" />"> <input type="submit" name="permissionUpdate" value="<fmt:message key="global.save_settings" />">
<br><br> <br><br>
</form> </form>
...@@ -413,9 +412,6 @@ ...@@ -413,9 +412,6 @@
</div> </div>
<!-- END 'Allowed to Connect' --> <!-- END 'Allowed to Connect' -->
<br>
<!-- BEGIN 'Not Allowed to Connect' --> <!-- BEGIN 'Not Allowed to Connect' -->
<div class="jive-contentBoxHeader"> <div class="jive-contentBoxHeader">
<fmt:message key="server2server.settings.disallowed" /> <fmt:message key="server2server.settings.disallowed" />
......
src/web/ssl-settings.jsp
View file @ 0088a599
...@@ -225,10 +225,8 @@ ...@@ -225,10 +225,8 @@
<!-- BEGIN 'Client Connection Security' --> <!-- BEGIN 'Client Connection Security' -->
<form action="ssl-settings.jsp" method="post"> <form action="ssl-settings.jsp" method="post">
<div class="jive-contentBoxHeader"> <div class="jive-contentBox" style="-moz-border-radius: 3px;">
<fmt:message key="ssl.settings.client.legend" /> <h4><fmt:message key="ssl.settings.client.legend" /></h4>
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
...@@ -301,22 +299,16 @@ ...@@ -301,22 +299,16 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div>
</form>
<!-- END 'Client Connection Security' -->
<br>
<br>
<!-- END 'Client Connection Security' -->
<br/>
<br/>
<!-- BEGIN 'Server Connection Security' --> <!-- BEGIN 'Server Connection Security' -->
<form action="ssl-settings.jsp" method="post">
<div class="jive-contentBoxHeader"> <h4><fmt:message key="ssl.settings.server.legend" /></h4>
<fmt:message key="ssl.settings.server.legend" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
...@@ -387,9 +379,9 @@ ...@@ -387,9 +379,9 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- BEGIN 'Server Connection Security' --> <!-- BEGIN 'Server Connection Security' -->
......
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