Updating to new admin ui

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

src/java/org/jivesoftware/util/WebManager.java

@@ -264,7 +264,7 @@ public class WebManager extends WebBean {
         }
     }
 
-    private void showServerDown() {
+    protected void showServerDown() {
         try {
             response.sendRedirect("error-serverdown.jsp");
         }

src/web/user-create.jsp

@@ -9,12 +9,10 @@
                  java.util.Map,
                  org.jivesoftware.messenger.user.UserManager,
                  org.jivesoftware.messenger.user.*,
-                 org.jivesoftware.messenger.user.spi.*"
-%>
-
-<%@ page import="org.jivesoftware.util.*,
+                 org.jivesoftware.messenger.user.spi.*,
                  java.util.*,
                  org.jivesoftware.messenger.*,
+                 org.jivesoftware.admin.*,
                  java.io.StringWriter,
                  java.io.StringWriter,
                  java.io.IOException,
@@ -89,14 +87,16 @@
 
 
 
-<!-- Define BreadCrumbs -->
-<c:set var="title" value="Create User"  />
-<c:set var="breadcrumbs" value="${webManager.breadCrumbs}"  />
-<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:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+<%  // 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(title, "user-create.jsp"));
+    pageinfo.setPageID("user-create");
+%>
+<jsp:include page="top.jsp" flush="true" />
+<jsp:include page="title.jsp" flush="true" />
 
 <c:set var="submit" value="${param.create}" />
 <c:set var="errors" value="${errors}" />
@@ -110,7 +110,6 @@
 <%  } %>
 <form name="f" action="user-create.jsp" method="post">
 <table class="box" cellpadding="3" cellspacing="1" border="0" width="600">
-<tr class="tableHeaderBlue"><td colspan="2" align="center">Create New User</td></tr>
 <tr><td class="text" colspan="2">
 Use the form below to create a new user in the system.
 </td></tr>

src/web/user-search.jsp

@@ -7,18 +7,22 @@
 <%@ page import="org.jivesoftware.util.*,
                  org.jivesoftware.messenger.user.*,
                  java.util.HashMap,
+                 org.jivesoftware.admin.*,
                  java.util.Map" %>
 <%-- 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="User Search"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<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" />
+<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+<%  // 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(title, "user-search.jsp"));
+    pageinfo.setPageID("user-search");
+%>
 <jsp:include page="top.jsp" flush="true" />
+<jsp:include page="title.jsp" flush="true" />
 
 <% 
 
@@ -58,25 +62,14 @@
 <%  } %>
 <form name="f" action="user-search.jsp">
 <table cellpadding="3" cellspacing="1" border="0" width="600">
-<tr class="tableHeader"><td colspan="2" align="left">Search For User</td></tr>
 <tr><td class="text" colspan="2">
-Use the form below to search for users in the system. Currently, searches are keyed off userID
-or username.
-
-
+Use the form below to search for users in the system.
 
 <input type="hidden" name="search" value="true">
 
-<tr class="">
-    <td align="center">
-        or
-    </td>
-    <td>
-        &nbsp;
-    </td>
-</tr>
+
 <tr class="jive-even">
-    <td class="jive-label">
+    <td width="1%">
         Username:
     </td>
     <td>

src/web/user-summary.jsp

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