Updating to new admin ui

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

src/web/session-settings.jsp

@@ -8,6 +8,7 @@
                  java.util.Iterator,
                  org.jivesoftware.messenger.*,
                  java.util.Date,
+                 org.jivesoftware.admin.*,
                  java.text.DateFormat,
                  org.jivesoftware.messenger.handler.IQAuthHandler" %>
 
@@ -15,14 +16,16 @@
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
-<!-- Define BreadCrumbs -->
-<c:set var="title" value="Session Settings"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<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" />
+<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+<%  // 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(title, "session-settings.jsp"));
+    pageinfo.setPageID("session-settings");
+%>
 <jsp:include page="top.jsp" flush="true" />
-
+<jsp:include page="title.jsp" flush="true" />
 <c:set var="success" value="${param.success}" />
 
 
@@ -54,7 +57,7 @@
 <form action="session-settings.jsp" method="post">
 
 <table cellpadding="3" cellspacing="1" border="0" width="600">
-<tr class="tableHeader"><td colspan="3" align="left">Anonymous Logins</td></tr>
+
 <tr><td colspan=3 class="text">
 
 

src/web/session-summary.jsp

@@ -8,6 +8,7 @@
                  java.util.Iterator,
                  org.jivesoftware.messenger.*,
                  java.util.Date,
+                 org.jivesoftware.admin.*,
                  java.text.DateFormat" %>
 
 
@@ -16,13 +17,16 @@
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
-<!-- Define BreadCrumbs -->
-<c:set var="title" value="Session Summary"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<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" />
+<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+<%  // 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(title, "session-summary.jsp"));
+    pageinfo.setPageID("session-summary");
+%>
 <jsp:include page="top.jsp" flush="true" />
+<jsp:include page="title.jsp" flush="true" />
 
 
 

src/web/user-message.jsp

@@ -8,6 +8,7 @@
 <%@ page import="org.jivesoftware.util.*,
                  java.util.Iterator,
                  org.jivesoftware.messenger.*,
+                 org.jivesoftware.admin.*,
                  java.util.Date,
                  java.text.DateFormat,
                  java.util.HashMap,
@@ -31,16 +32,19 @@
 
 
 <%-- Define Administration Bean --%>
-<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
-<% admin.init(request, response, session, application, out ); %>
-
-<!-- Define BreadCrumbs -->
-<c:set var="title" value="Send Administrative Message"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<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" />
+<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 = "Send Administrative Message";
+    pageinfo.setTitle(title);
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-message.jsp"));
+    pageinfo.setPageID("user-message");
+%>
 <jsp:include page="top.jsp" flush="true" />
+<jsp:include page="title.jsp" flush="true" />
 
 
 <%
@@ -60,11 +64,11 @@
     // Get the user - a user might not be passed in if this is a system-wide message
     User user = null;
     if (username != null) {
-        user = admin.getUserManager().getUser(username);
+        user = webManager.getUserManager().getUser(username);
     }
 
     // Get the session manager
-    SessionManager sessionManager = admin.getSessionManager();
+    SessionManager sessionManager = webManager.getSessionManager();
 
     // Handle the request to send a message:
     Map errors = new HashMap();