UI overhaul

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

src/web/audit-policy.jsp

@@ -7,7 +7,7 @@
 <P>
   <%@ page import="org.jivesoftware.messenger.audit.AuditManager,                  org.jivesoftware.util.*,                  java.util.*"%>
  
-  <!-- Define Administration Bean -->
+  <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -16,7 +16,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="audit-policy.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
   
   
   
@@ -308,4 +308,4 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/bottom.jsp

-      </td>
+<%--
+  -	$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.
+--%>
+
+        </td>
     </tr>
-  </table>
-  </td>
-  </tr>
-  </table>
+</tbody>
+</table>
+</div>
 
 </body>
 </html>

src/web/chatroom-history-settings.jsp

@@ -12,7 +12,7 @@
                  org.jivesoftware.messenger.muc.HistoryStrategy"
 %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -21,7 +21,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="chatroom-history-settings.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 <%! // Global vars and methods:
@@ -143,4 +143,4 @@ Chatrooms can replay conversation histories to provide context to new members jo
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/db-connection.jsp

@@ -11,7 +11,7 @@
                  java.sql.*,
                  org.jivesoftware.database.DbConnectionManager" %>
                  
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -21,7 +21,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set var="sbar" value="database" scope="page" />
 <c:set target="${breadcrumbs}" property="${title}" value="db-connection.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 <%  // Get metadata about the database
@@ -140,4 +140,4 @@ Below is a brief summary of your database connection information.
         catch (SQLException e) { Log.error(e); }
     }
 %>
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/error-serverdown.jsp

@@ -13,7 +13,6 @@
         { title, "error-serverdown.jsp" }
     };
 %>
-<%@ include file="title.jsp" %>
 
 <p>
 Jive Messenger is currently down. Please see the

src/web/error.jsp

@@ -20,19 +20,6 @@
     }
 %>
 
-<%@ include file="header.jsp" %>
-
-<%  // Title of this page and breadcrumbs
-    String title = "Jive Messenger Admin Error";
-    String[][] breadcrumbs = {
-        { "Home", "main.jsp" },
-        { title, "error.jsp" }
-    };
-%>
-<%@ include file="title.jsp" %>
-
-
-
 <%  if (exception instanceof UnauthorizedException) { %>
 
     <p>
@@ -62,19 +49,14 @@
     
 <%  } %>
 
-
 <%  if (exception != null) {
         StringWriter sout = new StringWriter();
         PrintWriter pout = new PrintWriter(sout);
         exception.printStackTrace(pout);
 %>
-    <p style="color:#999;">
-    Exception:
-    <pre style="color:#999;">
+    Messenger Exception:
+    <pre>
 <%= sout.toString() %>
     </pre>
-    </p>
-
-<%  } %>
 
-<%@ include file="footer.jsp" %>
+<%  } %>
\ No newline at end of file

src/web/global.jsp

@@ -2,6 +2,11 @@
   -	$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.messenger.container.ServiceLookup,

src/web/index.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ include file="main.jsp" %>
+<%--
+  -	$RCSfile$
\ No newline at end of file
+  -	$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-main");
+%>
+
+<jsp:include page="top.jsp" flush="true" />
+<jsp:include page="title.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="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/license-details.jsp

@@ -12,7 +12,7 @@
                  java.util.Map,
                  org.jivesoftware.util.*" %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -21,7 +21,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="license-details.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
   
 
 

src/web/login.jsp

@@ -21,7 +21,7 @@
 <%@ taglib uri="core" prefix="c" %>
 <%@ taglib uri="fmt" prefix="fmt" %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 <c:set var="admin" value="${admin}" />

src/web/logviewer.jsp

@@ -15,7 +15,7 @@
                  org.jivesoftware.messenger.user.*,
                  java.util.*"
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -25,7 +25,7 @@
 <c:set var="log" value="${param.log}" />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="logviewer.jsp?log=${log}" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <%
 String log = ParamUtils.getParameter(request, "log");
@@ -680,4 +680,4 @@ SELECT {
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/main.jsp

@@ -2,30 +2,43 @@
   -	$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.
 --%>
 
-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
-
 <%@ page import="org.jivesoftware.util.*,
                  java.util.HashMap,
                  java.util.Map,
                  org.jivesoftware.messenger.*,
                  org.jivesoftware.messenger.user.*,
                  java.util.*,
-                 java.text.*"
+                 java.text.*,
+                 org.jivesoftware.admin.AdminPageBean"
 %>
+
+<%@ taglib uri="core" prefix="c" %>
+<%@ taglib uri="fmt" prefix="fmt" %>
+
 <%@ include file="global.jsp" %>
-<!-- Define Administration Bean -->
+
+<%-- 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 ); %>
+<% admin.init(request, response, session, application, out); %>
 
