Skip to content

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

UI cleanup 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@361 b35dd754-fafc-0310-a699-88a17e54d16e
parent 58c82648
Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 274 deletions
src/web/audit-policy.jsp
View file @ 8a83fd3c
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ taglib uri="core" prefix="c"%> <%@ taglib uri="core" prefix="c" %>
<%@ taglib uri="fmt" prefix="fmt" %>
<%-- Define Administration Bean --%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<% // Get parameters: <% // Get parameters:
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
boolean auditEnabled = ParamUtils.getBooleanParameter(request,"auditEnabled"); boolean auditEnabled = ParamUtils.getBooleanParameter(request,"auditEnabled");
boolean auditMessages = ParamUtils.getBooleanParameter(request,"auditMessages"); boolean auditMessages = ParamUtils.getBooleanParameter(request,"auditMessages");
...@@ -76,9 +76,18 @@ ...@@ -76,9 +76,18 @@
// All done, redirect // All done, redirect
if (errors.size() == 0){ if (errors.size() == 0){
%> %>
<p class="jive-success-text">
Settings Updated. <div class="jive-success">
</p> <table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label">
Settings updated successfully.
</td></tr>
</tbody>
</table>
</div><br>
<% <%
} }
} }
...@@ -95,138 +104,41 @@ ...@@ -95,138 +104,41 @@
} }
%> %>
<table cellpadding="4" cellspacing="0" border="0" width="600"> <p>
<form action="audit-policy.jsp"> <fmt:message key="title" bundle="${lang}" /> can audit XMPP traffic on the server and save
<tr><td colspan="2" class="text"> the data to XML data files. The amount of data sent via an XMPP server can be substantial.
Jive Messenger can audit XMPP traffic on the server and save the data to
XML data files. The amount of data sent via an XMPP server can be substantial.
Messenger provides several settings to control whether to audit packets, how Messenger provides several settings to control whether to audit packets, how
audit files are created, and the types of packets to save. In most cases, logging audit files are created, and the types of packets to save. In most cases, logging
Message packets will provide all of the data an enterprise requires. Presence Message packets will provide all of the data an enterprise requires. Presence
and IQ packets are primarily useful for tracing and troubleshooting XMPP deployments. and IQ packets are primarily useful for tracing and troubleshooting XMPP deployments.
</td></tr> </p>
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="auditEnabled" value="false" id="rb01"
<%= (!auditEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01">
<b>Disable Message Auditing</b> - Packets are not logged.
</label>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="auditEnabled" value="true" id="rb02"
<%= (auditEnabled ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb02">
<b>Enable Message Auditing</b> - Packets are logged with the following options:
</label>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
&nbsp;
</td>
<td width="99%">
<div class="jive-table">
<table cellpadding="3" cellspacing="1" border="0" width="100%">
<tr valign="top">
<td width="1%" nowrap class="c1">
Maximum file size (MB):
</td>
<td width="99%">
<input type="text" size="15" maxlength="50" name="maxSize"
value="<%= ((maxSize != null) ? maxSize : "") %>">
<% if (errors.get("maxSize") != null) { %>
<span class="jive-error-text">
Please enter a valid number.
</span>
<% } %>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap class="c1">
Maximum number of files:
</td>
<td width="99%">
<input type="text" size="15" maxlength="50" name="maxCount"
value="<%= ((maxCount != null) ? maxCount : "") %>">
<% if (errors.get("maxCount") != null) { %>
<span class="jive-error-text">
Please enter a valid number.
</span>
<% } %>
</td> <form action="audit-policy.jsp">
</tr>
<tr valign="top">
<td width="1%" nowrap class="c1">
Packets to audit:
</td>
<td width="99%">
<table cellpadding="4" cellspacing="0" border="0" width="100%"> <fieldset>
<tr valign="top"> <legend>Set Message Audit Policy</legend>
<td width="1%" nowrap> <div>
<input type="checkbox" name="auditMessages" id="cb01" <table cellpadding="3" cellspacing="0" border="0" width="100%">
onclick="this.form.auditEnabled[1].checked=true;" <tbody>
<%= (auditMessages ? "checked" : "") %>>
</td>
<td width="99%">
<label for="cb01">
<b>Audit Message Packets</b>
</label>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="checkbox" name="auditPresence" id="cb02"
onclick="this.form.auditEnabled[1].checked=true;"
<%= (auditPresence ? "checked" : "") %>>
</td>
<td width="99%">
<label for="cb02">
<b>Audit Presence Packets</b>
</label>
</td>
</tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="checkbox" name="auditIQ" id="cb03" <input type="radio" name="auditEnabled" value="false" id="rb01"
onclick="this.form.auditEnabled[1].checked=true;" <%= (!auditEnabled ? "checked" : "") %>>
<%= (auditIQ ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="cb03"> <label for="rb01">
<b>Audit IQ Packets</b> <b>Disable Message Auditing</b> - Packets are not logged.
</label> </label>
</td> </td>
</tr> </tr>
<!--
<% if (false){ %>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="checkbox" name="auditXPath" id="cb04" <input type="radio" name="auditEnabled" value="true" id="rb02"
onclick="this.form.auditEnabled[1].checked=true;" <%= (auditEnabled ? "checked" : "") %>>
<%= (auditXPath ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="cb04"> <label for="rb02">
<b>Audit Packets matching XPath Queries:</b> <b>Enable Message Auditing</b> - Packets are logged with the following options:
</label> </label>
</td> </td>
</tr> </tr>
...@@ -235,75 +147,98 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -235,75 +147,98 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
&nbsp; &nbsp;
</td> </td>
<td width="99%"> <td width="99%">
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<table cellpadding="4" cellspacing="0" border="0" width="100%"> <tr valign="top">
<tr> <td width="1%" nowrap class="c1">
<td> Maximum file size (MB):
Enter new query:
<input type="text" size="30" maxlength="100" name="newXpathQuery"
onclick="this.form.auditEnabled[1].checked=true;this.form.auditXPath.checked=true;"
value="<%= ((newXpathQuery != null) ? newXpathQuery : "") %>">
</td> </td>
</tr> <td width="99%">
<input type="text" size="15" maxlength="50" name="maxSize"
<% Iterator queries = auditManager.getXPathFilters(); value="<%= ((maxSize != null) ? maxSize : "") %>">
if (queries.hasNext()) {
%>
<tr>
<td>
Current queries audited:
</td>
</tr>
<tr>
<td>
<div class="jive-table"> <% if (errors.get("maxSize") != null) { %>
<table cellpadding="3" cellspacing="1" border="0" width="400">
<tr>
<th nowrap>XPath Query</th>
<th align="center">Delete</th>
</tr>
<% while (queries.hasNext()) { <span class="jive-error-text">
String query = (String)queries.next(); Please enter a valid number.
%> </span>
<tr> <% } %>
<td class="jive-label" width="99%">
<%= query %>
</td>
<td align="center" width="1%">
<input type="checkbox" name="xpathQuery"
value="<%= StringUtils.replace(query, "\"", "&quot;") %>">
</td>
</tr>
<% } %> </td>
</tr>
</table> <tr valign="top">
</div> <td width="1%" nowrap class="c1">
Maximum number of files:
</td>
<td width="99%">
<input type="text" size="15" maxlength="50" name="maxCount"
value="<%= ((maxCount != null) ? maxCount : "") %>">
</td> <% if (errors.get("maxCount") != null) { %>
</tr>
<% } %> <span class="jive-error-text">
Please enter a valid number.
</span>
</table> <% } %>
</td> </td>
</tr> </tr>
<% } // xquery comment block %> <tr valign="top">
--> <td width="1%" nowrap class="c1">
Packets to audit:
</td>
<td width="99%">
<table cellpadding="4" cellspacing="0" border="0" width="100%">
<tr valign="top">
<td width="1%" nowrap>
<input type="checkbox" name="auditMessages" id="cb01"
onclick="this.form.auditEnabled[1].checked=true;"
<%= (auditMessages ? "checked" : "") %>>
</td>
<td width="99%">
<label for="cb01">
<b>Audit Message Packets</b>
</label>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="checkbox" name="auditPresence" id="cb02"
onclick="this.form.auditEnabled[1].checked=true;"
<%= (auditPresence ? "checked" : "") %>>
</td>
<td width="99%">
<label for="cb02">
<b>Audit Presence Packets</b>
</label>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="checkbox" name="auditIQ" id="cb03"
onclick="this.form.auditEnabled[1].checked=true;"
<%= (auditIQ ? "checked" : "") %>>
</td>
<td width="99%">
<label for="cb03">
<b>Audit IQ Packets</b>
</label>
</td>
</tr>
</table>
</td>
</tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </tbody>
</div> </table>
</td> </div>
</tr> </fieldset>
</table>
<br> <br><br>
<input type="submit" name="update" value="Save Settings"> <input type="submit" name="update" value="Save Settings">
......
src/web/chatroom-history-settings.jsp
View file @ 8a83fd3c
<%@ taglib uri="core" prefix="c"%>
<%@ taglib uri="fmt" prefix="fmt" %>
<%-- <%--
- $RCSfile$ - $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
-
- Copyright (C) 2004 Jive Software. All rights reserved.
-
- This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution.
--%> --%>
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
...@@ -11,9 +14,12 @@ ...@@ -11,9 +14,12 @@
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
org.jivesoftware.admin.*, org.jivesoftware.admin.*,
org.jivesoftware.messenger.muc.HistoryStrategy" org.jivesoftware.messenger.muc.HistoryStrategy"
errorPage="error.jsp"
%> %>
<%-- Define Administration Bean --%> <%@ taglib uri="core" prefix="c"%>
<%@ taglib uri="fmt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -28,16 +34,12 @@ ...@@ -28,16 +34,12 @@
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<%! // Global vars and methods: <%! // Global vars and methods:
// Strategy definitions:
static final int ALL = 1; static final int ALL = 1;
static final int NONE = 2; static final int NONE = 2;
static final int NUMBER = 3; static final int NUMBER = 3;
%> %>
<% // Get parameters: <% // Get parameters:
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
int policy = ParamUtils.getIntParameter(request,"policy",-1); int policy = ParamUtils.getIntParameter(request,"policy",-1);
...@@ -70,9 +72,16 @@ ...@@ -70,9 +72,16 @@
} }
// All done, redirect // All done, redirect
%> %>
<p class="jive-success-text"> <div class="jive-success">
Settings updated. <table cellpadding="0" cellspacing="0" border="0">
</p> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label">
Settings updated successfully.
</td></tr>
</tbody>
</table>
</div><br>
<% <%
} }
} }
...@@ -92,57 +101,64 @@ ...@@ -92,57 +101,64 @@
} }
%> %>
<table cellpadding="3" cellspacing="1" border="0" width="600"> <p>
<form action="chatroom-history-settings.jsp">
<tr><td class="text" colspan="2" >
Chatrooms can replay conversation histories to provide context to new members joining a room. Chatrooms can replay conversation histories to provide context to new members joining a room.
<fmt:message key="short.title" bundle="${lang}" /> provides several options for controlling how much history to store for each room. <fmt:message key="short.title" bundle="${lang}" /> provides several options for controlling how
</td> much history to store for each room.
</p>
<form action="chatroom-history-settings.jsp">
<tr valign="top" class="">
<td width="1%" nowrap> <fieldset>
<input type="radio" name="policy" value="<%= NONE %>" id="rb01" <legend>Set Chatroom History Policy</legend>
<%= ((policy==NONE) ? "checked" : "") %>> <div>
</td> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<td width="99%"> <tbody>
<label for="rb01"><b>Don't Show History</b></label> - Do not show the entire chat <tr valign="top" class="">
history. <td width="1%" nowrap>
</td> <input type="radio" name="policy" value="<%= NONE %>" id="rb01"
</tr> <%= ((policy==NONE) ? "checked" : "") %>>
<tr valign="top"> </td>
<td width="1%" nowrap> <td width="99%">
<input type="radio" name="policy" value="<%= ALL %>" id="rb02" <label for="rb01"><b>Don't Show History</b></label> - Do not show the entire chat
<%= ((policy==ALL) ? "checked" : "") %>> history.
</td> </td>
<td width="99%"> </tr>
<label for="rb02"><b>Show Entire Chat History</b></label> - Show the entire chat history <tr valign="top">
to the user. <td width="1%" nowrap>
</td> <input type="radio" name="policy" value="<%= ALL %>" id="rb02"
</tr> <%= ((policy==ALL) ? "checked" : "") %>>
<tr valign="top" class=""> </td>
<td width="1%" nowrap> <td width="99%">
<input type="radio" name="policy" value="<%= NUMBER %>" id="rb03" <label for="rb02"><b>Show Entire Chat History</b></label> - Show the entire chat history
<%= ((policy==NUMBER) ? "checked" : "") %>> to the user.
</td> </td>
<td width="99%"> </tr>
<label for="rb03"><b>Show a Specific Number of Messages</b></label> - Show a specific <tr valign="top" class="">
number of the most recent messages in the chat. Use the box below to specify <td width="1%" nowrap>
that number. <input type="radio" name="policy" value="<%= NUMBER %>" id="rb03"
</tr> <%= ((policy==NUMBER) ? "checked" : "") %>>
<tr valign="top" class=""> </td>
<td width="1%" nowrap> <td width="99%">
&nbsp; <label for="rb03"><b>Show a Specific Number of Messages</b></label> - Show a specific
</td> number of the most recent messages in the chat. Use the box below to specify
<td width="99%"> that number.
<input type="text" name="numMessages" size="5" maxlength="10" </tr>
onclick="this.form.policy[2].checked=true;" <tr valign="top" class="">
value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"> messages <td width="1%" nowrap>
</tr> &nbsp;
</table> </td>
<td width="99%">
<br> <input type="text" name="numMessages" size="5" maxlength="10"
onclick="this.form.policy[2].checked=true;"
value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"> messages
</tr>
</tbody>
</table>
</div>
</fieldset>
<br><br>
<input type="submit" name="update" value="Save Settings"> <input type="submit" name="update" value="Save Settings">
......
src/web/private-data-settings.jsp
View file @ 8a83fd3c
<%@ taglib uri="core" prefix="c"%><%-- <%--
- $RCSfile$ - $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
-
- Copyright (C) 2004 Jive Software. All rights reserved.
-
- This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution.
--%> --%>
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
java.util.*, java.util.*,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
org.jivesoftware.admin.*" org.jivesoftware.admin.*"
errorPage="error.jsp"
%> %>
<%-- Define Administration Bean --%>
<%@ taglib uri="core" prefix="c"%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -24,8 +32,6 @@ ...@@ -24,8 +32,6 @@
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<% // Get parameters: <% // Get parameters:
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
boolean privateEnabled = ParamUtils.getBooleanParameter(request,"privateEnabled"); boolean privateEnabled = ParamUtils.getBooleanParameter(request,"privateEnabled");
...@@ -37,9 +43,16 @@ ...@@ -37,9 +43,16 @@
if( update ) { if( update ) {
privateStore.setEnabled(privateEnabled); privateStore.setEnabled(privateEnabled);
%> %>
<p class="jive-success-text"> <div class="jive-success">
Settings updated. <table cellpadding="0" cellspacing="0" border="0">
</p> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label">
Settings updated successfully.
</td></tr>
</tbody>
</table>
</div><br>
<% <%
} }
...@@ -50,42 +63,48 @@ ...@@ -50,42 +63,48 @@
} }
%> %>
<p>
<table cellpadding="3" cellspacing="1" border="0" width="600">
<form action="private-data-settings.jsp">
<tr><td colspan=2 class="text">
Private data storage allows XMPP clients to store settings, bookmarks, etc. on the server. Users Private data storage allows XMPP clients to store settings, bookmarks, etc. on the server. Users
can log into their account and their settings will follow them around (as opposed to having the can log into their account and their settings will follow them around (as opposed to having the
clients store the settings on the local computer where their settings will not follow them). You clients store the settings on the local computer where their settings will not follow them). You
may enable or disable this feature. may enable or disable this feature.
</p>
<form action="private-data-settings.jsp">
<fieldset>
<tr valign="top" class=""> <legend>Set Private Data Policy</legend>
<td width="1%" nowrap> <div>
<input type="radio" name="privateEnabled" value="true" id="rb01" <table cellpadding="3" cellspacing="0" border="0" width="100%">
<%= (privateEnabled ? "checked" : "") %>> <tbody>
</td> <tr valign="top">
<td width="99%"> <td width="1%" nowrap>
<label for="rb01"> <input type="radio" name="privateEnabled" value="true" id="rb01"
<b>Enable Private Data Storage</b> - allow clients to store information on the server. <%= (privateEnabled ? "checked" : "") %>>
</label> </td>
</td> <td width="99%">
</tr> <label for="rb01">
<tr valign="top"> <b>Enable Private Data Storage</b> - allow clients to store information on the server.
<td width="1%" nowrap> </label>
<input type="radio" name="privateEnabled" value="false" id="rb02" </td>
<%= (!privateEnabled ? "checked" : "") %>> </tr>
</td> <tr valign="top">
<td width="99%"> <td width="1%" nowrap>
<label for="rb02"> <input type="radio" name="privateEnabled" value="false" id="rb02"
<b>Disable Private Data Storage</b> - do not allow server-side storage. <%= (!privateEnabled ? "checked" : "") %>>
</label> </td>
</td> <td width="99%">
</tr> <label for="rb02">
</table> <b>Disable Private Data Storage</b> - do not allow server-side storage.
</label>
<br> </td>
</tr>
</tbody>
</table>
</div>
</fieldset>
<br><br>
<input type="submit" name="update" value="Save Settings"> <input type="submit" name="update" value="Save Settings">
......
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