Commit 66c97f7c authored by Matt Tucker's avatar Matt Tucker Committed by matt

Additional sitemesh conversion (JM-421).

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@2927 b35dd754-fafc-0310-a699-88a17e54d16e
parent 77d7d9b8
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
--%> --%>
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.XMPPServerInfo,
org.jivesoftware.messenger.ServerPort,
org.jivesoftware.admin.AdminPageBean, org.jivesoftware.admin.AdminPageBean,
java.util.*, java.util.*,
org.jivesoftware.messenger.XMPPServer, org.jivesoftware.messenger.XMPPServer,
...@@ -28,8 +25,8 @@ ...@@ -28,8 +25,8 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%-- Define Administration Bean --%> <%-- Define Administration Bean --%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<% <%
// Get parameters // Get parameters
...@@ -62,9 +59,9 @@ ...@@ -62,9 +59,9 @@
save = true; save = true;
} }
XMPPServer server = admin.getXMPPServer(); XMPPServer server = webManager.getXMPPServer();
ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager(); ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
Map errors = new HashMap(); Map<String, String> errors = new HashMap<String, String>();
if (save) { if (save) {
if (serverName == null) { if (serverName == null) {
errors.put("serverName",""); errors.put("serverName","");
...@@ -143,16 +140,12 @@ ...@@ -143,16 +140,12 @@
} }
%> %>
<% // Title of this page and breadcrumbs <html>
String title = LocaleUtils.getLocalizedString("server.props.title"); <head>
pageinfo.setTitle(title); <title><fmt:message key="server.props.title"/></title>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="pageID" content="server-settings"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("index.properties"), "index.jsp")); </head>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-props.jsp")); <body>
pageinfo.setPageID("server-settings");
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<style type="text/css"> <style type="text/css">
.c1 { .c1 {
...@@ -366,4 +359,5 @@ ...@@ -366,4 +359,5 @@
</form> </form>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
\ No newline at end of file
<%-- <%--
- $RCSfile: server-session-details.jsp,v $
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
...@@ -12,13 +11,7 @@ ...@@ -12,13 +11,7 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
java.util.*, java.util.*,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
java.text.DateFormat,
java.text.NumberFormat, java.text.NumberFormat,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.user.User,
org.xmpp.packet.JID,
org.xmpp.packet.Presence,
java.net.URLEncoder,
org.jivesoftware.messenger.server.IncomingServerSession, org.jivesoftware.messenger.server.IncomingServerSession,
org.jivesoftware.messenger.server.OutgoingServerSession" org.jivesoftware.messenger.server.OutgoingServerSession"
errorPage="error.jsp" errorPage="error.jsp"
...@@ -26,7 +19,9 @@ ...@@ -26,7 +19,9 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<% // Get parameters <% // Get parameters
String hostname = ParamUtils.getParameter(request, "hostname"); String hostname = ParamUtils.getParameter(request, "hostname");
...@@ -46,16 +41,12 @@ ...@@ -46,16 +41,12 @@
NumberFormat numFormatter = NumberFormat.getNumberInstance(); NumberFormat numFormatter = NumberFormat.getNumberInstance();
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("server.session.details.title"); <title><fmt:message key="server.session.details.title"/></title>
pageinfo.setTitle(title); <meta name="pageID" content="server-session-summary"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); </head>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-session-details.jsp?hostname=" + hostname)); <body>
pageinfo.setPageID("server-session-summary");
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<p> <p>
<fmt:message key="server.session.details.info"> <fmt:message key="server.session.details.info">
...@@ -198,4 +189,5 @@ ...@@ -198,4 +189,5 @@
</center> </center>
</form> </form>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
\ No newline at end of file
<%@ page import="org.jivesoftware.messenger.Session, <%--
org.xmpp.packet.Presence, - $Revision$
java.net.URLEncoder, - $Date$
org.jivesoftware.util.LocaleUtils, --%>
<%@ page import="java.net.URLEncoder,
org.jivesoftware.util.JiveGlobals, org.jivesoftware.util.JiveGlobals,
java.util.Date, java.util.Date,
java.util.Calendar, java.util.Calendar,
javax.swing.*, javax.swing.*,
java.net.URL"%> java.net.URL"%>
<%@ page import="org.jivesoftware.messenger.server.IncomingServerSession"%> <%@ page import="org.jivesoftware.messenger.server.IncomingServerSession"%>
<%--
- $RCSfile: server-session-row.jspf,v $
- $Revision$
- $Date$
--%>
<%-- <%--
- This page is meant to be included in other pages. It assumes 4 variables: - This page is meant to be included in other pages. It assumes 4 variables:
......
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
...@@ -14,10 +13,6 @@ ...@@ -14,10 +13,6 @@
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
java.util.Date, java.util.Date,
org.jivesoftware.admin.*, org.jivesoftware.admin.*,
java.text.DateFormat,
org.xmpp.packet.JID,
java.net.URLEncoder,
org.xmpp.packet.Presence,
org.jivesoftware.messenger.server.IncomingServerSession, org.jivesoftware.messenger.server.IncomingServerSession,
org.jivesoftware.messenger.server.OutgoingServerSession" org.jivesoftware.messenger.server.OutgoingServerSession"
errorPage="error.jsp" errorPage="error.jsp"
...@@ -30,21 +25,21 @@ ...@@ -30,21 +25,21 @@
final int[] RANGE_PRESETS = {15, 25, 50, 75, 100}; final int[] RANGE_PRESETS = {15, 25, 50, 75, 100};
%> %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<% // Get parameters <% // Get parameters
int start = ParamUtils.getIntParameter(request,"start",0); int start = ParamUtils.getIntParameter(request,"start",0);
int range = ParamUtils.getIntParameter(request,"range",admin.getRowsPerPage("server-session-summary", DEFAULT_RANGE)); int range = ParamUtils.getIntParameter(request,"range",webManager.getRowsPerPage("server-session-summary", DEFAULT_RANGE));
boolean close = ParamUtils.getBooleanParameter(request,"close"); boolean close = ParamUtils.getBooleanParameter(request,"close");
String hostname = ParamUtils.getParameter(request,"hostname"); String hostname = ParamUtils.getParameter(request,"hostname");
if (request.getParameter("range") != null) { if (request.getParameter("range") != null) {
admin.setRowsPerPage("server-session-summary", range); webManager.setRowsPerPage("server-session-summary", range);
} }
// Get the user manager // Get the user manager
SessionManager sessionManager = admin.getSessionManager(); SessionManager sessionManager = webManager.getSessionManager();
Collection<String> hostnames = new TreeSet<String>(); Collection<String> hostnames = new TreeSet<String>();
// Get the incoming session hostnames // Get the incoming session hostnames
...@@ -84,18 +79,13 @@ ...@@ -84,18 +79,13 @@
int maxIndex = (start+range <= sessionCount ? start+range : sessionCount); int maxIndex = (start+range <= sessionCount ? start+range : sessionCount);
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("server.session.summary.title"); <title><fmt:message key="server.session.summary.title"/></title>
pageinfo.setTitle(title); <meta name="pageID" content="server-session-summary"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="helpPage" content="view_active_server_sessions.html"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-session-summary.jsp")); </head>
pageinfo.setPageID("server-session-summary"); <body>
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="view_active_server_sessions.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<% if ("success".equals(request.getParameter("close"))) { %> <% if ("success".equals(request.getParameter("close"))) { %>
...@@ -123,7 +113,6 @@ ...@@ -123,7 +113,6 @@
<% } %> <% } %>
</select> </select>
</p>
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
...@@ -144,8 +133,6 @@ ...@@ -144,8 +133,6 @@
<% } %> <% } %>
</p>
<p> <p>
<fmt:message key="server.session.summary.info"> <fmt:message key="server.session.summary.info">
<fmt:param value="<%= "<a href='server2server-settings.jsp'>" %>" /> <fmt:param value="<%= "<a href='server2server-settings.jsp'>" %>" />
...@@ -221,4 +208,5 @@ ...@@ -221,4 +208,5 @@
<fmt:message key="server.session.summary.last_update" />: <%= JiveGlobals.formatDateTime(new Date()) %> <fmt:message key="server.session.summary.last_update" />: <%= JiveGlobals.formatDateTime(new Date()) %>
</p> </p>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
\ No newline at end of file
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<head> <head>
<title><%= AdminConsole.getAppName() %> <fmt:message key="server.stopped.admin_console" /><%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title> <title><%= AdminConsole.getAppName() %> <fmt:message key="server.stopped.admin_console" /><%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<meta name="decorator" content="false"/>
<link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css"> <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
</head> </head>
......
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
...@@ -16,16 +15,13 @@ ...@@ -16,16 +15,13 @@
java.util.Iterator, java.util.Iterator,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
java.util.*, java.util.*,
java.text.DateFormat,
org.jivesoftware.admin.AdminPageBean,
org.jivesoftware.messenger.server.RemoteServerManager, org.jivesoftware.messenger.server.RemoteServerManager,
org.jivesoftware.messenger.server.RemoteServerConfiguration, org.jivesoftware.messenger.server.RemoteServerConfiguration"
org.jivesoftware.messenger.component.ExternalComponentManager"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<% // Get parameters <% // Get parameters
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
...@@ -48,10 +44,10 @@ ...@@ -48,10 +44,10 @@
boolean deleteSuccess = false; boolean deleteSuccess = false;
// Get muc server // Get muc server
SessionManager sessionManager = admin.getSessionManager(); SessionManager sessionManager = webManager.getSessionManager();
ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager(); ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
Map errors = new HashMap(); Map<String, String> errors = new HashMap<String, String>();
if (update) { if (update) {
// Validate params // Validate params
if (s2sEnabled) { if (s2sEnabled) {
...@@ -178,17 +174,12 @@ ...@@ -178,17 +174,12 @@
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("server2server.settings.title"); <title><fmt:message key="server2server.settings.title"/></title>
pageinfo.setTitle(title); <meta name="pageID" content="server2server-settings"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); </head>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server2server-settings.jsp")); <body>
pageinfo.setPageID("server2server-settings");
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<p> <p>
<fmt:message key="server2server.settings.info"> <fmt:message key="server2server.settings.info">
...@@ -298,7 +289,7 @@ ...@@ -298,7 +289,7 @@
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="closeEnabled" value="false" id="rb03" <input type="radio" name="closeEnabled" value="false" id="rb03"
<%= ((admin.getSessionManager().getServerSessionIdleTime() < 0) ? "checked" : "") %>> <%= ((webManager.getSessionManager().getServerSessionIdleTime() < 0) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb03"><fmt:message key="server2server.settings.never_close" /></label> <label for="rb03"><fmt:message key="server2server.settings.never_close" /></label>
...@@ -307,13 +298,13 @@ ...@@ -307,13 +298,13 @@
<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"
<%= ((admin.getSessionManager().getServerSessionIdleTime() > -1) ? "checked" : "") %>> <%= ((webManager.getSessionManager().getServerSessionIdleTime() > -1) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb04"><fmt:message key="server2server.settings.close_session" /></label> <label for="rb04"><fmt:message key="server2server.settings.close_session" /></label>
<input type="text" name="idletime" size="5" maxlength="5" <input type="text" name="idletime" size="5" maxlength="5"
onclick="this.form.closeEnabled[1].checked=true;" onclick="this.form.closeEnabled[1].checked=true;"
value="<%= admin.getSessionManager().getServerSessionIdleTime() == -1 ? 30 : admin.getSessionManager().getServerSessionIdleTime() / 1000 / 60 %>"> value="<%= webManager.getSessionManager().getServerSessionIdleTime() == -1 ? 30 : webManager.getSessionManager().getServerSessionIdleTime() / 1000 / 60 %>">
<fmt:message key="global.minutes" />. <fmt:message key="global.minutes" />.
</td> </td>
</tr> </tr>
...@@ -490,4 +481,5 @@ ...@@ -490,4 +481,5 @@
</div> </div>
</fieldset> </fieldset>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
...@@ -13,32 +12,22 @@ ...@@ -13,32 +12,22 @@
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
java.util.Iterator,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
java.util.Date,
java.text.DateFormat,
java.util.HashMap, java.util.HashMap,
java.util.Map, java.util.Map"
org.jivesoftware.admin.AdminPageBean"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("session.conflict.title"); <title><fmt:message key="session.conflict.title"/></title>
pageinfo.setTitle(title); <meta name="pageID" content="server-session-conflict"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="helpPage" content="set_the_server_resource_conflict_policy.html"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-conflict.jsp")); </head>
pageinfo.setPageID("server-session-conflict"); <body>
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="set_the_server_resource_conflict_policy.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<% // Get parameters <% // Get parameters
boolean update = request.getParameter("update") != null; boolean update = request.getParameter("update") != null;
...@@ -46,7 +35,7 @@ ...@@ -46,7 +35,7 @@
int kickValue = ParamUtils.getIntParameter(request,"kickValue",-2); int kickValue = ParamUtils.getIntParameter(request,"kickValue",-2);
if (kickPolicy == -2) { if (kickPolicy == -2) {
kickPolicy = admin.getSessionManager().getConflictKickLimit(); kickPolicy = webManager.getSessionManager().getConflictKickLimit();
} }
// Update the session kick policy if requested // Update the session kick policy if requested
...@@ -61,10 +50,10 @@ ...@@ -61,10 +50,10 @@
// If no errors, continue: // If no errors, continue:
if (errors.size() == 0) { if (errors.size() == 0) {
if (kickPolicy != 0 && kickPolicy != 1 && kickPolicy != SessionManager.NEVER_KICK) { if (kickPolicy != 0 && kickPolicy != 1 && kickPolicy != SessionManager.NEVER_KICK) {
admin.getSessionManager().setConflictKickLimit(kickValue); webManager.getSessionManager().setConflictKickLimit(kickValue);
} }
else { else {
admin.getSessionManager().setConflictKickLimit(kickPolicy); webManager.getSessionManager().setConflictKickLimit(kickPolicy);
} }
%> %>
...@@ -86,7 +75,7 @@ ...@@ -86,7 +75,7 @@
} }
// Update variable values // Update variable values
kickPolicy = admin.getSessionManager().getConflictKickLimit(); kickPolicy = webManager.getSessionManager().getConflictKickLimit();
%> %>
<p> <p>
...@@ -174,4 +163,5 @@ ...@@ -174,4 +163,5 @@
</form> </form>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
\ No newline at end of file
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
...@@ -12,7 +11,6 @@ ...@@ -12,7 +11,6 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
java.util.*, java.util.*,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
java.text.DateFormat,
java.text.NumberFormat, java.text.NumberFormat,
org.jivesoftware.admin.*, org.jivesoftware.admin.*,
org.jivesoftware.messenger.user.User, org.jivesoftware.messenger.user.User,
...@@ -24,7 +22,9 @@ ...@@ -24,7 +22,9 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<% // Get parameters <% // Get parameters
String jid = ParamUtils.getParameter(request, "jid"); String jid = ParamUtils.getParameter(request, "jid");
...@@ -67,16 +67,12 @@ ...@@ -67,16 +67,12 @@
NumberFormat numFormatter = NumberFormat.getNumberInstance(); NumberFormat numFormatter = NumberFormat.getNumberInstance();
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("session.details.title"); <title><fmt:message key="session.details.title"/></title>
pageinfo.setTitle(title); <meta name="pageID" content="session-summary"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); </head>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-details.jsp")); <body>
pageinfo.setPageID("session-summary");
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<p> <p>
<fmt:message key="session.details.info"> <fmt:message key="session.details.info">
...@@ -327,4 +323,5 @@ ...@@ -327,4 +323,5 @@
</center> </center>
</form> </form>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
\ No newline at end of file
<%@ page import="org.jivesoftware.messenger.Session,
org.xmpp.packet.Presence,
java.net.URLEncoder,
org.jivesoftware.util.LocaleUtils"%>
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
--%> --%>
<%@ page import="org.jivesoftware.messenger.Session,
org.xmpp.packet.Presence,
java.net.URLEncoder,
org.jivesoftware.util.LocaleUtils"%>
<%-- <%--
- This page is meant to be included in other pages. It assumes 2 variables: - This page is meant to be included in other pages. It assumes 2 variables:
- * 'sess', a org.jivesoftware.xmpp.Session object - * 'sess', a org.jivesoftware.xmpp.Session object
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
......
<%--
- $RCSfile$
- $Revision$
- $Date$
-
- Copyright (C) 1999-2004 Jive Software. All rights reserved.
-
- This software is the proprietary information of Jive Software. Use is subject to license terms.
--%>
<%@ page import="java.util.Collection,
java.util.Iterator,
org.jivesoftware.admin.AdminPageBean" %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%
String title = pageinfo.getTitle();
Collection breadcrumbs = pageinfo.getBreadcrumbs();
%>
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="99%" id="jive-title">
<%= (title == null ? "&nbsp;" : title) %>
</td>
<td width="1%" id="jive-breadcrumbs">
<% for (Iterator iter=breadcrumbs.iterator(); iter.hasNext(); ) {
AdminPageBean.Breadcrumb crumb = (AdminPageBean.Breadcrumb)iter.next();
%>
<a href="<%= crumb.getUrl() %>"><%= crumb.getName() %></a>
<% if (iter.hasNext()) { %>
&raquo;
<% } %>
<% } %>
</td>
</tr>
</tbody>
</table>
\ No newline at end of file
<%--
- $RCSfile$
- $Revision$
- $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.StringUtils,
org.jivesoftware.admin.AdminConsole,
org.jivesoftware.util.LocaleUtils"
errorPage="error.jsp"
%>
<%@ taglib uri="admin" prefix="admin" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="info" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out); %>
<% String path = request.getContextPath(); %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title><%= AdminConsole.getAppName() %> <fmt:message key="login.title" /><%= (info.getTitle() != null ? (": "+info.getTitle()) : "") %></title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
<script language="JavaScript" type="text/javascript">
<!-- // code for window popups
function helpwin() {
<%
// Get the help page as a request parameter or a request attribute:
String helpPage = null;
if (request.getParameter("helpPage") != null) {
helpPage = request.getParameter("helpPage");
}
if (helpPage == null && request.getAttribute("jive.helpPage") != null) {
helpPage = request.getAttribute("jive.helpPage").toString();
}
%>
var newwin = window.open('/help/index.html<%= (helpPage != null ? "#"+helpPage : "") %>',
'helpWindow','width=750,height=550,menubar=yes,location=no,personalbar=no,scrollbars=yes,resize=yes');
newwin.focus();
}
//-->
</script>
</head>
<body id="jive-body">
<div id="jive-header">
<table cellpadding="0" cellspacing="0" width="100%" border="0">
<tbody>
<tr>
<td>
<img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="login.title" />">
</td>
<td align="right">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
<td>
<a href="#" onclick="helpwin();return false;"
><img src="/images/header-help.gif" width="24" height="24" border="0" alt="Click for help" hspace="10"></a>
&nbsp;
</td>
<td class="info">
<nobr><%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %></nobr>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="3">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr>
<td width="99%" nowrap>
<div id="jive-tabs">
<admin:tabs css="" currentcss="currentlink" bean="pageinfo">
<a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
</admin:tabs>
</div>
</td>
<td width="1%" id="jive-logout" nowrap>
<a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %> [<%= StringUtils.escapeHTMLTags(admin.getUser().getUsername()) %>]</a>
&nbsp;&nbsp;&nbsp;
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</div>
<div id="jive-main">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="1%">
<div id="jive-sidebar">
<admin:sidebar css="" currentcss="currentlink" headercss="category" bean="pageinfo">
<a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
<admin:subsidebar css="" currentcss="currentlink">
<a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
</admin:subsidebar>
</admin:sidebar>
<br>
<img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
</div>
</td>
<td width="99%" id="jive-content">
<% out.flush(); %>
\ No newline at end of file
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
--%> --%>
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
java.util.HashMap,
java.util.Map,
org.jivesoftware.messenger.user.UserManager,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
java.util.*,
org.jivesoftware.messenger.*,
org.jivesoftware.admin.*,
java.io.StringWriter,
java.io.StringWriter,
java.io.IOException,
org.jivesoftware.messenger.auth.UnauthorizedException,
java.io.PrintStream,
org.dom4j.xpath.DefaultXPath,
org.dom4j.*,
java.net.URLEncoder, java.net.URLEncoder,
org.jivesoftware.stringprep.Stringprep, org.jivesoftware.stringprep.Stringprep,
org.jivesoftware.stringprep.StringprepException" org.jivesoftware.stringprep.StringprepException"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ page import="java.util.Map"%>
<%@ page import="java.util.HashMap"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<jsp:useBean id="errors" class="java.util.HashMap" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<% // Get parameters // <% // Get parameters //
...@@ -46,6 +34,7 @@ ...@@ -46,6 +34,7 @@
String password = ParamUtils.getParameter(request,"password"); String password = ParamUtils.getParameter(request,"password");
String passwordConfirm = ParamUtils.getParameter(request,"passwordConfirm"); String passwordConfirm = ParamUtils.getParameter(request,"passwordConfirm");
Map<String, String> errors = new HashMap<String, String>();
// Handle a cancel // Handle a cancel
if (cancel) { if (cancel) {
response.sendRedirect("user-summary.jsp"); response.sendRedirect("user-summary.jsp");
...@@ -103,18 +92,13 @@ ...@@ -103,18 +92,13 @@
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("user.create.title"); <title><fmt:message key="user.create.title"/></title>
pageinfo.setTitle(title); <meta name="pageID" content="user-create"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="helpPage" content="add_users_to_the_system.html"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-create.jsp")); </head>
pageinfo.setPageID("user-create"); <body>
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="add_users_to_the_system.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true"/>
<p><fmt:message key="user.create.info" /></p> <p><fmt:message key="user.create.info" /></p>
...@@ -239,4 +223,5 @@ ...@@ -239,4 +223,5 @@
document.f.username.focus(); document.f.username.focus();
</script> </script>
<jsp:include page="bottom.jsp" flush="true"/> </body>
\ No newline at end of file </html>
\ No newline at end of file
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
...@@ -11,7 +10,6 @@ ...@@ -11,7 +10,6 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
org.jivesoftware.admin.*,
org.xmpp.packet.JID, org.xmpp.packet.JID,
java.net.URLEncoder, java.net.URLEncoder,
org.jivesoftware.messenger.group.GroupManager" org.jivesoftware.messenger.group.GroupManager"
...@@ -20,6 +18,7 @@ ...@@ -20,6 +18,7 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
...@@ -60,20 +59,14 @@ ...@@ -60,20 +59,14 @@
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("user.delete.title"); <title><fmt:message key="user.delete.title"/></title>
pageinfo.setTitle(title); <meta name="subPageID" content="user-delete"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="extraParams" content="<%= "username="+URLEncoder.encode(username, "UTF-8") %>"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, <meta name="helpPage" content="remove_a_user_from_the_system.html"/>
"user-delete.jsp?username="+URLEncoder.encode(username, "UTF-8"))); </head>
pageinfo.setSubPageID("user-delete"); <body>
pageinfo.setExtraParams("username="+URLEncoder.encode(username, "UTF-8"));
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="remove_a_user_from_the_system.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<p> <p>
<fmt:message key="user.delete.info" /> <fmt:message key="user.delete.info" />
...@@ -93,4 +86,5 @@ ...@@ -93,4 +86,5 @@
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />"> <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
</form> </form>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
...@@ -11,13 +10,7 @@ ...@@ -11,13 +10,7 @@
<%@ page import="org.jivesoftware.util.ParamUtils, <%@ page import="org.jivesoftware.util.ParamUtils,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
org.jivesoftware.messenger.*, java.net.URLEncoder"
java.text.DateFormat,
org.jivesoftware.admin.*,
java.util.HashMap,
java.util.Map,
java.net.URLEncoder,
org.jivesoftware.util.LocaleUtils"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
...@@ -52,18 +45,13 @@ ...@@ -52,18 +45,13 @@
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("user.edit.form.title"); <title><fmt:message key="user.edit.form.title"/></title>
pageinfo.setTitle(title); <meta name="subPageID" content="user-properties"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="extraParams" content="<%= "username="+URLEncoder.encode(username, "UTF-8") %>"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, </head>
"user-edit-form.jsp?username="+URLEncoder.encode(username, "UTF-8"))); <body>
pageinfo.setSubPageID("user-properties");
pageinfo.setExtraParams("username="+URLEncoder.encode(username, "UTF-8"));
%>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<% if (success) { %> <% if (success) { %>
...@@ -132,4 +120,5 @@ ...@@ -132,4 +120,5 @@
</form> </form>
<jsp:include page="bottom.jsp" flush="true" /> </body>
\ No newline at end of file </html>
\ No newline at end of file
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
...@@ -13,8 +12,6 @@ ...@@ -13,8 +12,6 @@
java.util.*, java.util.*,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
org.jivesoftware.admin.*, org.jivesoftware.admin.*,
java.util.Date,
java.text.DateFormat,
java.util.HashMap, java.util.HashMap,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
java.util.Map, java.util.Map,
...@@ -116,19 +113,14 @@ ...@@ -116,19 +113,14 @@
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("user.message.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-message.jsp"));
pageinfo.setPageID("user-message");
%>
<jsp:include page="top.jsp" flush="true"> <html>
<jsp:param name="helpPage" value="send_an_administrative_message_to_users.html" /> <head>
</jsp:include> <title><fmt:message key="user.message.title"/></title>
<jsp:include page="title.jsp" flush="true" /> <meta name="pageID" content="user-message"/>
<meta name="helpPage" content="send_an_administrative_message_to_users.html"/>
</head>
<body>
<% if (success) { %> <% if (success) { %>
...@@ -264,4 +256,5 @@ function updateSelect(el) { ...@@ -264,4 +256,5 @@ function updateSelect(el) {
document.f.message.focus(); document.f.message.focus();
</script> </script>
<jsp:include page="bottom.jsp" flush="true" /> </body>
\ No newline at end of file </html>
\ No newline at end of file
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
--%> --%>
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.user.UserManager,
java.text.DateFormat,
org.jivesoftware.messenger.auth.AuthFactory,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
org.jivesoftware.admin.AdminPageBean, org.jivesoftware.admin.AdminPageBean,
java.net.URLEncoder" java.net.URLEncoder"
...@@ -55,20 +51,14 @@ ...@@ -55,20 +51,14 @@
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("user.password.title"); <title><fmt:message key="user.password.title"/></title>
pageinfo.setTitle(title); <meta name="subPageID" content="user-password"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="extraParams" content="<%= "username="+URLEncoder.encode(username, "UTF-8") %>"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, <meta name="helpPage" content="change_a_user_password.html"/>
"user-password.jsp?username="+URLEncoder.encode(username, "UTF-8"))); </head>
pageinfo.setSubPageID("user-password"); <body>
pageinfo.setExtraParams("username="+URLEncoder.encode(username, "UTF-8"));
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="change_a_user_password.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<% if (errors) { %> <% if (errors) { %>
...@@ -149,4 +139,5 @@ ...@@ -149,4 +139,5 @@
document.passform.password.focus(); document.passform.password.focus();
</script> </script>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
- -
- Copyright (C) 2004 Jive Software. All rights reserved. - Copyright (C) 2004-2005 Jive Software. All rights reserved.
- -
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
...@@ -11,8 +10,6 @@ ...@@ -11,8 +10,6 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
java.text.DateFormat,
java.util.*,
org.jivesoftware.admin.*, org.jivesoftware.admin.*,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
org.xmpp.packet.Presence, org.xmpp.packet.Presence,
...@@ -61,20 +58,14 @@ ...@@ -61,20 +58,14 @@
PresenceManager presenceManager = webManager.getPresenceManager(); PresenceManager presenceManager = webManager.getPresenceManager();
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("user.properties.title"); <title><fmt:message key="user.properties.title"/></title>
pageinfo.setTitle(title); <meta name="subPageID" content="user-properties"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="extraParams" content="<%= "username="+URLEncoder.encode(username, "UTF-8") %>"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, <meta name="helpPage" content="edit_user_properties.html"/>
"user-properties.jsp?username="+URLEncoder.encode(username, "UTF-8"))); </head>
pageinfo.setSubPageID("user-properties"); <body>
pageinfo.setExtraParams("username="+URLEncoder.encode(username, "UTF-8"));
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="edit_user_properties.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<p> <p>
<fmt:message key="user.properties.info" /> <fmt:message key="user.properties.info" />
...@@ -215,4 +206,5 @@ ...@@ -215,4 +206,5 @@
<input type="submit" value="<fmt:message key="global.edit_properties" />"> <input type="submit" value="<fmt:message key="global.edit_properties" />">
</form> </form>
<jsp:include page="bottom.jsp" flush="true" /> </body>
\ No newline at end of file </html>
\ No newline at end of file
<%-- <%--
- $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
--%> --%>
...@@ -7,7 +6,6 @@ ...@@ -7,7 +6,6 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
java.util.HashMap, java.util.HashMap,
org.jivesoftware.admin.*,
java.util.Map, java.util.Map,
java.net.URLEncoder" java.net.URLEncoder"
%> %>
...@@ -46,19 +44,14 @@ ...@@ -46,19 +44,14 @@
} }
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("user.search.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-search.jsp"));
pageinfo.setPageID("user-search");
%>
<jsp:include page="top.jsp" flush="true"> <html>
<jsp:param name="helpPage" value="search_for_a_user.html" /> <head>
</jsp:include> <title><fmt:message key="user.search.title"/></title>
<jsp:include page="title.jsp" flush="true"/> <meta name="pageID" content="user-search"/>
<meta name="helpPage" content="search_for_a_user.html"/>
</head>
<body>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
<p class="jive-error-text"><fmt:message key="user.search.not_found" /></p> <p class="jive-error-text"><fmt:message key="user.search.not_found" /></p>
...@@ -82,4 +75,6 @@ ...@@ -82,4 +75,6 @@
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
document.f.username.focus(); document.f.username.focus();
</script> </script>
<jsp:include page="bottom.jsp" flush="true"/>
</body>
</html>
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
java.util.*, java.util.*,
org.jivesoftware.messenger.user.UserManager,
java.text.DateFormat,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.PresenceManager, org.jivesoftware.messenger.PresenceManager,
org.xmpp.packet.Presence, org.xmpp.packet.Presence,
java.net.URLEncoder, java.net.URLEncoder,
...@@ -32,18 +29,13 @@ ...@@ -32,18 +29,13 @@
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <html>
<% // Title of this page and breadcrumbs <head>
String title = LocaleUtils.getLocalizedString("user.summary.title"); <title><fmt:message key="user.summary.title"/></title>
pageinfo.setTitle(title); <meta name="pageID" content="user-summary"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp")); <meta name="helpPage" content="about_users_and_groups.html"/>
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-summary.jsp")); </head>
pageinfo.setPageID("user-summary"); <body>
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="about_users_and_groups.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<% // Get parameters <% // Get parameters
int start = ParamUtils.getIntParameter(request,"start",0); int start = ParamUtils.getIntParameter(request,"start",0);
...@@ -288,4 +280,5 @@ ...@@ -288,4 +280,5 @@
<% } %> <% } %>
<jsp:include page="bottom.jsp" flush="true" /> </body>
</html>
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