Commit fc7ed5c1 authored by Bill Lynch's avatar Bill Lynch Committed by bill

More cleanup


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@371 b35dd754-fafc-0310-a699-88a17e54d16e
parent 74ac6dac
......@@ -267,6 +267,9 @@ PRE, TT {
border-style : solid;
border-width : 1px 1px 0px 1px;
}
.jive-table .c1 {
width : 30%;
}
.jive-table TH, .jive-table TD {
padding : 4px;
}
......
<%@ 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,11 +15,13 @@
java.util.*,
org.jivesoftware.admin.*,
org.jivesoftware.messenger.*"
errorPage="error.jsp"
%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<jsp:useBean id="userData" class="org.jivesoftware.messenger.user.spi.UserPrivateData" />
<%@ taglib uri="core" prefix="c"%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<jsp:useBean id="userData" class="org.jivesoftware.messenger.user.spi.UserPrivateData" />
<% // Get parameters //
boolean cancel = request.getParameter("cancel") != null;
......@@ -56,11 +63,12 @@
user = webManager.getUserManager().getUser(username);
}
PresenceManager presenceManager = webManager.getPresenceManager();
// Date formatter for dates
DateFormat formatter = DateFormat.getDateInstance(DateFormat.MEDIUM);
%>
<%
// Get a private data manager //
final PrivateStore privateStore = webManager.getPrivateStore();
......@@ -70,6 +78,7 @@
nickname = "";
}
%>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs
String title = "User Properties";
......@@ -79,115 +88,120 @@
pageinfo.setSubPageID("user-properties");
pageinfo.setExtraParams("username="+username);
%>
<c:set var="tab" value="props" />
<%@ include file="top.jsp" %>
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<%@ include file="user-tabs.jsp" %>
<br/>
<table class="box" cellpadding="3" cellspacing="1" border="0" width="600">
<tr><td class="text" colspan="2">
Below is a summary of user properties. Use the tabs above to do things like edit user properties,
send the user a message (if they're online) or delete the user.
</td></tr>
<tr class="jive-odd">
<td wrap width="1%">
Username:
</td>
<td>
<%= user.getUsername() %>
</td>
</tr>
<tr class="jive-even">
<td wrap width="1%">
Status:
</td>
<td valign="middle">
<% if (presenceManager.isAvailable(user)) {
Presence presence = presenceManager.getPresence(user);
%>
<% if (presence.getShow() == Presence.SHOW_NONE) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available">
Available
<% } %>
<% if (presence.getShow() == Presence.SHOW_CHAT) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available to Chat">
Available to Chat
<% } %>
<% if (presence.getShow() == Presence.SHOW_AWAY) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Away">
Away
<% } %>
<% if (presence.getShow() == Presence.SHOW_XA) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Extended Away">
Extended Away
<% } %>
<% if (presence.getShow() == Presence.SHOW_DND) { %>
<img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="Do not Disturb">
Do not Disturb
<% } %>
<% } else { %>
<img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="Offline">
(Offline)
<% } %>
</td>
</tr>
<tr class="jive-odd">
<td wrap width="1%">
Name:
</td>
<td>
<% if (user.getInfo().getName() == null || "".equals(user.getInfo().getName())) { %>
<span style="color:#999">
<i>Not set.</i>
</span>
<% } else { %>
<i><%= user.getInfo().getName() %></i>
<% } %>
</td>
</tr>
<tr class="jive-even">
<td wrap width="1%">
Email:
</td>
<td>
<% if (user.getInfo().getEmail() == null || "".equals(user.getInfo().getEmail())) { %>
<span style="color:#999">
<i>Not set.</i>
</span>
<% } else { %>
<i><a href="mailto:<%= user.getInfo().getEmail() %>"><%= user.getInfo().getEmail() %></a></i>
<% } %>
</td>
</tr>
<tr class="jive-even">
<td wrap width="1%">
Registered:
</td>
<td>
<%= formatter.format(user.getInfo().getCreationDate()) %>
</td>
</tr>
<p>
Below is a summary of user properties. To edit properties, click the "Edit" button below.
</p>
<div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<th colspan="2">
User Properties
</th>
</tr>
</thead>
<tbody>
<tr>
<td class="c1">
Username:
</td>
<td>
<%= user.getUsername() %>
</td>
</tr>
<tr>
<td class="c1">
Status:
</td>
<td>
<% if (presenceManager.isAvailable(user)) {
Presence presence = presenceManager.getPresence(user);
%>
<% if (presence.getShow() == Presence.SHOW_NONE) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available">
Available
<% } %>
<% if (presence.getShow() == Presence.SHOW_CHAT) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available to Chat">
Available to Chat
<% } %>
<% if (presence.getShow() == Presence.SHOW_AWAY) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Away">
Away
<% } %>
<% if (presence.getShow() == Presence.SHOW_XA) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Extended Away">
Extended Away
<% } %>
<% if (presence.getShow() == Presence.SHOW_DND) { %>
<img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="Do not Disturb">
Do not Disturb
<% } %>
<% } else { %>
<img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="Offline">
(Offline)
<% } %>
</td>
</tr>
<tr>
<td class="c1">
Name:
</td>
<td>
<% if (user.getInfo().getName() == null || "".equals(user.getInfo().getName())) { %>
<span style="color:#999">
<i>Not set.</i>
</span>
<% } else { %>
<%= user.getInfo().getName() %>
<% } %>
</td>
</tr>
<tr>
<td class="c1">
Email:
</td>
<td>
<% if (user.getInfo().getEmail() == null || "".equals(user.getInfo().getEmail())) { %>
<span style="color:#999">
<i>Not set.</i>
</span>
<% } else { %>
<a href="mailto:<%= user.getInfo().getEmail() %>"><%= user.getInfo().getEmail() %></a>
<% } %>
</td>
</tr>
<tr>
<td class="c1">
Registered:
</td>
<td>
<%= formatter.format(user.getInfo().getCreationDate()) %>
</td>
</tr>
</tbody>
</table>
</div>
<br>
<br><br>
<form action="user-summary.jsp">
<input type="submit" value="User Summary">
<form action="user-edit.jsp">
<input type="submit" value="Edit Properties">
</form>
<%@ include file="footer.jsp" %>
<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
<%@ 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.*,
......@@ -14,7 +19,8 @@
org.jivesoftware.messenger.Presence"
%>
<%-- Define Administration Bean --%>
<%@ taglib uri="core" prefix="c"%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
......@@ -29,9 +35,6 @@
<jsp:include page="top.jsp" flush="true" />
<jsp:include page="title.jsp" flush="true" />
<% // Get parameters
int start = ParamUtils.getIntParameter(request,"start",0);
int range = ParamUtils.getIntParameter(request,"range",15);
......@@ -50,8 +53,6 @@
DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM);
%>
<p>
Below is a list of users in the system.
</p>
......@@ -85,18 +86,21 @@ Sorted by Username
<% } %>
<table cellpadding="3" cellspacing="0" border="0" width="600">
</table>
<table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="600">
<tr >
<th>&nbsp;</th>
<th>Online</th>
<th>Username</th>
<th>Name</th>
<th>Created</th>
<th>Edit</th>
<th>Delete</th>
</tr>
<div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<th>&nbsp;</th>
<th>Online</th>
<th>Username</th>
<th>Name</th>
<th>Created</th>
<th>Edit</th>
<th>Delete</th>
</tr>
</thead>
<tbody>
<% // Print the list of users
Iterator users = webManager.getUserManager().users(start, range);
if (!users.hasNext()) {
......@@ -158,7 +162,7 @@ Sorted by Username
title="Click to edit..."
><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
</td>
<td width="1%" align="center">
<td width="1%" align="center" style="border-right:1px #ccc solid;">
<a href="user-delete.jsp?username=<%= user.getUsername() %>"
title="Click to delete..."
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
......@@ -168,6 +172,7 @@ Sorted by Username
<%
}
%>
</tbody>
</table>
</div>
......
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