-<!-- Define BreadCrumbs -->
-<c:set var="title" value="Jive Messenger Admin"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<c:set target="${breadcrumbs}" property="Home" value="index.jsp" />
+<%  // 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");
+%>
 
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <p>Welcome to the Jive Messenger Admin tool.</p>
 
@@ -59,4 +72,4 @@
 </table>
 </div>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
\ No newline at end of file

src/web/muc-create-permission.jsp

@@ -10,7 +10,7 @@
                  org.jivesoftware.messenger.muc.MultiUserChatServer,
                  java.util.Iterator"
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -66,7 +66,7 @@
 
 
 
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <table  cellpadding="3" cellspacing="1" border="0" width="600">
 <tr><td colspan="8">

src/web/muc-history-settings.jsp

@@ -11,7 +11,7 @@
                  org.jivesoftware.messenger.muc.HistoryStrategy,
                  org.jivesoftware.messenger.muc.MultiUserChatServer"%>
                  
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"/>
 <%  admin.init(request, response, session, application, out ); %>
 <!-- Define BreadCrumbs -->
@@ -19,7 +19,9 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"/>
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp"/>
 <c:set target="${breadcrumbs}" property="${title}" value="muc-history-settings.jsp"/>
-<%@ include file="top.jsp"%>
+
+<jsp:include page="top.jsp" flush="true" />
+
 <%!  // Global vars and methods:
 
     // Strategy definitions:

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

@@ -21,7 +21,7 @@
     }
 %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <c:set var="admin" value="${admin.manager}" />
 <% admin.init(request, response, session, application, out ); %>
@@ -32,7 +32,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="muc-server-props-edit-form.jsp" />
 
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <%  // Get parameters
     boolean save = ParamUtils.getBooleanParameter(request,"save");
@@ -119,4 +119,4 @@ Use the form below to edit Multi-User Chat server properties.
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/muc-sysadmins.jsp

@@ -10,7 +10,7 @@
                  org.jivesoftware.messenger.muc.MultiUserChatServer,
                  java.util.Iterator"
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -60,7 +60,7 @@
     int curPage = (start/range) + 1;
 %>
 
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <table  cellpadding="3" cellspacing="1" border="0" width="600">
 <tr><td colspan="8">

src/web/offline-messages.jsp

@@ -14,7 +14,7 @@
                  java.util.HashMap,
                  java.util.Map" %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" scope="page" />
 <% admin.init(request, response, session, application, out ); %>
 <!-- Define BreadCrumbs -->
@@ -22,7 +22,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="offline-messages.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <c:set var="success" />
 
@@ -279,4 +279,4 @@ variety of ways. Select the offline message handling strategy that best suites y
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/private-data-settings.jsp

@@ -8,7 +8,7 @@
                  java.util.*,
                  org.jivesoftware.messenger.*"
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -17,7 +17,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="private-data-settings.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 
@@ -86,4 +86,4 @@ may enable or disable this feature.
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/reg-settings.jsp

@@ -9,7 +9,7 @@
                  org.jivesoftware.messenger.handler.IQAuthHandler"
 %>
    
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -18,7 +18,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="reg-settings.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <c:set var="success" value="false" />
 
@@ -117,4 +117,4 @@ Use the forms below to change various aspects of user registration and login.
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

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

@@ -19,7 +19,7 @@
     }
 %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <c:set var="admin" value="${admin.manager}" />
 <% admin.init(request, response, session, application, out ); %>
@@ -30,7 +30,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="Server Properties" value="server-props.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="server-props-edit-form.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 
@@ -107,4 +107,4 @@ Use the form below to edit server properties.
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/server-props.jsp

@@ -11,7 +11,7 @@
                  java.util.Iterator,
                  org.jivesoftware.messenger.ServerPort"
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 <c:set var="admin" value="${admin.manager}" />
@@ -21,7 +21,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="server-props.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 
@@ -136,4 +136,4 @@ Below is a list of information for this <fmt:message key="short.title" bundle="$
     </div>
 </c:forEach>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/server-status.jsp

-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="ftm" %>
 <%--
   -	$RCSfile$
   -	$Revision$
@@ -14,7 +12,11 @@
                  org.jivesoftware.messenger.spi.BasicServer,
                  org.jivesoftware.messenger.auth.UnauthorizedException"
 %>
-<!-- Define Administration Bean -->
+
+<%@ taglib uri="core" prefix="c" %>
+<%@ taglib uri="fmt" prefix="ftm" %>
+
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -23,7 +25,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="server-status.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 <%  // Get parameters //
@@ -132,4 +134,4 @@ by stopping or restarting your application server.</td></tr></table>
 <a href="server-props.jsp">View Server Properties</a>
 </p>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/session-conflict.jsp

@@ -14,7 +14,7 @@
                  java.util.HashMap,
                  java.util.Map" %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -23,7 +23,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="session-conflict.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <%  // Get parameters
     boolean update = request.getParameter("update") != null;
