UI updates.

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

src/web/muc-create-permission.jsp

@@ -158,7 +158,7 @@ Total Users: <%= userCount %>.
             <a href="muc-create-permission.jsp?userJID=<%= userJID %>&delete=true"
              title="Click to delete..."
              onclick="return confirm('Are you sure you want to remove this user from the list?');"
-             ><img src="images/button_delete.gif" width="17" height="17" border="0"></a>
+             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
         </td>
     </tr>
 <%

src/web/muc-sysadmins.jsp

@@ -155,7 +155,7 @@ Total Users: <%= userCount %>.
             <a href="muc-sysadmins.jsp?userJID=<%= userJID %>&delete=true"
              title="Click to delete..."
              onclick="return confirm('Are you sure you want to remove this user from the list?');"
-             ><img src="images/button_delete.gif" width="17" height="17" border="0"></a>
+             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
         </td>
     </tr>
 <%

src/web/session-details.jsp

@@ -157,36 +157,35 @@ user <b><%= address.getName() %></b> has multiple sessions open, they will appea
             int show = currentSess.getPresence().getShow();
             if (show == Presence.SHOW_AWAY) {
         %>
+
+            <img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away">
             Away - <%= currentSess.getPresence().getStatus() %>
 
         <%
             } else if (show == Presence.SHOW_CHAT) {
         %>
 
+            <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat">
             Available to Chat
-
         <%
             } else if (show == Presence.SHOW_DND) {
         %>
 
+            <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb">
             Do Not Disturb - <%= currentSess.getPresence().getStatus() %>
 
-        <%
-            } else if (show == Presence.SHOW_INVISIBLE) {
-        %>
-
-            Invisible - <%= currentSess.getPresence().getStatus() %>
-
         <%
             } else if (show == Presence.SHOW_NONE) {
         %>
 
+            <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online">
             Online
 
         <%
             } else if (show == Presence.SHOW_XA) {
         %>
 
+            <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away">
             Extended Away - <%= currentSess.getPresence().getStatus() %>
 
         <%

src/web/session-row.jspf

@@ -72,7 +72,7 @@
         if (_show == Presence.SHOW_AWAY) {
     %>
         <td width="1%"
-            ><img src="images/status-away.gif" width="14" height="14" border="0" title="Away"
+            ><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away"
             ></td>
         <td width="46%">
             <%  if (_stat != null) { %>
@@ -89,7 +89,7 @@
     <%  } else if (_show == Presence.SHOW_CHAT) { %>
 
         <td width="1%"
-            ><img src="images/status-chat.gif" width="14" height="14" border="0" title="Available to Chat"
+            ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat"
             ></td>
         <td width="46%">
             Available to Chat
@@ -98,7 +98,7 @@
     <%  } else if (_show == Presence.SHOW_DND) { %>
 
         <td width="1%"
-            ><img src="images/status-dnd.gif" width="14" height="14" border="0" title="Do Not Disturb"
+            ><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do Not Disturb"
             ></td>
         <td width="46%">
             <%  if (_stat != null) { %>
@@ -112,24 +112,10 @@
             <%  } %>
         </td>
 
-    <%  } else if (_show == Presence.SHOW_INVISIBLE) { %>
-
-        <td colspan="2" width="47%">
-            <%  if (_stat != null) { %>
-
-                <%= sess.getPresence().getStatus() %>
-
-            <%  } else { %>
-
-                Invisible
-
-            <%  } %>
-        </td>
-
     <%  } else if (_show == Presence.SHOW_NONE) { %>
 
         <td width="1%"
-            ><img src="images/status-online.gif" width="14" height="14" border="0" title="Online"
+            ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online"
             ></td>
         <td width="46%">
             Online
@@ -138,7 +124,7 @@
     <%  } else if (_show == Presence.SHOW_XA) { %>
 
         <td width="1%"
-            ><img src="images/status-xaway.gif" width="14" height="14" border="0" title="Extended Away"
+            ><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away"
             ></td>
         <td width="46%">
             <%  if (_stat != null) { %>
@@ -168,6 +154,6 @@
         <a href="session-summary.jsp?jid=<%= sess.getAddress() %>&close=true"
          title="Click to kill session..."
          onclick="return confirm('Are you sure you want to close this connection?');"
-         ><img src="images/button_delete.gif" width="17" height="17" border="0"></a>
+         ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
     </td>
 </tr>
\ No newline at end of file

src/web/session-summary.jsp

@@ -181,6 +181,7 @@ Below is a list of sessions on this server.
 
 <%  } %>
 
+<br>
 <p>
 List last updated: <%= dateFormatter.format(new Date()) %>
 </p>

src/web/setup-sidebar.jsp

@@ -53,21 +53,21 @@
             <tr>
             <%  if (INCOMPLETE.equals(items[i])) { %>
 
-                <td width="1%"><img src="images/red.gif" width="20" height="20" border="0"></td>
+                <td width="1%"><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0"></td>
                 <td width="99%">
                         <%= names[i] %>
                 </td>
 
             <%  } else if (IN_PROGRESS.equals(items[i])) { %>
 
-                <td width="1%"><img src="images/yellow.gif" width="20" height="20" border="0"></td>
+                <td width="1%"><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0"></td>
                 <td width="99%">
                         <a href="<%= links[i] %>"><%= names[i] %></a>
                 </td>
 
             <%  } else { %>
 
-                <td width="1%"><img src="images/green.gif" width="20" height="20" border="0"></td>
+                <td width="1%"><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0"></td>
                 <td width="99%">
                         <a href="<%= links[i] %>"><%= names[i] %></a>
                 </td>

src/web/ssl-settings.jsp

@@ -128,7 +128,7 @@ These certificates identify the server to connecting clients.
     <td class="jive-label" width="1%" align="center">
     <a href="ssl-delete.jsp?alias=<%= alias %>&type=server"
              title="Click to delete..."
-             ><img src="images/button_delete.gif" width="17" height="17" border="0"></a>
+             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
     </td><td width="99%">
     <pre>
     <%= keyStore.getCertificate(alias).toString() %>
@@ -161,7 +161,7 @@ is often empty.
     <td class="jive-label" width="1%" align="center">
     <a href="ssl-delete.jsp?alias=<%= alias %>&type=client"
              title="Click to delete..."
-             ><img src="images/button_delete.gif" width="17" height="17" border="0"></a>
+             ><img src="images/delete-16x6.gif" width="16" height="16" border="0"></a>
     </td><td width="99%">
     <pre>
     <%= trustStore.getCertificate(alias).toString() %>

src/web/tabs.jsp

-<%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="fmt" %>
-<%--
-  -	$RCSfile$
-  -	$Revision$
-  -	$Date$
---%>
-
-<%@ page import="org.jivesoftware.messenger.JiveGlobals,
-                 org.jivesoftware.util.Version,
-                 org.jivesoftware.util.WebManager" %>
-<jsp:useBean id="adm" class="org.jivesoftware.util.WebManager" />
-
-<%
-     adm.init(request, response, session, application, out );
-%>
-
-<%	// Get the "tab" parameter -- this tells us which tab to show as active
-
-    String tab = (String)pageContext.getAttribute( "sbar" );
-
-    // Set a default tab value
-	  if (tab == null) {
-    String sessionTab = (String)session.getAttribute("jive.admin.sidebarTab");
-    if (sessionTab == null) {
-      tab = "server";
-    }
-    else {
-      tab = sessionTab;
-    }
-	}
-
-    // Set the content type and character encoding
-    response.setContentType("text/html; charset=" + JiveGlobals.getCharacterEncoding());
-%>
-
-<!-- Handle SideBar -->
-<c:set var="s" value="${pageScope.sbar}" />
-<c:if test="${!empty s}">  
-  <c:set var="sidebar" value="${s}" />
-</c:if>
-
-<table class="jive-admin-header" cellpadding="0" cellspacing="0" border="0" width="100%" background="images/admin-back.gif">
-<tr>
-    <td><a href="server-status.jsp" >
-    <img src="images/header-messenger.gif" vspace="5"  border="0"></a>
-    </td>
-</tr>
-</table>
-
-<table class="jive-tabs" cellpadding="0" cellspacing="0" border="0">
-<tr>
-    <%  int tabCount = 1; %>
-
-    <td class="jive-<%= (tab.equals("server"))?"selected-":"" %>tab" width="1%" nowrap>
-        <a href="server-status.jsp">Server Manager</a>
-    </td>
-    <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
-
-    <%  tabCount++; %>
-
-    <td class="jive-<%= (tab.equals("database"))?"selected-":"" %>tab" width="1%" nowrap>
-        <a href="db-connection.jsp">Database Manager</a>
-    </td>
-    <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
-
-    <%  tabCount++; %>
-
-    <td class="jive-<%= (tab.equals("users"))?"selected-":"" %>tab" width="1%" nowrap>
-        <a href="user-summary.jsp">User Manager</a>
-    </td>
-    <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
-
-    <%  tabCount++; %>
-
-    <td class="jive-<%= (tab.equals("session"))?"selected-":"" %>tab" width="1%" nowrap>
-        <a href="session-summary.jsp">Session Manager</a>
-    </td>
-    <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
-
-    <!-- TODO:Check For Plugin -->
-
-    <td class="jive-tab-spring" width="<%= (100-(tabCount*2)) %>%" align="right" nowrap>
-        <%  if (adm.getXMPPServer() != null) { %>
-
-            <fmt:message key="title" bundle="${lang}" /> Version: <%= adm.getXMPPServer().getServerInfo().getVersion().getVersionString() %>
-
-        <%  } else { %>
-
-            Jive Messenger
-
-        <%  } %>
-    </td>
-</tr>
-<tr>
-    <td class="jive-tab-bar" colspan="99">
-        <table cellpadding="3" cellspacing="0" border="0" width="100%">
-        <tr>
-            <td width="98%">
-                <table class="jive-tab-section" cellpadding="3" cellspacing="0" border="0">
-                <tr>
-                    <%  if (tab.equals("server")) { %>
-                        <td>
-                            <a href="server-status.jsp" >Server Status</a>
-                        </td>
-                        <td>
-                            <a href="server-props.jsp" >Server Properties</a>
-                        </td>
-                        <td>
-                            <a href="license-details.jsp" >License Details</a>
-                        </td>
-                    <%  }
-                        else if (tab.equals("database")) {
-                    %>
-                        <td>
-                            <a href="db-connection.jsp" >Connection Info</a>
-                        </td>
-                    <%  }
-                        else if (tab.equals("users")) {
-                    %>
-                        <td>
-                            <a href="user-summary.jsp" >User Summary</a>
-                        </td>
-                        <td>
-                            <a href="user-search.jsp" >User Search</a>
-                        </td>
-                        <td>
-                            <a href="user-create.jsp" >Create User</a>
-                        </td>
-                    <%  }
-                        else if (tab.equals("session")) {
-                    %>
-                        <td>
-                            <a href="session-summary.jsp" >List Sessions</a>
-                        </td>
-                        <td>
-                            <a href="user-message.jsp?tabs=false" >Send Administrative Message</a>
-                        </td>
-                    <%  }
-                        else if (tab.equals("muc")) {
-                    %>
-                        <td>
-                            <a href="muc-server-props-edit-form.jsp" >Server Properties</a>
-                        </td>
-                        <td>
-                            <a href="muc-history-settings.jsp" >History Settings</a>
-                        </td>
-                    <%  } %>
-                        <!-- TODO: Change For Plugin -->
-
-                </tr>
-                </table>
-            </td>
-            <td width="1%"
-                ><a href="index.jsp?logout=true" title="Click to logout" target="_parent"
-                ><img src="images/logout-16x16.gif" width="16" height="16" border="0"
-                ></a></td>
-            <td nowrap width="1%" class="jive-tab-logout">
-                <a href="index.jsp?logout=true" title="Click to logout" target="_parent">Logout</a>
-                <%  if (adm.getUser() != null) { %>
-
-                    <span title="You are logged in as '<%= adm.getUser().getUsername() %>'">
-                    [<b><%= adm.getUser().getUsername() %></b>]
-                    </span>
-
-                <%  } %>
-            </td>
-        </tr>
-        </table>
-    </td>
-</tr>
-</table>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" bgcolor="#cccccc">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
-</table>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" bgcolor="#eeeeee">
-<tr><td><img src="images/blank.gif" width="1" height="1" border="0"></td></tr>
-</table>

src/web/user-summary.jsp

@@ -146,7 +146,7 @@ Sorted by User ID
         <td width="1%" align="center">
             <a href="user-delete.jsp?username=<%= user.getUsername() %>"
              title="Click to delete..."
-             ><img src="images/button_delete.gif" width="17" height="17" border="0"></a>
+             ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
         </td>
     </tr>