Commit f1679aff authored by Ryan Graham's avatar Ryan Graham Committed by ryan

More UI tweaks (finishing out most of the rest of the pages). i'm sure there are more to come.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5299 b35dd754-fafc-0310-a699-88a17e54d16e
parent d361268c
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<html> <html>
<head> <head>
<title><fmt:message key="audit.policy.title"/></title> <title><fmt:message key="audit.policy.title"/></title>
<meta name="pageID" content="server-audit-policy"/> <meta name="pageID" content="server-audit-policy"/>
<meta name="helpPage" content="set_server_traffic_auditing_policy.html"/> <meta name="helpPage" content="set_server_traffic_auditing_policy.html"/>
</head> </head>
<body> <body>
...@@ -178,12 +178,13 @@ ...@@ -178,12 +178,13 @@
<fmt:message key="audit.policy.title_info" /> <fmt:message key="audit.policy.title_info" />
</p> </p>
<!-- BEGIN 'Set Message Audit Policy' -->
<form action="audit-policy.jsp" name="f"> <form action="audit-policy.jsp" name="f">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="audit.policy.policytitle" />
<legend><fmt:message key="audit.policy.policytitle" /></legend> </div>
<div> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -212,7 +213,7 @@ ...@@ -212,7 +213,7 @@
&nbsp; &nbsp;
</td> </td>
<td width="99%"> <td width="99%">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
<fmt:message key="audit.policy.log_directory" /> <fmt:message key="audit.policy.log_directory" />
...@@ -379,14 +380,13 @@ ...@@ -379,14 +380,13 @@
</td> </td>
</tr> </tr>
</table> </table>
<br>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br><br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END 'Set Message Audit Policy' -->
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<html> <html>
<head> <head>
<title><fmt:message key="compression.settings.title"/></title> <title><fmt:message key="compression.settings.title"/></title>
<meta name="pageID" content="server-compression"/> <meta name="pageID" content="server-compression"/>
</head> </head>
<body> <body>
<% // Get parameters: <% // Get parameters:
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
...@@ -64,12 +64,16 @@ ...@@ -64,12 +64,16 @@
<fmt:message key="compression.settings.info" /> <fmt:message key="compression.settings.info" />
</p> </p>
<!-- 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;">
<fieldset> <h4><fmt:message key="compression.settings.client.policy" /></h4>
<legend><fmt:message key="compression.settings.client.policy" /></legend> <table cellpadding="3" cellspacing="0" border="0">
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -97,15 +101,12 @@ ...@@ -97,15 +101,12 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset>
<br> <br>
<br>
<fieldset> <h4><fmt:message key="compression.settings.server.policy" /></h4>
<legend><fmt:message key="compression.settings.server.policy" /></legend> <table cellpadding="3" cellspacing="0" border="0">
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -133,14 +134,12 @@ ...@@ -133,14 +134,12 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br><br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END compression settings -->
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="component.settings.title"/></title> <title><fmt:message key="component.settings.title"/></title>
<meta name="pageID" content="external-components-settings"/> <meta name="pageID" content="external-components-settings"/>
</head> </head>
<body> <body>
<% // Get parameters <% // Get parameters
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
...@@ -204,12 +204,14 @@ ...@@ -204,12 +204,14 @@
<% } %> <% } %>
<form action="external-components-settings.jsp" method="post">
<fieldset> <!-- BEGIN 'Services Enabled' -->
<legend><fmt:message key="component.settings.enabled.legend" /></legend> <form action="external-components-settings.jsp" method="post">
<div> <div class="jive-contentBoxHeader">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <fmt:message key="component.settings.enabled.legend" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -262,21 +264,20 @@ ...@@ -262,21 +264,20 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END 'Services Enabled' -->
<br> <br>
<fieldset> <!-- BEGIN 'Allowed to Connect' -->
<legend><fmt:message key="component.settings.allowed" /></legend> <div class="jive-contentBoxHeader">
<div> <fmt:message key="component.settings.allowed" />
</div>
<div class="jive-contentBox">
<form action="external-components-settings.jsp" method="post"> <form action="external-components-settings.jsp" method="post">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
...@@ -306,8 +307,8 @@ ...@@ -306,8 +307,8 @@
<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" />">
</form> </form>
<br>
<table class="jive-table" cellpadding="0" cellspacing="0" border="0" width="100%"> <table class="jive-table" cellpadding="0" cellspacing="0" border="0">
<thead> <thead>
<tr> <tr>
<th width="1%">&nbsp;</th> <th width="1%">&nbsp;</th>
...@@ -350,7 +351,7 @@ ...@@ -350,7 +351,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<table cellpadding="3" cellspacing="1" border="0" width="100%"> <table cellpadding="3" cellspacing="1" border="0">
<form action="external-components-settings.jsp" method="post"> <form action="external-components-settings.jsp" method="post">
<tr> <tr>
<td nowrap width="1%"> <td nowrap width="1%">
...@@ -373,22 +374,23 @@ ...@@ -373,22 +374,23 @@
</tr> </tr>
</form> </form>
</table> </table>
</div> </div>
</fieldset> <!-- END 'Allowed to Connect' -->
<br><br> <br>
<fieldset> <!-- BEGIN 'Not Allowed to Connect' -->
<legend><fmt:message key="component.settings.disallowed" /></legend> <div class="jive-contentBoxHeader">
<div> <fmt:message key="component.settings.disallowed" />
<table cellpadding="3" cellspacing="0" border="0" width="100%"> </div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" >
<tbody> <tbody>
<tr><td><p><fmt:message key="component.settings.disallowed.info" /></p></td></tr> <tr><td><p><fmt:message key="component.settings.disallowed.info" /></p></td></tr>
</tbody> </tbody>
</table> </table>
<br><br> <br><br>
<table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="100%"> <table class="jive-table" cellpadding="3" cellspacing="0" border="0" >
<thead> <thead>
<tr> <tr>
<th width="1%">&nbsp;</th> <th width="1%">&nbsp;</th>
...@@ -427,7 +429,7 @@ ...@@ -427,7 +429,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<table cellpadding="3" cellspacing="1" border="0" width="100%"> <table cellpadding="3" cellspacing="1" border="0">
<form action="external-components-settings.jsp" method="post"> <form action="external-components-settings.jsp" method="post">
<tr> <tr>
<td nowrap width="1%"> <td nowrap width="1%">
...@@ -441,7 +443,8 @@ ...@@ -441,7 +443,8 @@
</form> </form>
</table> </table>
</div> </div>
</fieldset> <!-- END 'Not Allowed to Connect' -->
</body> </body>
</html> </html>
...@@ -54,14 +54,17 @@ ...@@ -54,14 +54,17 @@
%> %>
<html> <html>
<head><title><fmt:message key="filetransferproxy.settings.title"/></title></head> <head>
<meta name="pageID" content="server-transfer-proxy"/> <title><fmt:message key="filetransferproxy.settings.title"/></title>
</head>
<meta name="pageID" content="server-transfer-proxy"/>
<body> <body>
<p> <p>
<fmt:message key="filetransferproxy.settings.info"/> <fmt:message key="filetransferproxy.settings.info"/>
</p> </p>
<% if (!errors.isEmpty()) { %>
<% if (!errors.isEmpty()) { %>
<div class="jive-error"> <div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
<tbody> <tbody>
...@@ -78,7 +81,6 @@ ...@@ -78,7 +81,6 @@
</table> </table>
</div> </div>
<br> <br>
<% } <% }
else if (isUpdated) { %> else if (isUpdated) { %>
<div class="jive-success"> <div class="jive-success">
...@@ -98,13 +100,14 @@ else { %> ...@@ -98,13 +100,14 @@ else { %>
<br> <br>
<% } %> <% } %>
<form action="file-transfer-proxy.jsp" method="post">
<fieldset>
<legend><fmt:message key="filetransferproxy.settings.enabled.legend"/></legend>
<div> <!-- BEGIN 'Proxy Service' -->
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <form action="file-transfer-proxy.jsp" method="post">
<div class="jive-contentBoxHeader">
<fmt:message key="filetransferproxy.settings.enabled.legend"/>
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -131,15 +134,14 @@ else { %> ...@@ -131,15 +134,14 @@ else { %>
</label> </label>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset>
<br> <br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />"> <input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div>
</form> </form>
<!-- END 'Proxy Service' -->
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
<html> <html>
<head> <head>
<title><fmt:message key="manage-updates.title"/></title> <title><fmt:message key="manage-updates.title"/></title>
<meta name="pageID" content="manage-updates"/> <meta name="pageID" content="manage-updates"/>
</head> </head>
<body> <body>
<% // Get parameters <% // Get parameters
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
...@@ -101,8 +101,7 @@ ...@@ -101,8 +101,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div><br>
<br>
<% } <% }
else if (updateSucess) { %> else if (updateSucess) { %>
...@@ -113,12 +112,17 @@ else if (updateSucess) { %> ...@@ -113,12 +112,17 @@ else if (updateSucess) { %>
<% } %> <% } %>
<!-- BEGIN manage updates settings -->
<form action="manage-updates.jsp" method="post"> <form action="manage-updates.jsp" method="post">
<!--<div class="jive-contentBoxHeader">
<fieldset> </div>-->
<legend><fmt:message key="manage-updates.enabled.legend"/></legend> <div class="jive-contentBox" style="-moz-border-radius: 3px;">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <h4><fmt:message key="manage-updates.enabled.legend"/></h4>
<table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -144,12 +148,12 @@ else if (updateSucess) { %> ...@@ -144,12 +148,12 @@ else if (updateSucess) { %>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</fieldset>
<br/><br/> <br/>
<fieldset> <br/>
<legend><fmt:message key="manage-updates.notif.enabled.legend"/></legend>
<div> <h4><fmt:message key="manage-updates.notif.enabled.legend"/></h4>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -175,13 +179,12 @@ else if (updateSucess) { %> ...@@ -175,13 +179,12 @@ else if (updateSucess) { %>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset> <br/>
<br/><br/> <br/>
<fieldset>
<legend><fmt:message key="manage-updates.proxy.enabled.legend"/></legend> <h4><fmt:message key="manage-updates.proxy.enabled.legend"/></h4>
<div> <table cellpadding="3" cellspacing="0" border="0">
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -234,14 +237,13 @@ else if (updateSucess) { %> ...@@ -234,14 +237,13 @@ else if (updateSucess) { %>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset>
<br>
<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>
</form> </form>
<!-- END manage updates settings -->
</body> </body>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<html> <html>
<head> <head>
<title><fmt:message key="offline.messages.title"/></title> <title><fmt:message key="offline.messages.title"/></title>
<meta name="pageID" content="server-offline-messages"/> <meta name="pageID" content="server-offline-messages"/>
<meta name="helpPage" content="manage_offline_messages.html"/> <meta name="helpPage" content="manage_offline_messages.html"/>
</head> </head>
<body> <body>
<c:set var="success" /> <c:set var="success" />
...@@ -185,12 +185,15 @@ ...@@ -185,12 +185,15 @@
<b><%= format.format(OfflineMessageStore.getInstance().getSize()/1024.0/1024.0) %> MB</b> <b><%= format.format(OfflineMessageStore.getInstance().getSize()/1024.0/1024.0) %> MB</b>
</p> </p>
<form action="offline-messages.jsp">
<fieldset>
<legend><fmt:message key="offline.messages.policy" /></legend> <!-- BEGIN 'Offline Message Policy' -->
<div> <form action="offline-messages.jsp">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <div class="jive-contentBoxHeader">
<fmt:message key="offline.messages.policy" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -225,7 +228,7 @@ ...@@ -225,7 +228,7 @@
</td> </td>
<td width="99%"> <td width="99%">
<table cellpadding="4" cellspacing="0" border="0" width="100%"> <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="<%= ALWAYS_STORE %>" id="rb05"
...@@ -270,14 +273,12 @@ ...@@ -270,14 +273,12 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br><br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END 'Offline Message Policy' -->
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<html> <html>
<head> <head>
<title><fmt:message key="private.data.settings.title"/></title> <title><fmt:message key="private.data.settings.title"/></title>
<meta name="pageID" content="server-data-settings"/> <meta name="pageID" content="server-data-settings"/>
<meta name="helpPage" content="set_private_data_storage_policy.html"/> <meta name="helpPage" content="set_private_data_storage_policy.html"/>
</head> </head>
<body> <body>
<% // Get parameters: <% // Get parameters:
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
...@@ -64,12 +64,13 @@ ...@@ -64,12 +64,13 @@
<fmt:message key="private.data.settings.info" /> <fmt:message key="private.data.settings.info" />
</p> </p>
<!-- BEGIN 'Set Private Data Policy' -->
<form action="private-data-settings.jsp"> <form action="private-data-settings.jsp">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="private.data.settings.policy" />
<legend><fmt:message key="private.data.settings.policy" /></legend> </div>
<div> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
...@@ -97,14 +98,11 @@ ...@@ -97,14 +98,11 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br><br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END 'Set Private Data Policy' -->
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<html> <html>
<head> <head>
<title><fmt:message key="reg.settings.title"/></title> <title><fmt:message key="reg.settings.title"/></title>
<meta name="pageID" content="server-reg-and-login"/> <meta name="pageID" content="server-reg-and-login"/>
<meta name="helpPage" content="manage_registration_and_login_settings.html"/> <meta name="helpPage" content="manage_registration_and_login_settings.html"/>
</head> </head>
<body> <body>
<% // Get parameters <% // Get parameters
boolean save = request.getParameter("save") != null; boolean save = request.getParameter("save") != null;
...@@ -99,9 +99,13 @@ ...@@ -99,9 +99,13 @@
<% } %> <% } %>
<fieldset> <!-- BEGIN registration settings -->
<legend><fmt:message key="reg.settings.inband_account" /></legend> <!--<div class="jive-contentBoxHeader">
<div>
</div>-->
<div class="jive-contentBox" style="-moz-border-radius: 3px;">
<h4><fmt:message key="reg.settings.inband_account" /></h4>
<p> <p>
<fmt:message key="reg.settings.inband_account_info" /> <fmt:message key="reg.settings.inband_account_info" />
</p> </p>
...@@ -128,14 +132,11 @@ ...@@ -128,14 +132,11 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset>
<br> <br>
<br>
<fieldset> <h4><fmt:message key="reg.settings.change_password" /></h4>
<legend><fmt:message key="reg.settings.change_password" /></legend>
<div>
<p> <p>
<fmt:message key="reg.settings.change_password_info" /> <fmt:message key="reg.settings.change_password_info" />
</p> </p>
...@@ -161,14 +162,11 @@ ...@@ -161,14 +162,11 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset>
<br> <br>
<br>
<fieldset> <h4><fmt:message key="reg.settings.anonymous_login" /></h4>
<legend><fmt:message key="reg.settings.anonymous_login" /></legend>
<div>
<p> <p>
<fmt:message key="reg.settings.anonymous_login_info" /> <fmt:message key="reg.settings.anonymous_login_info" />
</p> </p>
...@@ -194,14 +192,11 @@ ...@@ -194,14 +192,11 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset>
<br> <br>
<br>
<fieldset> <h4><fmt:message key="reg.settings.allowed_ips" /></h4>
<legend><fmt:message key="reg.settings.allowed_ips" /></legend>
<div>
<p> <p>
<fmt:message key="reg.settings.allowed_ips_info" /> <fmt:message key="reg.settings.allowed_ips_info" />
</p> </p>
...@@ -214,14 +209,15 @@ ...@@ -214,14 +209,15 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</fieldset>
<br><br> <br>
<input type="submit" name="save" value="<fmt:message key="global.save_settings" />"> <input type="submit" name="save" value="<fmt:message key="global.save_settings" />">
</div>
<!-- END registration settings -->
</form> </form>
</body>
</body>
</html> </html>
\ No newline at end of file
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<html> <html>
<head> <head>
<title><fmt:message key="session.conflict.title"/></title> <title><fmt:message key="session.conflict.title"/></title>
<meta name="pageID" content="server-session-conflict"/> <meta name="pageID" content="server-session-conflict"/>
<meta name="helpPage" content="set_the_server_resource_conflict_policy.html"/> <meta name="helpPage" content="set_the_server_resource_conflict_policy.html"/>
</head> </head>
<body> <body>
<% // Get parameters <% // Get parameters
...@@ -82,12 +82,13 @@ ...@@ -82,12 +82,13 @@
<fmt:message key="session.conflict.info" /> <fmt:message key="session.conflict.info" />
</p> </p>
<!-- BEGIN 'Set Conflict Policy' -->
<form action="session-conflict.jsp" method="post"> <form action="session-conflict.jsp" method="post">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="session.conflict.policy" />
<legend><fmt:message key="session.conflict.policy" /></legend> </div>
<div> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%"> <td width="1%">
...@@ -119,12 +120,12 @@ ...@@ -119,12 +120,12 @@
<fmt:message key="session.conflict.resource_conflict" /> <fmt:message key="session.conflict.resource_conflict" />
</td> </td>
</tr> </tr>
<% // Figure out if the kick policy is neither 0 nor SessionManager.NEVER_KICK: <% // Figure out if the kick policy is neither 0 nor SessionManager.NEVER_KICK:
boolean assignedKickPolicy = false; boolean assignedKickPolicy = false;
if (kickPolicy != 0 && kickPolicy != 1 && kickPolicy != SessionManager.NEVER_KICK) { if (kickPolicy != 0 && kickPolicy != 1 && kickPolicy != SessionManager.NEVER_KICK) {
assignedKickPolicy = true; assignedKickPolicy = true;
} }
%> %>
<tr valign="middle"> <tr valign="middle">
<td width="1%"> <td width="1%">
<input type="radio" name="kickPolicy" value="<%= Integer.MAX_VALUE %>" id="rb03" <input type="radio" name="kickPolicy" value="<%= Integer.MAX_VALUE %>" id="rb03"
...@@ -154,14 +155,12 @@ ...@@ -154,14 +155,12 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br><br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END 'Set Conflict Policy' -->
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -228,11 +228,11 @@ ...@@ -228,11 +228,11 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="ssl.settings.title"/></title> <title><fmt:message key="ssl.settings.title"/></title>
<meta name="pageID" content="server-ssl"/> <meta name="pageID" content="server-ssl"/>
<meta name="helpPage" content="manage_security_certificates.html"/> <meta name="helpPage" content="manage_security_certificates.html"/>
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<!-- // code for window popups <!-- // code for window popups
function showOrHide(whichLayer, mode) function showOrHide(whichLayer, mode)
{ {
...@@ -292,9 +292,9 @@ ...@@ -292,9 +292,9 @@
} }
} }
//--> //-->
</script> </script>
</head> </head>
<body> <body>
<% if (success) { %> <% if (success) { %>
...@@ -359,12 +359,14 @@ ...@@ -359,12 +359,14 @@
<fmt:message key="ssl.settings.client.info" /> <fmt:message key="ssl.settings.client.info" />
</p> </p>
<form action="ssl-settings.jsp" method="post">
<fieldset> <!-- BEGIN 'Client Connection Security' -->
<legend><fmt:message key="ssl.settings.client.legend" /></legend> <form action="ssl-settings.jsp" method="post">
<div> <div class="jive-contentBoxHeader">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <fmt:message key="ssl.settings.client.legend" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<tr valign="middle"> <tr valign="middle">
...@@ -405,7 +407,7 @@ ...@@ -405,7 +407,7 @@
&nbsp; &nbsp;
</td> </td>
<td width="99%"> <td width="99%">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<fmt:message key="ssl.settings.client.customSSL" /> <fmt:message key="ssl.settings.client.customSSL" />
...@@ -436,22 +438,23 @@ ...@@ -436,22 +438,23 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END 'Client Connection Security' -->
<br> <br>
<br>
<form action="ssl-settings.jsp" method="post">
<fieldset> <!-- BEGIN 'Server Connection Security' -->
<legend><fmt:message key="ssl.settings.server.legend" /></legend> <form action="ssl-settings.jsp" method="post">
<div> <div class="jive-contentBoxHeader">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <fmt:message key="ssl.settings.server.legend" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<tr valign="middle"> <tr valign="middle">
...@@ -521,16 +524,17 @@ ...@@ -521,16 +524,17 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- BEGIN 'Server Connection Security' -->
<br>
<br>
<br><br>
<!-- BEGIN 'Installed Certificates' -->
<p><b><fmt:message key="ssl.settings.certificate" /></b></p> <p><b><fmt:message key="ssl.settings.certificate" /></b></p>
<p> <p>
...@@ -631,18 +635,21 @@ ...@@ -631,18 +635,21 @@
</tbody> </tbody>
</table> </table>
<!-- END 'Installed Certificates' -->
<br><br> <br>
<br>
<!-- BEGIN 'Instal Certificate' -->
<form action="ssl-settings.jsp" method="post"> <form action="ssl-settings.jsp" method="post">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="ssl.settings.install_certificate" />
<legend><fmt:message key="ssl.settings.install_certificate" /></legend> </div>
<div> <div class="jive-contentBox">
<p> <p>
<fmt:message key="ssl.settings.install_certificate_info" /> <fmt:message key="ssl.settings.install_certificate_info" />
</p> </p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<% if (errors.containsKey("alias")) { %> <% if (errors.containsKey("alias")) { %>
<tr><td>&nbsp;</td> <tr><td>&nbsp;</td>
...@@ -675,7 +682,7 @@ ...@@ -675,7 +682,7 @@
</tr> </tr>
<% } %> <% } %>
<tr> <tr>
<td nowrap><fmt:message key="ssl.settings.type" />:</td> <td nowrap width="15%"><fmt:message key="ssl.settings.type" />:</td>
<td> <td>
<select name="type" size="1"> <select name="type" size="1">
<option value="server"><fmt:message key="ssl.settings.server" /></option> <option value="server"><fmt:message key="ssl.settings.server" /></option>
...@@ -707,11 +714,11 @@ ...@@ -707,11 +714,11 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</fieldset>
</form> </form>
<!-- END 'Instal Certificate' -->
</body> </body>
</html> </html>
<% } catch (Throwable t) { t.printStackTrace(); } %> <% } catch (Throwable t) { t.printStackTrace(); } %>
\ No newline at end of file
...@@ -700,6 +700,14 @@ A.cal:Hover { ...@@ -700,6 +700,14 @@ A.cal:Hover {
font-size: 10pt; font-size: 10pt;
color: #09345b; color: #09345b;
} }
.jive-contentBox h4 {
margin: 0px 0px 4px 0px;
padding: 3px 0px 3px 4px;
color: #34679a;
background-color: #fcfcfc;
font-size: 10pt;
border: 1px solid #e9e9e9;
}
.jive-contentBox form { .jive-contentBox form {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
......
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