@@ -162,4 +162,4 @@ allows them to request a different resource name.
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/session-details.jsp

@@ -21,7 +21,7 @@
 <c:set target="${breadcrumbs}" property="Session Summary" value="session-summary.jsp" />
 <c:set target="${breadcrumbs}" property="Summary Details" value="session-details.jsp" />
 <c:set var="sbar" value="session" scope="page" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <%  // Get parameters
     String jid = ParamUtils.getParameter(request, "jid");

src/web/session-filter.jsp

@@ -55,7 +55,7 @@
     }
 %>
 
-<%@ include file="header.jsp" %>
+<jsp:include page="header.jsp" flush="true" />
 
 <%  // Title of this page and breadcrumbs
     String title = "Filter Session Summary by User";
@@ -65,7 +65,7 @@
         {title, "session-filter.jsp"}
     };
 %>
-<%@ include file="title.jsp" %>
+<jsp:include page="title.jsp" flush="true" />
 
 <p>
 To filter the list of sessions by user, select the user from the list below or enter
@@ -140,4 +140,4 @@ their username in the box below.
 <%  } %>
 </script>
 
-<%@ include file="footer.jsp" %>
+<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file

src/web/session-settings.jsp

@@ -11,7 +11,7 @@
                  java.text.DateFormat,
                  org.jivesoftware.messenger.handler.IQAuthHandler" %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -21,7 +21,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="session-settings.jsp" />
 <c:set var="sbar" value="session" scope="page" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <c:set var="success" value="${param.success}" />
 
@@ -92,4 +92,4 @@
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/session-summary.jsp

@@ -12,7 +12,7 @@
 
 
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -22,7 +22,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="session-summary.jsp" />
 <c:set var="sbar" value="session" scope="page" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 
@@ -181,4 +181,4 @@ Below is a list of sessions on this server.
 List last updated: <%= dateFormatter.format(new Date()) %>
 </p>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/setup-completed.jsp

@@ -59,7 +59,7 @@
         It appears setup has already been run. To administer your community, please use the
         <a href="index.jsp"><fmt:message key="short.title" bundle="${lang}" /> Admin Tool</a>. To re-run
         setup, you need to stop your appserver, delete the "setup" property from the
-        jive-messenger.xml file, restart Messenger then reload the setup tool.
+        jive-messenger.xmlTest file, restart Messenger then reload the setup tool.
         </p>
 
         <form action="index.jsp">

src/web/setup-pause.jsp

@@ -11,7 +11,7 @@
                  org.jivesoftware.messenger.container.ServiceLookupFactory,
                  org.jivesoftware.messenger.auth.UnauthorizedException" %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 

src/web/ssl-delete.jsp

@@ -39,7 +39,7 @@
     }
 %>
 
-<%@ include file="header.jsp" %>
+<jsp:include page="header.jsp" flush="true" />
 
 <%  // Title of this page and breadcrumbs
     String title = "Delete SSL Certificate";
@@ -49,7 +49,7 @@
         { title, "ssl-delete.jsp?alias=" + alias + "&type=" + type}
     };
 %>
-<%@ include file="title.jsp" %>
+<jsp:include page="title.jsp" flush="true" />
 
 <br>
 
@@ -66,4 +66,4 @@ from the system?
 <input type="submit" name="cancel" value="Cancel">
 </form>
 
-<%@ include file="footer.jsp" %>
+<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file

src/web/ssl-settings.jsp

@@ -15,7 +15,7 @@
                  java.security.cert.Certificate,
                  java.io.ByteArrayInputStream"
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -26,7 +26,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="ssl-settings.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <%  // Get parameters:
     boolean update = request.getParameter("update") != null;
@@ -215,4 +215,4 @@ generate your own self-signed certificates.
 <input type="submit" name="update" value="Add Certificate">
 </form>
 <br />
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/style/global.css

