Skip to content

O
Openfire
Commit 77d7d9b8 authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Additional sitemesh conversion (JM-421). 

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@2926 b35dd754-fafc-0310-a699-88a17e54d16e
parent 7ddf9f6e
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 158 deletions
src/web/muc-sysadmins.jsp
View file @ 77d7d9b8
......@@ -10,16 +10,14 @@
<%@ page import="org.jivesoftware.util.*,
java.util.*,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.muc.MultiUserChatServer"
%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<% // Get parameters
String userJID = ParamUtils.getParameter(request,"userJID");
......@@ -27,7 +25,7 @@
boolean delete = ParamUtils.getBooleanParameter(request,"delete");
// Get muc server
MultiUserChatServer mucServer = admin.getMultiUserChatServer();
MultiUserChatServer mucServer = webManager.getMultiUserChatServer();
// Handle a save
Map errors = new HashMap();
......@@ -52,18 +50,13 @@
}
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("groupchat.admins.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-sysadmins.jsp"));
pageinfo.setPageID("muc-sysadmin");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="edit_group_chat_service_administrators.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="groupchat.admins.title"/></title>
<meta name="pageID" content="muc-sysadmin"/>
<meta name="helpPage" content="edit_group_chat_service_administrators.html"/>
</head>
<body>
<p>
<fmt:message key="groupchat.admins.introduction" />
......@@ -163,4 +156,5 @@
</form>
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
</body>
</html>
\ No newline at end of file
src/web/muc-tasks.jsp
View file @ 77d7d9b8
<%--
- $RCSfile$
- $Revision$
- $Date$
-
......@@ -11,17 +10,15 @@
<%@ page import="org.jivesoftware.util.*,
java.util.*,
org.jivesoftware.messenger.*,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.muc.MultiUserChatServer,
java.util.Iterator"
org.jivesoftware.messenger.muc.MultiUserChatServer"
errorPage="error.jsp"
%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<% // Get parameters
boolean kickEnabled = ParamUtils.getBooleanParameter(request,"kickEnabled");
......@@ -34,9 +31,9 @@
boolean logSettingSuccess = request.getParameter("logSettingSuccess") != null;
// Get muc server
MultiUserChatServer mucServer = admin.getMultiUserChatServer();
MultiUserChatServer mucServer = webManager.getMultiUserChatServer();
Map errors = new HashMap();
Map<String, String> errors = new HashMap<String, String>();
// Handle an update of the kicking task settings
if (kickSettings) {
if (!kickEnabled) {
......@@ -106,18 +103,13 @@
}
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("muc.tasks.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-tasks.jsp"));
pageinfo.setPageID("muc-tasks");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="edit_idle_user_settings.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="muc.tasks.title"/></title>
<meta name="pageID" content="muc-tasks"/>
<meta name="helpPage" content="edit_idle_user_settings.html"/>
</head>
<body>
<p>
<fmt:message key="muc.tasks.info" />
......@@ -243,4 +235,5 @@
</form>
<jsp:include page="bottom.jsp" flush="true" />
</body>
</html>
\ No newline at end of file
src/web/offline-messages.jsp
View file @ 77d7d9b8
<%--
- $RCSfile$
- $Revision$
- $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),
- a copy of which is included in this distribution.
--%>
<%@ page import="org.jivesoftware.util.*,
java.util.Iterator,
org.jivesoftware.messenger.*,
java.util.Date,
java.text.DateFormat,
java.util.HashMap,
java.util.Map,
org.jivesoftware.admin.*,
java.text.DecimalFormat,
java.text.NumberFormat"
java.text.DecimalFormat"
errorPage="error.jsp"
%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" scope="page" />
<% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" scope="page" />
<% webManager.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("offline.messages.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "offline-messages.jsp"));
pageinfo.setPageID("server-offline-messages");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="manage_offline_messages.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="offline.messages.title"/></title>
<meta name="pageID" content="server-offline-messages"/>
<meta name="helpPage" content="manage_offline_messages.html"/>
</head>
<body>
<c:set var="success" />
......@@ -62,10 +51,10 @@
DecimalFormat format = new DecimalFormat("#0.00");
// Get the offline message manager
OfflineMessageStrategy manager = admin.getXMPPServer().getOfflineMessageStrategy();
OfflineMessageStrategy manager = webManager.getXMPPServer().getOfflineMessageStrategy();
// Update the session kick policy if requested
Map errors = new HashMap();
Map<String, String> errors = new HashMap<String, String>();
if (update) {
// Validate params
if (strategy != BOUNCE && strategy != DROP && strategy != STORE) {
......@@ -290,4 +279,5 @@
</form>
<jsp:include page="bottom.jsp" flush="true" />
</body>
</html>
\ No newline at end of file
src/web/plugin-admin.jsp
View file @ 77d7d9b8
......@@ -6,7 +6,6 @@
--%>
<%@ page import="java.io.*,
org.jivesoftware.admin.AdminPageBean,
org.jivesoftware.messenger.container.PluginManager,
org.jivesoftware.util.*,
org.jivesoftware.messenger.container.Plugin,
......@@ -173,19 +172,13 @@
}
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%
String title = LocaleUtils.getLocalizedString("plugin.admin.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "plugin-admin.jsp"));
pageinfo.setPageID("plugin-settings");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="manage_system_plugins.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="plugin.admin.title"/></title>
<meta name="pageID" content="plugin-settings"/>
<meta name="helpPage" content="manage_system_plugins.html"/>
</head>
<body>
<% if ("true".equals(request.getParameter("deletesuccess"))) { %>
......@@ -332,4 +325,5 @@
</table>
</div>
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
</body>
</html>
\ No newline at end of file
src/web/private-data-settings.jsp
View file @ 77d7d9b8
......@@ -18,28 +18,23 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("private.data.settings.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "private-data-settings.jsp"));
pageinfo.setPageID("server-data-settings");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="set_private_data_storage_policy.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="private.data.settings.title"/></title>
<meta name="pageID" content="server-data-settings"/>
<meta name="helpPage" content="set_private_data_storage_policy.html"/>
</head>
<body>
<% // Get parameters:
boolean update = request.getParameter("update") != null;
boolean privateEnabled = ParamUtils.getBooleanParameter(request,"privateEnabled");
// Get an audit manager:
PrivateStorage privateStorage = admin.getPrivateStore();
PrivateStorage privateStorage = webManager.getPrivateStore();
Map errors = new HashMap();
if (update) {
......@@ -111,4 +106,5 @@
</form>
<jsp:include page="bottom.jsp" flush="true" />
</body>
</html>
\ No newline at end of file
src/web/reg-settings.jsp
View file @ 77d7d9b8
<%--
- $RCSfile$
- $Revision$
- $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),
- a copy of which is included in this distribution.
......@@ -11,7 +10,6 @@
<%@ page import="org.jivesoftware.messenger.handler.IQRegisterHandler,
org.jivesoftware.messenger.handler.IQAuthHandler,
org.jivesoftware.admin.AdminPageBean,
java.util.*,
org.jivesoftware.messenger.ClientSession,
org.jivesoftware.util.*"
......@@ -21,22 +19,14 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("reg.settings.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "reg-settings.jsp"));
pageinfo.setPageID("server-reg-and-login");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="manage_registration_and_login_settings.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="reg.settings.title"/></title>
<meta name="pageID" content="server-reg-and-login"/>
<meta name="helpPage" content="manage_registration_and_login_settings.html"/>
</head>
<body>
<% // Get parameters
boolean save = request.getParameter("save") != null;
......@@ -183,7 +173,7 @@
<tbody>
<tr>
<td width="1%">
<input type="radio" name="anonLogin" value="true" id="rb03"
<input type="radio" name="anonLogin" value="true" id="rb05"
<%= ((anonLogin) ? "checked" : "") %>>
</td>
<td width="99%">
......@@ -192,7 +182,7 @@
</tr>
<tr>
<td width="1%">
<input type="radio" name="anonLogin" value="false" id="rb04"
<input type="radio" name="anonLogin" value="false" id="rb06"
<%= ((!anonLogin) ? "checked" : "") %>>
</td>
<td width="99%">
......@@ -230,4 +220,5 @@
</form>
<jsp:include page="bottom.jsp" flush="true" />
</body>
</html>
\ No newline at end of file
src/web/server-db.jsp
View file @ 77d7d9b8
<%--
- $RCSfile$
- $Revision$
- $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),
- a copy of which is included in this distribution.
......@@ -11,7 +10,6 @@
<%@ page import="org.jivesoftware.util.*,
org.jivesoftware.database.DbConnectionManager,
org.jivesoftware.admin.AdminPageBean,
java.sql.*"
errorPage="error.jsp"
%>
......@@ -20,21 +18,13 @@
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%-- Define Administration Bean --%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %>
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("server.db.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-db.jsp"));
pageinfo.setPageID("server-db");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="view_database_connection_properties.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="server.db.title"/></title>
<meta name="pageID" content="server-db"/>
<meta name="helpPage" content="view_database_connection_properties.html"/>
</head>
<body>
<% // Get metadata about the database
Connection con = null;
......@@ -161,4 +151,6 @@
catch (SQLException e) { Log.error(e); }
}
%>
<jsp:include page="bottom.jsp" flush="true" />
</body>
</html>
\ No newline at end of file
src/web/server-locale.jsp
View file @ 77d7d9b8
......@@ -59,8 +59,7 @@
<meta name="pageID" content="server-locale"/>
<meta name="helpPage" content="edit_server_properties.html"/>
</head>
<body>
<body>
<p>
<fmt:message key="locale.title.info" />
......
src/web/server-properties.jsp
View file @ 77d7d9b8
<%--
- $RCSfile$
- $Revision$
- $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),
- a copy of which is included in this distribution.
--%>
<%@ page import="java.io.File,
java.util.*,
<%@ page import="java.util.*,
org.jivesoftware.util.*,
org.jivesoftware.util.ParamUtils,
org.jivesoftware.util.JiveGlobals,
org.jivesoftware.admin.AdminPageBean"
org.jivesoftware.util.JiveGlobals"
errorPage="error.jsp"
%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
......@@ -70,7 +67,7 @@
}
}
Map errors = new HashMap();
Map<String, String> errors = new HashMap<String, String>();
if (save) {
if (propName == null || "".equals(propName.trim())) {
errors.put("propName","");
......@@ -102,18 +99,13 @@
}
%>
<% // Title of this page and breadcrumbs
String title = LocaleUtils.getLocalizedString("server.properties.title");
pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(LocaleUtils.getLocalizedString("global.main"), "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-properties.jsp"));
pageinfo.setPageID("server-props");
%>
<jsp:include page="top.jsp" flush="true">
<jsp:param name="helpPage" value="manage_system_properties.html" />
</jsp:include>
<jsp:include page="title.jsp" flush="true" />
<html>
<head>
<title><fmt:message key="server.properties.title"/></title>
<meta name="pageID" content="server-props"/>
<meta name="helpPage" content="manage_system_properties.html"/>
</head>
<body>
<p>
<fmt:message key="server.properties.info" />
......@@ -368,4 +360,5 @@ function dodelete(propName) {
<br><br><br><br><br><br>
<br><br><br><br><br><br>
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
</body>
</html>
\ No newline at end of file
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