Removed main.jsp page

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@376 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/audit-policy.jsp

@@ -26,7 +26,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Audit Policy";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "audit-policy.jsp"));
     pageinfo.setPageID("server-audit-policy");
 %>

src/web/chatroom-history-settings.jsp

@@ -27,7 +27,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Chat Room History Settings";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "chatroom-history-settings.jsp"));
     pageinfo.setPageID("server-chatroom-history");
 %>

src/web/error-serverdown.jsp

@@ -9,7 +9,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Jive Messenger Server Down";
     String[][] breadcrumbs = {
-        { "Home", "main.jsp" },
+        { "Home", "index.jsp" },
         { title, "error-serverdown.jsp" }
     };
 %>

src/web/license-details.jsp

@@ -19,7 +19,7 @@
 <!-- Define BreadCrumbs -->
 <c:set var="title" value="License Details"  />
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
+<c:set target="${breadcrumbs}" property="Home" value="index.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="license-details.jsp" />
 <jsp:include page="top.jsp" flush="true" />
   

src/web/logviewer.jsp

@@ -197,7 +197,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Log Viewer";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "logviewer.jsp?log=" + log));
     pageinfo.setPageID("server-logs");
 %>

src/web/main.jsp

-<%--
-  -	$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.*,
-                 java.util.HashMap,
-                 java.util.Map,
-                 org.jivesoftware.messenger.*,
-                 org.jivesoftware.messenger.user.*,
-                 java.util.*,
-                 java.text.*,
-                 org.jivesoftware.admin.AdminPageBean"
-%>
-
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
-
-<%@ include file="global.jsp" %>
-
-<%-- Define page bean for header and sidebar --%>
-<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 = "Jive Messenger Admin";
-    pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
-    pageinfo.setPageID("server-status");
-%>
-
-<jsp:include page="top.jsp" flush="true" />
-
-<p>Welcome to the Jive Messenger Admin tool.</p>
-
-<table class="box" cellpadding="3" cellspacing="1" border="0" width="100%">
-<tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="title" bundle="${lang}" /> Information</td></tr>
-<tr><td colspan="2">
-<tr>  
-    <td class="jive-label">   
-        Version:
-    </td>
-    <td>
-        <fmt:message key="title" bundle="${lang}" /> <%= admin.getXMPPServer().getServerInfo().getVersion().getVersionString() %>
-    </td>
-</tr>
-<tr>
-    <td class="jive-label">
-        JVM Version and Vendor:
-    </td>
-    <td>
-        <%= System.getProperty("java.version") %> <%= System.getProperty("java.vendor") %>
-    </td>
-</tr>
-<tr>
-    <td class="jive-label">
-        Appserver:
-    </td>
-    <td>
-        <%= application.getServerInfo() %>
-    </td>
-</tr>
-</table>
-</div>
-
-<jsp:include page="top.jsp" flush="true" />
\ No newline at end of file

src/web/muc-create-permission.jsp

@@ -20,7 +20,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Users allowed to create rooms";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-create-permission.jsp"));
     pageinfo.setPageID("muc-perms");
 %>

src/web/muc-history-settings.jsp

@@ -19,7 +19,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "MultiUser Chat History Settings";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-history-settings.jsp"));
     pageinfo.setPageID("muc-history");
 %>

src/web/muc-server-props-edit-form.jsp

@@ -31,7 +31,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Edit MultiUser Chat Properties";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-server-props-edit-form.jsp"));
     pageinfo.setPageID("muc-server-props");
 %>

src/web/muc-sysadmins.jsp

@@ -19,7 +19,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "System Administrators For MultiUser Chat Rooms";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-sysadmins.jsp"));
     pageinfo.setPageID("muc-sysadmins");
 %>

src/web/offline-messages.jsp

@@ -30,7 +30,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Offline Messages";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "offline-messages.jsp"));
     pageinfo.setPageID("server-offline-messages");
 %>

src/web/private-data-settings.jsp

@@ -25,7 +25,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Private Data";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "private-data-settings.jsp"));
     pageinfo.setPageID("server-data-settings");
 %>

src/web/reg-settings.jsp

@@ -25,7 +25,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Registration Settings";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "reg-settings.jsp"));
     pageinfo.setPageID("server-reg-and-login");
 %>

src/web/server-db.jsp

@@ -27,7 +27,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Database Properties";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-db.jsp"));
     pageinfo.setPageID("server-db");
 %>

src/web/server-props-edit-form.jsp

@@ -27,7 +27,7 @@
 <!-- Define BreadCrumbs -->
 <c:set var="title" value="Edit Server Properties"  />
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
+<c:set target="${breadcrumbs}" property="Home" value="index.jsp" />
 <c:set target="${breadcrumbs}" property="Server Properties" value="server-props.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="server-props-edit-form.jsp" />
 <jsp:include page="top.jsp" flush="true" />

