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
Show 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,20 +104,23 @@ ...@@ -95,20 +104,23 @@
} }
%> %>
<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>
<form action="audit-policy.jsp">
<tr valign="top"> <fieldset>
<legend>Set Message Audit Policy</legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="auditEnabled" value="false" id="rb01" <input type="radio" name="auditEnabled" value="false" id="rb01"
<%= (!auditEnabled ? "checked" : "") %>> <%= (!auditEnabled ? "checked" : "") %>>
...@@ -118,8 +130,8 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -118,8 +130,8 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<b>Disable Message Auditing</b> - Packets are not logged. <b>Disable Message Auditing</b> - Packets are not logged.
</label> </label>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="auditEnabled" value="true" id="rb02" <input type="radio" name="auditEnabled" value="true" id="rb02"
<%= (auditEnabled ? "checked" : "") %>> <%= (auditEnabled ? "checked" : "") %>>
...@@ -129,14 +141,13 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -129,14 +141,13 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<b>Enable Message Auditing</b> - Packets are logged with the following options: <b>Enable Message Auditing</b> - Packets are logged with the following options:
</label> </label>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
&nbsp; &nbsp;
</td> </td>
<td width="99%"> <td width="99%">
<div class="jive-table"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<table cellpadding="3" cellspacing="1" border="0" width="100%">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Maximum file size (MB): Maximum file size (MB):
...@@ -216,94 +227,18 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -216,94 +227,18 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</label> </label>
</td> </td>
</tr> </tr>
<!--
<% if (false){ %>
<tr valign="top">
<td width="1%" nowrap>
<input type="checkbox" name="auditXPath" id="cb04"
onclick="this.form.auditEnabled[1].checked=true;"
<%= (auditXPath ? "checked" : "") %>>
</td>
<td width="99%">
<label for="cb04">
<b>Audit Packets matching XPath Queries:</b>
</label>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
&nbsp;
</td>
<td width="99%">
<table cellpadding="4" cellspacing="0" border="0" width="100%">
<tr>
<td>
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>
</tr>
<% Iterator queries = auditManager.getXPathFilters();
if (queries.hasNext()) {
%>
<tr>
<td>
Current queries audited:
</td>
</tr>
<tr>
<td>
<div class="jive-table">
<table cellpadding="3" cellspacing="1" border="0" width="400">
<tr>
<th nowrap>XPath Query</th>
<th align="center">Delete</th>
</tr>
<% while (queries.hasNext()) {
String query = (String)queries.next();
%>
<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>
<% } %>
</table> </table>
</div>
</td> </td>
</tr> </tr>
<% } %>
</table>
</td>
</tr>
<% } // xquery comment block %>
-->
</table> </table>
</td> </td>
</tr> </tr>
</tbody>
</table> </table>
</div> </div>
</td> </fieldset>
</tr>
</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,16 +101,20 @@ ...@@ -92,16 +101,20 @@
} }
%> %>
<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=""> <fieldset>
<legend>Set Chatroom History Policy</legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top" class="">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="policy" value="<%= NONE %>" id="rb01" <input type="radio" name="policy" value="<%= NONE %>" id="rb01"
<%= ((policy==NONE) ? "checked" : "") %>> <%= ((policy==NONE) ? "checked" : "") %>>
...@@ -110,8 +123,8 @@ Chatrooms can replay conversation histories to provide context to new members jo ...@@ -110,8 +123,8 @@ Chatrooms can replay conversation histories to provide context to new members jo
<label for="rb01"><b>Don't Show History</b></label> - Do not show the entire chat <label for="rb01"><b>Don't Show History</b></label> - Do not show the entire chat
history. history.
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="policy" value="<%= ALL %>" id="rb02" <input type="radio" name="policy" value="<%= ALL %>" id="rb02"
<%= ((policy==ALL) ? "checked" : "") %>> <%= ((policy==ALL) ? "checked" : "") %>>
...@@ -120,8 +133,8 @@ Chatrooms can replay conversation histories to provide context to new members jo ...@@ -120,8 +133,8 @@ Chatrooms can replay conversation histories to provide context to new members jo
<label for="rb02"><b>Show Entire Chat History</b></label> - Show the entire chat history <label for="rb02"><b>Show Entire Chat History</b></label> - Show the entire chat history
to the user. to the user.
</td> </td>
</tr> </tr>
<tr valign="top" class=""> <tr valign="top" class="">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="policy" value="<%= NUMBER %>" id="rb03" <input type="radio" name="policy" value="<%= NUMBER %>" id="rb03"
<%= ((policy==NUMBER) ? "checked" : "") %>> <%= ((policy==NUMBER) ? "checked" : "") %>>
...@@ -130,8 +143,8 @@ Chatrooms can replay conversation histories to provide context to new members jo ...@@ -130,8 +143,8 @@ Chatrooms can replay conversation histories to provide context to new members jo
<label for="rb03"><b>Show a Specific Number of Messages</b></label> - Show a specific <label for="rb03"><b>Show a Specific Number of Messages</b></label> - Show a specific
number of the most recent messages in the chat. Use the box below to specify number of the most recent messages in the chat. Use the box below to specify
that number. that number.
</tr> </tr>
<tr valign="top" class=""> <tr valign="top" class="">
<td width="1%" nowrap> <td width="1%" nowrap>
&nbsp; &nbsp;
</td> </td>
...@@ -139,10 +152,13 @@ Chatrooms can replay conversation histories to provide context to new members jo ...@@ -139,10 +152,13 @@ Chatrooms can replay conversation histories to provide context to new members jo
<input type="text" name="numMessages" size="5" maxlength="10" <input type="text" name="numMessages" size="5" maxlength="10"
onclick="this.form.policy[2].checked=true;" onclick="this.form.policy[2].checked=true;"
value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"> messages value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"> messages
</tr> </tr>
</table> </tbody>
</table>
</div>
</fieldset>
<br> <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,18 +63,21 @@ ...@@ -50,18 +63,21 @@
} }
%> %>
<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>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="privateEnabled" value="true" id="rb01" <input type="radio" name="privateEnabled" value="true" id="rb01"
<%= (privateEnabled ? "checked" : "") %>> <%= (privateEnabled ? "checked" : "") %>>
...@@ -71,8 +87,8 @@ may enable or disable this feature. ...@@ -71,8 +87,8 @@ may enable or disable this feature.
<b>Enable Private Data Storage</b> - allow clients to store information on the server. <b>Enable Private Data Storage</b> - allow clients to store information on the server.
</label> </label>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="privateEnabled" value="false" id="rb02" <input type="radio" name="privateEnabled" value="false" id="rb02"
<%= (!privateEnabled ? "checked" : "") %>> <%= (!privateEnabled ? "checked" : "") %>>
...@@ -82,10 +98,13 @@ may enable or disable this feature. ...@@ -82,10 +98,13 @@ may enable or disable this feature.
<b>Disable Private Data Storage</b> - do not allow server-side storage. <b>Disable Private Data Storage</b> - do not allow server-side storage.
</label> </label>
</td> </td>
</tr> </tr>
</table> </tbody>
</table>
</div>
</fieldset>
<br> <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