-BODY {
-    font-size : 100%;
-}
-BODY, TD, TH {
+BODY, DIV, P, TD, TH {
     font-family : arial, helvetica, sans-serif;
+    font-size : 100%;
     font-size : 10pt;
 }
-A {
-    color : #00f;
-}
-A:visited {
-    color : #00f;
+BODY {
+    margin : 0px;
+    padding : 0px;
+    background-color : #fff;
 }
-A:hover {
-    color : #f00;
-    text-decoration : none;
+#jive-body {
+    background-image : url("../images/page-background.gif");
+    background-repeat : repeat-y;
 }
-PRE, TT {
-    font-size : 10pt;
-    font-family : courier new, monospaced;
+P {
+    margin-top : 0px;
 }
 
-/* errors */
-.jive-error-text {
-    color : #f00;
+/* --------------------------------------------- */
+/*  Header                                       */
+/* --------------------------------------------- */
+
+#jive-header {
+    width : 100%;
+    height : 62px;
+    border : 0px;
+    background-image : url("../images/header-background.gif");
+    background-repeat : repeat-x;
+    background-color : #369;
+}
+#jive-header .info {
+    font-size : 8pt;
+    color : #fff;
+    padding-right : 2em;
+    text-align : right;
 }
 
-/* success */
-.jive-success-text {
-    color : #090;
+#jive-content {
+    padding : 1em;
 }
 
-/* tabs */
-.jive-selected-tab {
-    border-width : 1px 1px 0px 1px;
-    background-color : #fff;
+/* --------------------------------------------- */
+/*  Main tabs                                    */
+/* --------------------------------------------- */
+
+#jive-header #jive-tabs UL, #jive-header #jive-tabs LI {
+    display : inline;
+    padding : 3px;
+    margin : 0px;
 }
-.jive-tab {
-    border-width : 1px 1px 1px 1px;
+#jive-header #jive-tabs LI {
+    font-family : verdana;
+    font-size : 8pt;
+    font-weight : bold;
 }
-.jive-tab-spacer, .jive-tab-spring {
-    border-width : 0px 0px 1px 0px;
+#jive-header #jive-tabs LI A {
+    color : #CEE1FA;
+    text-decoration : none;
+    padding : 3px 5px 3px 5px;
 }
-.jive-tab-bar {
-    background-color : #fff;
-    border-width : 0px 1px 1px 1px;
+#jive-header #jive-tabs LI A:hover {
+    color : #fff;
+    text-decoration : underline;
 }
-.jive-selected-tab, .jive-tab, .jive-tab-spacer, .jive-tab-spring, .jive-tab-bar
-{
-    border-color : #95B2CB;
-    border-style : solid;
+#jive-header #jive-tabs .currentlink A {
+    color : #fff;
+    text-decoration : underline;
 }
-/* tab colors, spacings, fonts */
-.jive-tab, .jive-selected-tab {
-    padding : 4px 10px 4px 10px;
-    font-family : tahoma;
+
+/* --------------------------------------------- */
+/*  Logviewer tabs                               */
+/* --------------------------------------------- */
+
+#logviewer .jive-tabs TD {
+    font-family : verdana;
     font-size : 8pt;
 }
-.jive-selected-tab A {
-    color : #000 !important;
-    text-decoration : none;
-    font-weight : bold;
+#logviewer .jive-tabs .jive-tab, .jive-tabs .jive-tab-active {
+    border : 1px #ccc solid;
+    white-space : nowrap;
+    padding : 4px 1em 4px 1em;
+    background-color : #ddd;
 }
-.jive-tab A {
-    color : #333 !important;
+#logviewer .jive-tabs .jive-tab-active {
+    border-bottom : 1px #fff solid;
+    background-color : #fff;
+}
+#logviewer .jive-tabs .jive-spacer, .jive-tabs .jive-stretch {
+    border-bottom : 1px #ccc solid;
+}
+#logviewer .jive-tabs .jive-tab A, #logviewer .jive-tabs .jive-tab-active A {
     text-decoration : none;
     font-weight : bold;
+    color : #000;
 }
-.jive-tab A:hover, .jive-selected-tab A:hover {
+#logviewer .jive-tabs .jive-tab A:hover, #logviewer .jive-tabs .jive-tab-active A:hover {
     text-decoration : underline;
 }
-.jive-tab {
-    background-color : #ddd;
+
+/* --------------------------------------------- */
+/*  Logout link                                  */
+/* --------------------------------------------- */
+
+#jive-header #jive-logout {
+    white-space : nowrap;
+}
+#jive-header #jive-logout A {
+    color : #CEE1FA;
+    font-size : 8pt;
+    font-family : verdana;
+    font-weight : bold;
+    text-decoration : none;
 }
-.jive-tab-bar TD {
-    font-family : tahoma;
+#jive-header #jive-logout A:hover {
+    color : #fff;
+    text-decoration : underline;
+}
+
+/* --------------------------------------------- */
+/*  Titles                                       */
+/* --------------------------------------------- */
+
+#jive-main #jive-title {
+    font-size : 12pt;
     font-weight : bold;
+    padding-bottom : 1em;
 }
-.jive-tab-bar A {
+
+/* --------------------------------------------- */
+/*  Breadcrumbs                                  */
+/* --------------------------------------------- */
+
+#jive-main #jive-breadcrumbs {
+    font-size : 8pt;
+    /* font-weight : bold; */
+    font-family : verdana;
+    white-space : nowrap;
+    padding-top : 2px;
+}
+#jive-main #jive-breadcrumbs A {
     color : #000;
     text-decoration : none;
 }
-.jive-tab-bar A:hover {
+#jive-main #jive-breadcrumbs A:hover {
+    color : #000;
     text-decoration : underline;
 }
