Skip to content

O
Openfire
Commit 7f8c99ff authored by Bill Lynch's avatar Bill Lynch Committed by bill
Browse files
Options

Cleanup 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@373 b35dd754-fafc-0310-a699-88a17e54d16e
parent 65f4fdf5
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 71 deletions
src/web/style/global.css
View file @ 7f8c99ff
......@@ -267,7 +267,7 @@ PRE, TT {
border-style : solid;
border-width : 1px 1px 0px 1px;
}
.jive-table .c1 {
.jive-table .c1, fieldset .c1 {
width : 30%;
}
.jive-table TH, .jive-table TD {
......
src/web/user-delete.jsp
View file @ 7f8c99ff
<%@ 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.*,
org.jivesoftware.messenger.user.*,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.XMPPAddress"
errorPage="error.jsp"
%>
<%@ taglib uri="core" prefix="c"%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<% // Get parameters //
boolean cancel = request.getParameter("cancel") != null;
boolean delete = request.getParameter("delete") != null;
......@@ -49,11 +55,6 @@
}
%>
<c:set var="sbar" value="users" scope="page" />
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "Delete User";
......@@ -63,14 +64,9 @@
pageinfo.setSubPageID("user-delete");
pageinfo.setExtraParams("username="+username);
%>
<c:set var="tab" value="delete" />
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<%@ include file="user-tabs.jsp" %>
<p>
Are you sure you want to delete the user
<b><a href="user-properties.jsp?username=<%= user.getUsername() %>"><%= user.getUsername() %></a></b>
......@@ -90,4 +86,4 @@ from the system?
<input type="submit" name="cancel" value="Cancel">
</form>
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
src/web/user-password.jsp
View file @ 7f8c99ff
<%@ 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.*,
......@@ -10,9 +15,12 @@
org.jivesoftware.messenger.auth.AuthFactory,
org.jivesoftware.messenger.user.*,
org.jivesoftware.admin.AdminPageBean"
errorPage="error.jsp"
%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<%@ taglib uri="core" prefix="c"%>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% // Get parameters //
boolean cancel = request.getParameter("cancel") != null;
......@@ -37,7 +45,7 @@
if (password != null && passwordConfirm != null && password.equals(passwordConfirm)) {
user.setPassword(password);
// Done, so redirect
response.sendRedirect("user-password-success.jsp?username=" + username);
response.sendRedirect("user-password.jsp?success=true&username=" + username);
return;
}
else {
......@@ -46,7 +54,6 @@
}
%>
<c:set var="sbar" value="users" scope="page" />
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "Change Password";
......@@ -56,68 +63,88 @@
pageinfo.setSubPageID("user-password");
pageinfo.setExtraParams("username="+username);
%>
<c:set var="tab" value="pass" />
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<%@ include file="user-tabs.jsp" %>
<br>
<% if (errors) { %>
<p class="jive-error-text">
Error setting the password. Please make sure the password you enter is valid and
matches the confirmation password.
</p>
<div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label">
Error setting the password. Please make sure the password you enter is valid and
matches the confirmation password.
</td></tr>
</tbody>
</table>
</div><br>
<% } else 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">
Password updated successfully.
</td></tr>
</tbody>
</table>
</div><br>
<% } %>
<table cellpadding="3" cellspacing="1" border="0" width="600">
<form action="user-password.jsp" name="passform">
<tr><td colspan="2" class="text">
Use the form below to change the user's password
</td></tr>
</table>
<table cellpadding="3" cellspacing="1" border="0">
<input type="hidden" name="username" value="<%= username %>">
<p>
Use the form below to change the user's password.
</p>
<form action="user-password.jsp" name="passform" method="post">
<input type="hidden" name="username" value="<%= username %>">
<tr>
<td class="c1">
User ID:
</td>
<td class="c2">
<%= user.getUsername() %>
</td>
</tr>
<tr>
<td class="c1">
Username:
</td>
<td class="c2">
<%= user.getUsername() %>
</td>
</tr>
<tr>
<td class="c1">
New Password:
</td>
<td clas="c2">
<input type="password" name="password" value="" size="20" maxlength="50">
</td>
</tr>
<tr>
<td class="c1">
Confirm New Password:
</td>
<td class="c2">
<input type="password" name="passwordConfirm" value="" size="20" maxlength="50">
</td>
</tr>
</table>
<br>
<fieldset>
<legend>Change Password</legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr>
<td class="c1">
User ID:
</td>
<td class="c2">
<%= user.getUsername() %>
</td>
</tr>
<tr>
<td class="c1">
Username:
</td>
<td class="c2">
<%= user.getUsername() %>
</td>
</tr>
<tr>
<td class="c1">
New Password:
</td>
<td clas="c2">
<input type="password" name="password" value="" size="20" maxlength="50">
</td>
</tr>
<tr>
<td class="c1">
Confirm New Password:
</td>
<td class="c2">
<input type="password" name="passwordConfirm" value="" size="20" maxlength="50">
</td>
</tr>
</tbody>
</table>
</div>
</fieldset>
<br><br>
<input type="submit" value="Update Password" name="update">
<input type="submit" value="Cancel" name="cancel">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023