Commit aef42e4b authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Updating to new admin ui


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@298 b35dd754-fafc-0310-a699-88a17e54d16e
parent 09e4907d
...@@ -25,10 +25,6 @@ ...@@ -25,10 +25,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 auditEnabled = ParamUtils.getBooleanParameter(request,"auditEnabled"); boolean auditEnabled = ParamUtils.getBooleanParameter(request,"auditEnabled");
...@@ -73,7 +69,7 @@ ...@@ -73,7 +69,7 @@
if (errors.size() == 0){ if (errors.size() == 0){
%> %>
<p class="jive-success-text"> <p class="jive-success-text">
Settings updated. Settings Updated.
</p> </p>
<% <%
} }
...@@ -90,20 +86,9 @@ ...@@ -90,20 +86,9 @@
maxSize = Integer.toString(auditManager.getMaxFileSize()); maxSize = Integer.toString(auditManager.getMaxFileSize());
} }
%> %>
</P>
<form action="audit-policy.jsp">
<table cellpadding="4" cellspacing="0" border="0" width="600"> <table cellpadding="4" cellspacing="0" border="0" width="600">
<tr class="tableHeader"><td colspan="2" align="left">Audit Policy</td></tr> <form action="audit-policy.jsp">
<tr><td colspan="2" class="text"> <tr><td colspan="2" class="text">
Jive Messenger can audit XMPP traffic on the server and save the data to 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. XML data files. The amount of data sent via an XMPP server can be substantial.
...@@ -145,7 +130,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -145,7 +130,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<div class="jive-table"> <div class="jive-table">
<table cellpadding="3" cellspacing="1" border="0" width="100%"> <table cellpadding="3" cellspacing="1" border="0" width="100%">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="jive-label"> <td width="1%" nowrap class="c1">
Maximum file size (MB): Maximum file size (MB):
</td> </td>
<td width="99%"> <td width="99%">
...@@ -163,7 +148,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -163,7 +148,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="jive-label"> <td width="1%" nowrap class="c1">
Maximum number of files: Maximum number of files:
</td> </td>
<td width="99%"> <td width="99%">
...@@ -181,7 +166,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -181,7 +166,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="jive-label"> <td width="1%" nowrap class="c1">
Packets to audit: Packets to audit:
</td> </td>
<td width="99%"> <td width="99%">
......
...@@ -91,9 +91,9 @@ ...@@ -91,9 +91,9 @@
// numMessages = historyStrat.getMaxNumber(); // numMessages = historyStrat.getMaxNumber();
} }
%> %>
<form action="chatroom-history-settings.jsp">
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="2" align="left">History Settings</td></tr> <form action="chatroom-history-settings.jsp">
<tr><td class="text" colspan="2" > <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 much history to store for each room.
......
<%@ taglib uri="core" prefix="c"%><%-- <%@ taglib uri="core" prefix="c"%>
<%--
- $RCSfile$ - $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
...@@ -70,10 +71,11 @@ ...@@ -70,10 +71,11 @@
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr><td colspan="8"> <tr><td colspan="8">
Below is a list of users allowed to create rooms. An empty list means that <b>anyone</b> can create Below is a list of users allowed to create rooms. An empty list means that <b>anyone</b> can create
a room.</td></tr> a room.</td></tr>
</table> </table>
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="8" align="left">User Summary</td></tr> <tr class="tableHeader"><td colspan="8" align="left">User Summary</td></tr>
...@@ -122,8 +124,7 @@ Total Users: <%= userCount %>. ...@@ -122,8 +124,7 @@ Total Users: <%= userCount %>.
<% } %> <% } %>
<table class="jive-table" cellpadding="3" cellspacing="1" border="0" width="400">
<table class="box" cellpadding="3" cellspacing="1" border="0" width="400">
<tr class="tableHeaderBlue"> <tr class="tableHeaderBlue">
<th nowrap align="left">User</th> <th nowrap align="left">User</th>
<th>Delete</th> <th>Delete</th>
...@@ -189,7 +190,7 @@ Total Users: <%= userCount %>. ...@@ -189,7 +190,7 @@ Total Users: <%= userCount %>.
<table cellpadding="3" cellspacing="1" border="0" width="400"> <table cellpadding="3" cellspacing="1" border="0" width="400">
<tr> <tr>
<td class="jive-label"> <td class="c1">
Enter bare JID of user to add: Enter bare JID of user to add:
</td> </td>
<td> <td>
......
...@@ -87,11 +87,10 @@ ...@@ -87,11 +87,10 @@
numMessages = historyStrat.getMaxNumber(); numMessages = historyStrat.getMaxNumber();
} }
%> %>
<form action="muc-history-settings.jsp">
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"> <form action="muc-history-settings.jsp">
<td colspan="2" align="left">History Settings</td>
</tr>
<tr> <tr>
<td class="text" colspan="2">Group Chat rooms can replay conversation histories to provide context to new members joining a room. <td class="text" colspan="2">Group Chat rooms 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 much history to store for each room.
......
...@@ -85,13 +85,14 @@ ...@@ -85,13 +85,14 @@
Use the form below to edit Multi-User Chat server properties. Use the form below to edit Multi-User Chat server properties.
</p> </p>
<form action="muc-server-props-edit-form.jsp">
<input type="hidden" name="save" value="true"> <input type="hidden" name="save" value="true">
<div class="jive-table"> <div >
<table cellpadding="3" cellspacing="1" border="0" width="100%"> <table class="jive-table" cellpadding="3" cellspacing="1" border="0">
<form action="muc-server-props-edit-form.jsp">
<tr> <tr>
<td class="jive-label"> <td class="c1">
Server name: Server name:
</td> </td>
<td> <td>
...@@ -99,7 +100,7 @@ Use the form below to edit Multi-User Chat server properties. ...@@ -99,7 +100,7 @@ Use the form below to edit Multi-User Chat server properties.
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="jive-label"> <td class="c1">
Multi User Chat server name: Multi User Chat server name:
</td> </td>
<td> <td>
......
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
int curPage = (start/range) + 1; int curPage = (start/range) + 1;
%> %>
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr><td colspan="8"> <tr><td colspan="8">
Below is the list of system administrators of the Multi-User Chat service. System administrators can Below is the list of system administrators of the Multi-User Chat service. System administrators can
...@@ -122,8 +121,8 @@ Total Users: <%= userCount %>. ...@@ -122,8 +121,8 @@ Total Users: <%= userCount %>.
<% } %> <% } %>
<table class="box" cellpadding="3" cellspacing="1" border="0" width="400"> <table class="jive-table" cellpadding="3" cellspacing="1" border="0" width="400">
<tr class="tableHeaderBlue"> <tr>
<th nowrap align="left">User</th> <th nowrap align="left">User</th>
<th>Delete</th> <th>Delete</th>
</tr> </tr>
...@@ -187,7 +186,7 @@ Total Users: <%= userCount %>. ...@@ -187,7 +186,7 @@ Total Users: <%= userCount %>.
<table cellpadding="3" cellspacing="1" border="0" width="400"> <table cellpadding="3" cellspacing="1" border="0" width="400">
<tr> <tr>
<td class="jive-label"> <td class="c1">
Enter bare JID of user to add: Enter bare JID of user to add:
</td> </td>
<td> <td>
......
...@@ -158,9 +158,9 @@ ...@@ -158,9 +158,9 @@
<% } %> <% } %>
<form action="offline-messages.jsp">
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="2" align="let">Offline Message Strategy</td></tr> <form action="offline-messages.jsp">
<tr><td class="text" colspan="2"> <tr><td class="text" colspan="2">
XMPP provides the option for servers to store-and-forward IM messages when they sent to a user that XMPP provides the option for servers to store-and-forward IM messages when they sent to a user that
is not logged in. Supporting store-and-forward of 'offline messages' can be a very convenient is not logged in. Supporting store-and-forward of 'offline messages' can be a very convenient
......
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
} }
%> %>
<form action="private-data-settings.jsp">
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="2" align="left">Private Data Settings</td></tr> <form action="private-data-settings.jsp">
<tr><td colspan=2 class="text"> <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
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
kickPolicy = admin.getSessionManager().getConflictKickLimit(); kickPolicy = admin.getSessionManager().getConflictKickLimit();
%> %>
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="2" align="left">Conflict Policy</td></tr>
<tr><td colspan="2" class="text"> <tr><td colspan="2" class="text">
<fmt:message key="title" bundle="${lang}" /> allows multiple logins to the same user account by assigning a unique "resource name" <fmt:message key="title" bundle="${lang}" /> allows multiple logins to the same user account by assigning a unique "resource name"
to each connection. If a connection requests a resource name that is already in use, the server must to each connection. If a connection requests a resource name that is already in use, the server must
......
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