-.jive-tab-section TD {
-    font-weight : normal;
-    font-family : verdana;
-    font-size : 8pt;
+
+/* --------------------------------------------- */
+/*  Sidebar                                      */
+/* --------------------------------------------- */
+
+#jive-main #jive-sidebar {
+    padding : 0px 5px 5px 5px;
+}
+#jive-main #jive-sidebar ul {
+	margin: 0; /*removes indent IE and Opera*/
+	padding: 0 0 0 0; /*removes indent Mozilla and NN7*/
+	list-style-type: none; /*turns off display of bullet*/
+	font-family: verdana, Arial, Helvetica, sans-serif;
+	font-size: 8pt;
+}
+#jive-main #jive-sidebar li {
+	margin: 0 15px 2px 0px;
+	width : 140px;
+}
+#jive-main #jive-sidebar a {
+	/*/*/display: block;
+	padding: 2px 2px 2px 10px;
+	border: 1px solid #fff;
+	width: 140px;
+	-moz-border-radius : 3px;
+	background-color: #fff; /* */
+}
+#jive-main #jive-sidebar a:link, #jive-main #jive-sidebar a:visited {
+	color: #000;
+	/*/*/color: #000;
+	text-decoration: none; /* */
+}
+#jive-main #jive-sidebar a:hover {
+    /*
+	border: 1px solid #369;
+    background-color : #CBDDEE;
+	color: #333;
+	*/
+	border : 1px solid #963;
+	background-color : #ffc;
+}
+#jive-main #jive-sidebar .currentlink a,
+#jive-main #jive-sidebar .currentlink a:link,
+#jive-main #jive-sidebar .currentlink a:visited,
+#jive-main #jive-sidebar .currentlink a:hover
+{
+	/*/*/border: 1px solid #369;
+	background-color: #CBDDEE;
+	color: #333; /* */
 }
-.jive-tab-section A {
-    color : #333 !important;
-    padding-right : 6px;
-    font-weight : normal;
+#jive-main #jive-sidebar .category {
+    padding-top : 1.5em;
+    padding-bottom : 0.5em;
+    font-weight : bold;
 }
-.jive-tab-spring {
-    font-size : 8pt;
+#jive-main #jive-sidebar .subitems LI {
+    margin-left : 10px;
+    width : 130px;
 }
-.jive-tab-logout {
-    font-size : 8pt;
+#jive-main #jive-sidebar .subitems LI A {
+    margin-left : 10px;
+    padding : 2px 2px 2px 5px;
+    width : 120px;
 }
 
-/* sidebar */
-.jive-admin-sidebar-header {
-    font-weight : bold;
+/* --------------------------------------------- */
+/*  Tasks                                        */
+/* --------------------------------------------- */
+
+#jive-runningtask {
+    margin-left : 1em;
 }
 
