Skip to content

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

More cleanup 


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

Technounit-GROUP 2023