More cleanup/fixes

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

Admin.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
+<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Generic Application Server">
   <component name="ModuleRootManager" />
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/src/web/classes" />

Messenger.iml

@@ -14,6 +14,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Messenger" level="project" />
+    <orderEntry type="library" name="Clover" level="project" />
     <orderEntryProperties />
   </component>
 </module>

Messenger.ipr

@@ -233,6 +233,14 @@
       <JAVADOC />
       <SOURCES />
     </library>
+    <library name="Clover">
+      <CLASSES>
+        <root url="jar://C:/java/clover/1.3.2/lib/clover.jar!/" />
+        <root url="jar://C:/java/clover/1.3.2/lib/clover-idea4.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
   </component>
   <component name="uidesigner-configuration">
     <option name="INSTRUMENT_CLASSES" value="true" />

src/web/user-create.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.*,
@@ -20,9 +25,11 @@
                  java.io.PrintStream,
                  org.dom4j.xpath.DefaultXPath,
                  org.dom4j.*"
+    errorPage="error.jsp"
 %>
 
-<%-- Define Administration Bean --%>
+<%@ taglib uri="core" prefix="c"%>
+
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <jsp:useBean id="errors" class="java.util.HashMap" />
 <jsp:useBean id="userData" class="org.jivesoftware.messenger.user.spi.UserPrivateData" />
@@ -69,7 +76,7 @@
                 newUser.saveInfo();
                 
                 // Successful, so redirect
-                response.sendRedirect("user-create-success.jsp?username=" + newUser.getUsername());
+                response.sendRedirect("user-properties.jsp?success=true&username=" + newUser.getUsername());
                 return;
             }
             catch (UserAlreadyExistsException e) {
@@ -85,8 +92,6 @@
     }
 %>
 
-
-
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
     String title = "Create User";
@@ -103,9 +108,16 @@
 
 <%  if (errors.get("general") != null) { %>
 
-    <p class="jive-error-text">
-    Error creating the user account. Please check your error logs.
-    </p>
+    <div class="jive-success">
+    <table cellpadding="0" cellspacing="0" border="0">
+    <tbody>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <td class="jive-icon-label">
+        Error creating the user account. Please check your error logs.
+        </td></tr>
+    </tbody>
+    </table>
+    </div><br>
 
 <%  } %>
 

src/web/user-delete-success.jsp

-<%@ taglib uri="core" prefix="c"%><%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
---%>
-
-
-<%@ page import="org.jivesoftware.util.*,
-                     org.jivesoftware.messenger.user.UserManager"
-%>
-
-<%-- 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 Delete Successfully"  />
-<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" />
-<jsp:include page="top.jsp" flush="true" />
-
-<p>
-The user has been deleted successfully.
-</p>
-
-<form action="user-summary.jsp">
-<input type="submit" name="" value="Go To User Summary">
-</form>
-
-<jsp:include page="bottom.jsp" flush="true" />

src/web/user-delete.jsp

@@ -49,7 +49,7 @@
         }
         else {
             // Done, so redirect
-            response.sendRedirect("user-delete-success.jsp");
+            response.sendRedirect("user-summary.jsp?deletesuccess=true");
         }
         return;
     }

src/web/user-properties.jsp

@@ -95,6 +95,21 @@
 Below is a summary of user properties. To edit properties, click the "Edit" button below.
 </p>
 
+<%  if (request.getParameter("success") != null) { %>
+
+    <div class="jive-success">
+    <table cellpadding="0" cellspacing="0" border="0">
+    <tbody>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <td class="jive-icon-label">
+        New user created successfully.
+        </td></tr>
+    </tbody>
+    </table>
+    </div><br>
+
+<%  } %>
+
 <div class="jive-table">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <thead>

src/web/user-summary.jsp

@@ -57,6 +57,21 @@
 Below is a list of users in the system.
 </p>
 
+<%  if (request.getParameter("deletesuccess") != null) { %>
+
+    <div class="jive-success">
+    <table cellpadding="0" cellspacing="0" border="0">
+    <tbody>
+        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
+        <td class="jive-icon-label">
+        User deleted successfully.
+        </td></tr>
+    </tbody>
+    </table>
+    </div><br>
+
+<%  } %>
+
 <p>
 Total Users: <%= webManager.getUserManager().getUserCount() %>,
 <%  if (numPages > 1) { %>
@@ -152,7 +167,7 @@ Sorted by Username
             <a href="user-properties.jsp?username=<%= user.getUsername() %>"><%= user.getUsername() %></a>
         </td>
         <td width="40%">
-            <%= user.getInfo().getName() %>
+            <%= user.getInfo().getName() %> &nbsp;
         </td>
         <td width="26%">
             <%= dateFormatter.format(user.getInfo().getCreationDate()) %>