-/* page titles */
-.jive-admin-page-title TD {
-    font-family : tahoma, arial, helvetica, sans-serif;
-    font-size : 12;
-    font-weight : bold;
+
+/* --------------------------------------------- */
+/*  Older styles                                 */
+/* --------------------------------------------- */
+
+PRE, TT {
+    font-size : 10pt;
+    font-family : courier new, monospaced;
+}
+
+/* Messages - errors, success and info */
+.jive-error TABLE, .jive-info TABLE, .jive-success TABLE {
+    border : 1px #ccc solid;
+}
+.jive-error TD, .jive-info TD, .jive-success TD {
+    padding : 3px;
+    vertical-align : top;
 }
-.jive-admin-page-title TABLE {
-    margin-top : 5px;
-    border-bottom : 1px #95B2CB solid;
+.jive-error-text, .jive-error .jive-icon-label, .jive-error-text A, .jive-error .jive-icon-label A {
+    color : #f00;
+}
+.jive-success-text, .jive-success .jive-icon-label, .jive-success-text A, .jive-success .jive-icon-label A {
+    color : #090;
+}
+.jive-info-text, .jive-info .jive-icon-label, .jive-info-text A, .jive-info .jive-icon-label A {
+    color : #306;
 }
 
 /* tables */
@@ -122,15 +252,13 @@ PRE, TT {
     border-style : solid;
     border-width : 1px 1px 0px 1px;
 }
-.jive-table TABLE {
-    width : 100%;
-}
 .jive-table TH, .jive-table TD {
-    padding : 3px;
+    padding : 4px;
 }
 .jive-table TH {
     background-color : #eee;
     border-bottom : 1px #bbb solid;
+    border-right : 1px #bbb solid;
     text-align : left;
     font-family : verdana;
     font-size : 8pt;
@@ -153,6 +281,7 @@ PRE, TT {
     background-color : #ddd;
     font-family : verdana;
     font-size : 8pt;
+    border-right : 1px #bbb solid;
 }
 .jive-table TD TD {
     border-width : 0px;
@@ -162,86 +291,35 @@ PRE, TT {
     font-size : 8pt;
 }
 
-.jive-description {
-    font-family : verdana;
+.jive-description, .jive-description A, .jive-table .jive-date, .jive-description INPUT,
+.jive-description SELECT
+{
+    font-family : verdana,arial,helvetica,sans-serif;
     font-size : 8pt;
 }
 
 .jive-label {
-    background-color : #f8f8f8;
+    background-color : #eee;
     padding-right : 10px;
     width : 1%;
     white-space : nowrap;
 }
 
-.jive-even {
-    background-color : #f8f8f8;
-    width : 1%;
-    white-space : nowrap;
+.jive-buttons .jive-icon {
+    padding : 3px;
 }
-
-.jive-odd {
-    background-color : #ffffff;
-    width : 1%;
+.jive-buttons .jive-icon-label {
+    padding : 3px;
     white-space : nowrap;
-}
-
-/* breadcrumbs */
-.jive-breadcrumbs {
+    padding-right : 1em;
     font-size : 8pt;
-    font-weight : bold;
-    font-family : tahoma;
-}
-.jive-breadcrumbs A {
-    color : #000 !important;
-    text-decoration : none;
-}
-.jive-breadcrumbs A:hover {
-    text-decoration : underline;
+    font-family : verdana, arial, helvetica, sans-serif;
 }
 
-/* sidebar */
-.sidebar-group TH {
-    padding-left : 10px;
-    font-weight : bold;
-    text-align : left;
-}
-.sidebar-group .bullet {
-    padding-left : 10px;
-    text-align : right;
-    vertical-align : top;
-    width : 1%;
-}
-
-/* paginators */
-.jive-current {
-    background-color : #eee;
-    color : #000 !important;
-    padding : 1px 2px 1px 2px;
-    font-weight : bold;
-    text-decoration : none;
-    border : 1px #ccc solid;
-}
-
-/* styles for on/off services */
-.jive-on {
-    border : 1px #333 solid;
-    background-color : #093;
-    color : #fff;
-    font-weight : bold;
-    text-align : center;
-    padding : 3px;
-}
-.jive-off {
-    border : 1px #333 solid;
-    background-color : #930;
-    color : #fff;
-    font-weight : bold;
-    text-align : center;
-    padding : 3px;
-}
+/* --------------------------------------------- */
+/*  Calendar styles                              */
+/* --------------------------------------------- */
 
-<%-- styles for the calendar popup on the poll page --%>
 TABLE.calBgColor {
     padding : 0px;
 }
@@ -318,59 +396,22 @@ A.cal:Hover {
   text-decoration : none;
 }
 
-TABLE.box {
-	BORDER: #cccccc 1px solid;
-}
-TABLE.boxLayout {
-	BORDER-RIGHT: #003399 1px solid; PADDING-RIGHT: 0px; BORDER-TOP: #003399 1px solid; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; BORDER-LEFT: #003399 1px solid; PADDING-TOP: 0px; BORDER-BOTTOM: #003399 1px solid
-}
-TABLE.boxLayoutGrey {
-	BORDER-RIGHT: #cccccc 1px solid; PADDING-RIGHT: 0px; BORDER-TOP:#cccccc 1px solid; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; BORDER-LEFT: #cccccc 1px solid; PADDING-TOP: 0px; BORDER-BOTTOM: #cccccc 1px solid
-}
-
-.text {font-family: Arial, Helvetica, sans-serif; font-size: 12px; margin-top: 6; padding:8px; color: #000000;}
-
+/* --------------------------------------------- */
+/*  Quote original styles                        */
+/* --------------------------------------------- */
 
-.strongLink {
-	FONT-WEIGHT: bold; FONT-SIZE: 12px; COLOR: #003399; LINE-HEIGHT: 16px; FONT-STYLE: normal; FONT-FAMILY: helvetica,arial,sans-serif,verdana; TEXT-DECORATION: none
-}
-.strongLinkLarge {
-	FONT-WEIGHT: bold; FONT-SIZE: 14px; COLOR: #003399; LINE-HEIGHT: 14px; FONT-STYLE: normal; FONT-FAMILY: helvetica,arial,sans-serif,verdana; TEXT-DECORATION: none
-}
-.tableHeader {
-	FONT-WEIGHT: bold; BORDER-RIGHT: #ffffff 0px solid; BORDER-TOP: #000000 0px solid; BORDER-LEFT: #cccccc 0px solid; BORDER-BOTTOM: #999999 1px solid; BACKGROUND-COLOR: #ffffff
-}
-.tableHeaderBlue {
-	FONT-WEIGHT: bold; background-image: url("/images/admin-back.gif"); COLOR:black; BORDER-RIGHT: #ffffff 0px solid; BORDER-TOP: #000000 0px solid; BORDER-LEFT: #cccccc 0px solid; BORDER-BOTTOM: #999999 1px solid;
-}  
-.textStrong {
-	FONT-WEIGHT: bold; FONT-SIZE: 12px; LINE-HEIGHT: 16px; FONT-FAMILY: helvetica,arial,sans-serif,verdana; TEXT-ALIGN: justify; TEXT-DECORATION: none
-}
-.error {
-	FONT-WEIGHT: bold; FONT-SIZE: 12px; COLOR: #cc0000; LINE-HEIGHT: 16px; FONT-FAMILY: helvetica,arial,sans-serif,verdana; TEXT-ALIGN: justify; TEXT-DECORATION: none
-}
-.content {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #666666}
-.nicetext {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #666666}
-.nicetextsmall {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 8pt; color: #666666}
-.subhead { font-family: Arial, Helvetica, sans-serif; font-size: 12pt; color: #000066}
-.subtitle{ 
-		font-size: 14px;   
-		color: #336699; 
-		margin-bottom:10px;
-		font-weight:bold;
-}
-.highlight {
-	color: #990000;
-}
-
-/* page titles */
-.jive-admin-page-title TABLE {
-    margin-top : 5px;
-    border-bottom : 1px #ccc solid;
-}
-.jive-admin-page-title TD {
-    font-family : tahoma, arial, helvetica, sans-serif;
-    font-size : 9pt;
+.jive-quoteheader {
     font-weight : bold;
-}
-
+    width : 90%;
+    margin-left : 15px;
+}
+.jive-quote {
+    border : #d1d7dc 1px solid;
+    /* font-size : 11px; */
+    color : #444;
+    /* line-height : 125%; */
+    /* font-family : Verdana, Arial, Helvetica, sans-serif; */
+    background-color : #fafafa;
+    width : 90%;
+    margin-left : 15px;
+}
\ No newline at end of file

src/web/title.jsp

@@ -2,5 +2,45 @@
   - $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

src/web/top.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.messenger.container.ServiceLookup,
                  org.jivesoftware.messenger.container.ServiceLookupFactory,
-                 org.jivesoftware.messenger.container.Container"
-                 errorPage="error.jsp"
+                 org.jivesoftware.messenger.container.Container,
+                 org.jivesoftware.util.StringUtils"
+    errorPage="error.jsp"
 %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<%@ taglib uri="admin" prefix="admin" %>
+
+<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); %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
 <html>
 <head>
-    <title>Jive Messenger Admin</title>
-    <link rel="stylesheet" href="style/global.css" type="text/css">
-     <script language="JavaScript" type="text/javascript">
-     <!-- // code for window popups
-       function helpwin(page, hashLink) {
-          window.open('helpwin.jsp?f='+page+'&hash='+hashLink,'newWindow','width=500,height=550,menubar=yes,location=no,personalbar=no,scrollbars=yes,resize=yes');
-       }
-       //-->
-    </script>
+    <title>Jive Messenger Admin Console<%= (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="style/global.css">
 </head>
 
-<BODY text="#000000" bottomMargin="0" vLink="#0000cc" aLink="#0000cc" link="#0000cc" bgColor="#ffffff" leftMargin="1" topMargin="1" rightMargin="1" marginwidth="0" marginheight="0">
-
-<table cellspacing="0" border="0" width="100%" class="box">
-<tr>
-    <td colspan="2" width="100%" height="50">
-        <!-- Include top tabs -->
-        <%@ include file="tabs.jsp" %>
-    </td>
-</tr>
-<tr valign="top">
-    <td width="150" bgcolor="#F1F1ED">
-        <%@ include file="sidebar.jsp" %>
-    </td>
-    <td>
-        <table width="100%">
-        <tr>
-            <td>
-                <!-- Add Breadcrumbs -->
-                <%@ include file="breadcrumbs.jsp" %>
-            </td>
-        </tr>
-        <tr>
-            <td style="padding:10px;">
+<body id="jive-body">
+
+<div id="jive-header">
+<table cellpadding="0" cellspacing="0" width="100%" border="0">
+<tbody>
+    <tr>
+        <td>
+            <img src="images/header-title.gif" width="289" height="38" border="0" alt="Jive Forums Admin Console">
+        </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>Jive Messenger <%= admin.getXMPPServer().getServerInfo().getVersion().getVersionString() %></nobr>
+                </td>
+            </tr>
\ No newline at end of file
+            </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="index.jsp?logout=true">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="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

src/web/user-create-success.jsp

@@ -12,7 +12,7 @@
                  org.jivesoftware.messenger.user.*,
                  org.jivesoftware.messenger.user.UserAlreadyExistsException"
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -42,7 +42,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-create.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 
@@ -60,4 +60,4 @@ User created successfully!
 
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/user-create.jsp

@@ -24,7 +24,7 @@
                  org.dom4j.*"
 %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <jsp:useBean id="errors" class="java.util.HashMap" />
 <jsp:useBean id="userData" class="org.jivesoftware.messenger.user.spi.UserPrivateData" />
@@ -36,7 +36,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set var="sbar" value="users" scope="page" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-create.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 <%  // Get parameters //

src/web/user-delete-success.jsp

@@ -9,7 +9,7 @@
                      org.jivesoftware.messenger.user.UserManager"
 %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -20,7 +20,7 @@
 <c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-delete-success.jsp" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <p>
 The user has been deleted successfully.
@@ -30,4 +30,4 @@ The user has been deleted successfully.
 <input type="submit" name="" value="Go To User Summary">
 </form>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/user-delete.jsp

@@ -55,7 +55,7 @@
 <c:set target="${breadcrumbs}" property="User Properties" value="user-properties.jsp?userID=${param.userID}" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-delete.jsp?userID=${param.userID}" />
 <c:set var="tab" value="delete" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 

src/web/user-edit-form.jsp

@@ -74,7 +74,7 @@
 <c:set target="${breadcrumbs}" property="User Summary" value="user-summary.jsp" />
 <c:set target="${breadcrumbs}" property="User Properties" value="user-properties.jsp?userID=${param.userID}" />
 <c:set var="tab" value="edit" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 <%@ include file="user-tabs.jsp" %>
 
 <br>

src/web/user-email.jsp

@@ -26,7 +26,7 @@
     User user = userManager.getUser(userID);
 %>
 
-<%@ include file="header.jsp" %>
+<jsp:include page="header.jsp" flush="true" />
 
 <%  // Title of this page and breadcrumbs
     String title = "Email User";
@@ -37,7 +37,7 @@
         { title, "user-email.jsp?userID="+userID }
     };
 %>
-<%@ include file="title.jsp" %>
+<jsp:include page="title.jsp" flush="true" />
 
 <p>
 Use the form below to send an email to the user.
@@ -108,4 +108,4 @@ Use the form below to send an email to the user.
 document.emailform.subject.focus();
 </script>
 
-<%@ include file="footer.jsp" %>
+<jsp:include page="footer.jsp" flush="true" />
\ No newline at end of file

src/web/user-message.jsp

@@ -30,7 +30,7 @@
 %>
 
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -40,7 +40,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="test" />
 <c:set var="sbar" value="session" scope="page" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 <%

src/web/user-password-success.jsp

@@ -12,7 +12,7 @@
                  java.text.DateFormat"
 %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -24,7 +24,7 @@
 <c:set target="${breadcrumbs}" property="User Summary" value="user-summary.jsp" />
 <c:set target="${breadcrumbs}" property="User Properties" value="user-edit-form.jsp?userID=${param.userID}" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-password?userID=${param.userID}" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 <c:set var="tab" value="pass" />
 
 

src/web/user-password.jsp

@@ -58,7 +58,7 @@
 <c:set target="${breadcrumbs}" property="User Properties" value="user-properties.jsp?userID=${param.userID}" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-password.jsp?userID=${param.userID}" />
 <c:set var="tab" value="pass" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 <%@ include file="user-tabs.jsp" %>

src/web/user-properties.jsp

@@ -80,7 +80,7 @@
 <c:set target="${breadcrumbs}" property="User Summary" value="user-summary.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-properties.jsp?userID=${param.userID}" />
 <c:set var="tab" value="props" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <%@ include file="user-tabs.jsp" %>
 <br/>

src/web/user-search.jsp

@@ -8,7 +8,7 @@
                  org.jivesoftware.messenger.user.*,
                  java.util.HashMap,
                  java.util.Map" %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -18,7 +18,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-search.jsp" />
 <c:set var="sbar" value="users" />
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 <% 
 
@@ -111,4 +111,4 @@ or username.
 document.f.username.focus();
 </script>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/user-summary.jsp

@@ -12,7 +12,7 @@
                  org.jivesoftware.messenger.PresenceManager"
 %>
 
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -23,7 +23,7 @@
 <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
 <c:set target="${breadcrumbs}" property="${title}" value="user-summary.jsp" />
 <c:set var="sbar" value="users"/>
-<%@ include file="top.jsp" %>
+<jsp:include page="top.jsp" flush="true" />
 
 
 
@@ -171,4 +171,4 @@ Sorted by User ID
 
 <%  } %>
 
-<%@ include file="bottom.jsp" %>
+<jsp:include page="bottom.jsp" flush="true" />

src/web/user-tabs.jsp

@@ -10,7 +10,7 @@
                  org.jivesoftware.messenger.user.*"
     
 %>
-<!-- Define Administration Bean -->
+<%-- Define Administration Bean --%>
 <jsp:useBean id="ad" class="org.jivesoftware.util.WebManager"  />
 <% ad.init(request, response, session, application, out ); %>