src/web/server-props.jsp

@@ -104,7 +104,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Edit Server Properties";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Server Properties", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Edit", "server-props.jsp"));
     pageinfo.setPageID("server-props");

src/web/server-status.jsp

@@ -30,7 +30,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Server Status";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-status.jsp"));
     pageinfo.setPageID("server-status");
 %>

src/web/session-conflict.jsp

@@ -30,7 +30,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Conflict Policy";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Session Conflict", "session-conflict.jsp"));
     pageinfo.setPageID("server-session-conflict");
 %>

src/web/session-details.jsp

@@ -63,7 +63,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Session Details";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-details.jsp"));
     pageinfo.setSubPageID("session-details");
 %>

src/web/session-filter.jsp

@@ -60,7 +60,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Filter Session Summary by User";
     String[][] breadcrumbs = {
-        {"Home", "main.jsp"},
+        {"Home", "index.jsp"},
         {"Session Summary", "session-summary.jsp"},
         {title, "session-filter.jsp"}
     };

src/web/session-settings.jsp

@@ -20,7 +20,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Session Settings";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-settings.jsp"));
     pageinfo.setPageID("session-settings");
 %>

src/web/session-summary.jsp

@@ -21,7 +21,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Session Summary";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-summary.jsp"));
     pageinfo.setPageID("session-summary");
 %>

src/web/ssl-settings.jsp

@@ -93,7 +93,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "SSL Security Settings";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "ssl-settings.jsp"));
     pageinfo.setPageID("server-ssl");
 %>

src/web/user-browser.jsp

@@ -129,7 +129,7 @@
     <%  // Title of this page and breadcrumbs
         String title = "User Browser";
         String[][] breadcrumbs = {
-            { "Home", "main.jsp" },
+            { "Home", "index.jsp" },
             { title, "user-browser.jsp" }
         };
     %>

src/web/user-create-success.jsp

@@ -40,7 +40,7 @@
 <fmt:message key="title" bundle="${lang}" var="t" />
 <c:set var="title" value="${t} Admin"  />
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
+<c:set target="${breadcrumbs}" property="Home" value="index.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-create.jsp" />
 <jsp:include page="top.jsp" flush="true" />
 

src/web/user-create.jsp

@@ -96,7 +96,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Create User";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-create.jsp"));
     pageinfo.setPageID("user-create");
 %>

src/web/user-delete.jsp

@@ -59,7 +59,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Delete User";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-password.jsp?username="+username));
     pageinfo.setSubPageID("user-delete");
     pageinfo.setExtraParams("username="+username);

src/web/user-edit-form.jsp

-<%@ taglib uri="core" prefix="c"%><%--
+<%--
   -	$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.ParamUtils,
@@ -12,6 +17,9 @@
                  java.util.HashMap,
                  java.util.Map"
 %>
+
+<%@ taglib uri="core" prefix="c"%>
+
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <jsp:useBean id="userData" class="org.jivesoftware.messenger.user.spi.UserPrivateData" />
 
@@ -64,7 +72,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Edit User";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-summary.jsp"));
     pageinfo.setSubPageID("user-edit");
     pageinfo.setExtraParams("username="+username);

src/web/user-email.jsp

@@ -31,7 +31,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Email User";
     String[][] breadcrumbs = {
-        { "Home", "main.jsp" },
+        { "Home", "index.jsp" },
         { "User Summary", "user-summary.jsp" },
         { "Edit User", "user-edit-form.jsp?username="+username },
         { title, "user-email.jsp?username="+username }

src/web/user-message.jsp

@@ -114,7 +114,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Send Administrative Message";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-message.jsp"));
     pageinfo.setPageID("user-message");
 %>

src/web/user-password.jsp

@@ -58,7 +58,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "Change Password";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-password.jsp?username="+username));
     pageinfo.setSubPageID("user-password");
     pageinfo.setExtraParams("username="+username);

src/web/user-properties.jsp

@@ -83,7 +83,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "User Properties";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-properties.jsp"));
     pageinfo.setSubPageID("user-properties");
     pageinfo.setExtraParams("username="+username);
@@ -215,7 +215,8 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
 
 <br><br>
 
-<form action="user-edit.jsp">
+<form action="user-edit-form.jsp">
+<input type="hidden" name="username" value="<%= user.getUsername() %>">
 <input type="submit" value="Edit Properties">
 </form>
 

src/web/user-search.jsp

@@ -46,7 +46,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "User Search";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-search.jsp"));
     pageinfo.setPageID("user-search");
 %>

src/web/user-summary.jsp

@@ -28,7 +28,7 @@
 <%  // Title of this page and breadcrumbs
     String title = "User Summary";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-summary.jsp"));
     pageinfo.setPageID("user-summary");
 %>