Removed un-used i18n entries, updated version info, code cleanup, UI cleanup.

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

Wildfire.iml

@@ -250,7 +250,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/build/lib/dist/jdic.jar!/" />
@@ -259,7 +259,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/build/lib/merge/jzlib.jar!/" />
@@ -268,7 +268,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/build/lib/merge/jzlib.jar!/" />
@@ -277,7 +277,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/build/lib/i4jruntime.jar!/" />
@@ -286,7 +286,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/build/lib/dist/bouncycastle.jar!/" />
@@ -295,7 +295,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="file://$MODULE_DIR$/target/resources" />

src/i18n/wildfire_i18n_cs_CZ.properties

@@ -471,7 +471,6 @@ group.edit.note=Pozn\u00e1mka: Vzd\u00e1len\u00ed u\u017eivatel\u00e9 nebo entit
 # Group summary Page
 
 group.summary.title=P\u0159ehled skupin
-group.summary.list_group=Dole je seznam skupin v syst\u00e9mu.
 group.summary.delete_group=Skupina smaz\u00e1na \u00fasp\u011b\u0161n\u011b.
 group.summary.total_group=Celkem skupin:
 group.summary.page_name=Jm\u00e9no
@@ -999,7 +998,6 @@ session.row.confirm_close=Jste si jist\u00fd(\u00e1), \u017ee chcete zav\u0159\u
 session.summary.title=P\u0159ehled relace
 session.summary.close=Relace \u00fasp\u011b\u0161n\u011b uzav\u0159ena
 session.summary.active=Activn\u00ed relace
-session.summary.info=Dole je seznam relac\u00ed na tomto serveru
 session.summary.not_session=\u017d\u00e1dn\u00e9 relace
 session.summary.last_update=Seznam naposledy aktualizov\u00e1n 
 session.summary.sessions_per_page=Relac\u00ed na str\u00e1nku
@@ -1393,7 +1391,6 @@ user.search.search=Hledej!
 # User Summary Page
 
 user.summary.title=P\u0159ehled u\u017eivatel\u016f
-user.summary.info=Dole je seznam u\u017eivatel\u016f v syst\u00e9mu.
 user.summary.deleted=U\u017eivatel smaz\u00e1n \u00fasp\u011b\u0161n\u011b.
 user.summary.total_user=Celkem u\u017eivatel\u016f
 user.summary.sorted=Set\u0159\u00edd\u011bno podle u\u017eivatelsk\u00e9ho jm\u00e9na

src/i18n/wildfire_i18n_de.properties

@@ -472,7 +472,6 @@ group.edit.already_user={0} ist bereits in der Gruppe.
 # Group summary Page
 
 group.summary.title=Gruppen\u00fcbersicht
-group.summary.list_group=Unten ist eine Liste mit allen Gruppen im System.
 group.summary.delete_group=Gruppe erfolgreich gel\u00f6scht.
 group.summary.total_group=Summe der Gruppen:
 group.summary.page_name=Name
@@ -1001,7 +1000,6 @@ session.row.confirm_close=Sicher dass diese Verbindung beendet werden soll?
 session.summary.title=Sitzungs\u00fcbersicht
 session.summary.close=Sitzung erfolgreich beendet.
 session.summary.active=Aktive Sitzungen
-session.summary.info=Unten ist eine Liste der Sitzungen auf diesem Server.
 session.summary.not_session=Keine Sitzungen
 session.summary.last_update=Liste zuletzt aktualisiert
 session.summary.sessions_per_page=Sitzungen pro Seite
@@ -1398,7 +1396,6 @@ user.search.search=Suchen!
 # User Summary Page
 
 user.summary.title=Benutzer\u00fcbersicht
-user.summary.info=Unten ist eine Liste mit allen Benutzern des Systems.
 user.summary.deleted=Benutzer erfolgreich gel\u00f6scht.
 user.summary.total_user=Summe der Benutzer
 user.summary.sorted=Nach Benutzername sortiert

src/i18n/wildfire_i18n_en.properties

@@ -626,7 +626,6 @@ group.edit.note=Note: Remote users or entities should accept presence subscripti
 # Group summary Page
 
 group.summary.title=Group Summary
-group.summary.list_group=Below is a list of the groups in the system.
 group.summary.delete_group=Group deleted successfully.
 group.summary.total_group=Total Groups:
 group.summary.page_name=Name
@@ -1155,7 +1154,6 @@ session.row.confirm_close=Are you sure you want to close this connection?
 session.summary.title=Client Sessions
 session.summary.close=Client session closed successfully.
 session.summary.active=Active Client Sessions
-session.summary.info=Below is a list of client sessions on this server.
 session.summary.not_session=No Client Sessions
 session.summary.last_update=List last updated
 session.summary.sessions_per_page=Sessions per page
@@ -1552,7 +1550,6 @@ user.search.search=Search!
 # User Summary Page
 
 user.summary.title=User Summary
-user.summary.info=Below is a list of users in the system.
 user.summary.deleted=User deleted successfully.
 user.summary.total_user=Total Users
 user.summary.sorted=Sorted by Username

src/i18n/wildfire_i18n_es.properties

@@ -447,7 +447,6 @@ group.edit.note=Aclaraci\u00f3n: Usuarios o entidades remotas deben aceptar susc
 # Group summary Page
 
 group.summary.title=Lista de Grupos
-group.summary.list_group=A continuaci\u00f3n se muestra la lista de grupos en el sistema.
 group.summary.delete_group=Grupo borrado con \u00e9xito.
 group.summary.total_group=Total de Grupos:
 group.summary.page_name=Nombre
@@ -919,7 +918,6 @@ session.row.confirm_close=\u00bfEst\u00e1 seguro que desea cerrar esta conexi\u0
 session.summary.title=Sesiones de Clientes
 session.summary.close=Sesi\u00f3n cerrada con \u00e9xito.
 session.summary.active=Sesiones Activas
-session.summary.info=A continuaci\u00f3n se encuentra la lista de sesiones activas en este servidor.
 session.summary.not_session=No hay sesiones
 session.summary.last_update=\u00daltima actializaci\u00f3n de la lista
 session.summary.sessions_per_page=Sesiones por p\u00e1gina
@@ -1277,7 +1275,6 @@ user.search.search=\u00a1Buscar!
 # User Summary Page
 
 user.summary.title=Lista de Usuarios
-user.summary.info=A continuaci\u00f3n se muestra una lista de los usuarios del sistema.
 user.summary.deleted=Usuario borrado con \u00e9xito.
 user.summary.total_user=Total de Usuarios
 user.summary.sorted=Ordenados por Nombre de Usuario

src/i18n/wildfire_i18n_fr.properties

@@ -510,7 +510,6 @@ group.edit.note=Note: Les utilisateurs ou entit\u00e9s distants les souscription
 # Group summary Page
 
 group.summary.title=R\u00e9sum\u00e9 du Groupe
-group.summary.list_group=Ci-dessous vous trouverez la liste des groupes du syst\u00e8me.
 group.summary.delete_group=Groupe supprim\u00e9 avec succ\u00e8s.
 group.summary.total_group=Nombre Total de Groupes :
 group.summary.page_name=Nom
@@ -1079,7 +1078,6 @@ session.row.confirm_close=Etes-vous s\u00fbr de vouloir cl\u00f4turer cette conn
 session.summary.title=Liste des Sessions
 session.summary.close=Session cl\u00f4tur\u00e9 avec succ\u00e8s.
 session.summary.active=Sessions Actives
-session.summary.info=Liste des sessions sur le serveur.
 session.summary.not_session=Pas de Session
 session.summary.last_update=Derni\u00e8re mises \u00e0 jour de la liste
 session.summary.sessions_per_page=Sessions per page
@@ -1501,7 +1499,6 @@ user.search.search=Recherche !
 # User Summary Page
 
 user.summary.title=Liste des Utilisateurs
-user.summary.info=Ci-dessous vous trouverez la liste des utilisateurs du syst\u00e8me.
 user.summary.deleted=Utilisateur supprim\u00e9 avec succ\u00e8s.
 user.summary.total_user=Nombre Total d'Utilisateurs
 user.summary.sorted=Tri\u00e9 par Utilisateur

src/i18n/wildfire_i18n_nl.properties

@@ -468,7 +468,6 @@ group.edit.already_user={0} is reeds in de groep.
 # Group summary Page
 
 group.summary.title=Groepsoverzicht
-group.summary.list_group=Hieronder staat een lijst van alle groepen op het systeem.
 group.summary.delete_group=Groep is succesvol verwijderd.
 group.summary.total_group=Aantal groepen:
 group.summary.page_name=Naam
@@ -998,6 +997,7 @@ session.row.confirm_close=Wilt u deze verbinding verbreken?
 session.summary.title=Overzicht van de sessies
 session.summary.close=Sessie succesvol gesloten.
 session.summary.active=Actieve sessies
+
 session.summary.info=Hieronder staat een lijst van de sessies op deze server.
 session.summary.not_session=Geen sessies
 session.summary.last_update=Lijst laatst geüpdate op
@@ -1395,7 +1395,6 @@ user.search.search=Zoeken
 # User Summary Page
 
 user.summary.title=Gebruikersoverzicht
-user.summary.info=Hieronder staat een lijst van de gebruikers op het systeem.
 user.summary.deleted=De gebruiker is succesvol verwijdert.
 user.summary.total_user=Aantal gebruikers
 user.summary.sorted=Sorteren op gebruikersnaam

src/i18n/wildfire_i18n_pl_PL.properties

@@ -471,7 +471,6 @@ group.edit.note=Uwaga: Zdalni u\u017cytkownicy lub jenostki powinny akceptowa\u0
 # Group summary Page
 
 group.summary.title=Informacje o grupach
-group.summary.list_group=Poni\u017cej znajduje si\u0119 lista grup w systemie.
 group.summary.delete_group=Usuni\u0119to grup\u0119.
 group.summary.total_group=Grup og\u00f3\u0142em:
 group.summary.page_name=Nazwa
@@ -989,7 +988,6 @@ session.row.confirm_close=Czy chcesz zako\u0144czy\u0107 po\u0142\u0105czenie?
 session.summary.title=Sesje klienta
 session.summary.close=Sesja klienta zako\u0144czona.
 session.summary.active=Aktywne sesje klient\u00f3w
-session.summary.info=Poni\u017cej znajduje si\u0119 lista sesji klient\u00f3w na serwerze.
 session.summary.not_session=Brak sesji klienta
 session.summary.last_update=Ostatnia aktualizacja listy
 session.summary.sessions_per_page=Sesji na stronie
@@ -1373,7 +1371,6 @@ user.search.search=Szukaj!
 # User Summary Page
 
 user.summary.title=Podsumowanie u\u017cytkownik\u00f3w
-user.summary.info=Poni\u017cej znajduje si\u0119 lista u\u017cytkownik\u00f3w w systemie.
 user.summary.deleted=U\u017cytkownik usuni\u0119ty.
 user.summary.total_user=U\u017cytkownik\u00f3w og\u00f3\u0142em
 user.summary.sorted=Posortowane wed\u0142ug nazwy

src/i18n/wildfire_i18n_pt_BR.properties

@@ -469,7 +469,6 @@ group.edit.note=Aviso: Usu\u00e1rios remotos ou entidades devem aceitar subscri\
 # Group summary Page
 
 group.summary.title=Lista de Grupos
-group.summary.list_group=Abaixo est\u00e1 a lista dos grupos do sistema.
 group.summary.delete_group=Grupo apagado com sucesso.
 group.summary.total_group=Total de Grupos:
 group.summary.page_name=Nome
@@ -998,7 +997,6 @@ session.row.confirm_close=Tem certeza que voc\u00ea quer fechar esta conex\u00e3
 session.summary.title=Lista de Sess\u00f5es
 session.summary.close=Sess\u00e3o fechada com sucesso.
 session.summary.active=Sess\u00f5es Ativas
-session.summary.info=Abaixo est\u00e1 a lista de sess\u00f5es neste servidor.
 session.summary.not_session=Sem Sess\u00f5es
 session.summary.last_update=\u00daltima atualiza\u00e7\u00e3o da lista
 session.summary.sessions_per_page=Sess\u00f5es or p\u00e1gina
@@ -1394,7 +1392,6 @@ user.search.search=Buscar!
 # User Summary Page
 
 user.summary.title=Lista de Usu\u00e1rios
-user.summary.info=Abaixo segue a lista de usu\u00e1rios do sistema.
 user.summary.deleted=Usu\u00e1rio apagado com \u00eaxito.
 user.summary.total_user=Total de Usu\u00e1rios
 user.summary.sorted=Ordenado por Nome de Usu\u00e1rio

src/i18n/wildfire_i18n_zh_CN.properties

@@ -451,7 +451,6 @@ group.edit.note=\u6ce8\u610f\uff1a\u8fdc\u7a0b\u7528\u6237\u6216\u5b9e\u4f53\u5c
 # Group summary Page
 
 group.summary.title=\u7ec4\u6458\u8981
-group.summary.list_group=\u4e0b\u9762\u662f\u7cfb\u7edf\u4e2d\u7684\u7ec4\u5217\u8868\u3002
 group.summary.delete_group=\u5df2\u6210\u529f\u5220\u9664\u7ec4\u3002
 group.summary.total_group=\u7ec4\u603b\u6570\uff1a
 group.summary.page_name=\u540d\u79f0
@@ -924,7 +923,6 @@ session.row.confirm_close=\u786e\u5b9e\u8981\u5173\u95ed\u6b64\u8fde\u63a5\u5417
 session.summary.title=\u5ba2\u6237\u7aef\u4f1a\u8bdd
 session.summary.close=\u5ba2\u6237\u7aef\u4f1a\u8bdd\u6210\u529f\u5173\u95ed\u3002
 session.summary.active=\u6709\u6548\u7684\u5ba2\u6237\u7aef\u4f1a\u8bdd
-session.summary.info=\u4e0b\u9762\u662f\u672c\u670d\u52a1\u5668\u4e0a\u7684\u5ba2\u6237\u7aef\u4f1a\u8bdd\u5217\u8868
 session.summary.not_session=\u6ca1\u6709\u5ba2\u6237\u7aef\u4f1a\u8bdd
 session.summary.last_update=\u4e0a\u6b21\u66f4\u65b0\u5217\u8868\u65f6\u95f4\uff1a
 session.summary.sessions_per_page=\u6bcf\u9875\u8fde\u63a5\u670d\u52a1
@@ -1280,7 +1278,6 @@ user.search.search=\u641c\u7d22\uff01
 # User Summary Page
 
 user.summary.title=\u7528\u6237\u6458\u8981
-user.summary.info=\u4e0b\u9762\u662f\u7cfb\u7edf\u4e2d\u7684\u7528\u6237\u5217\u8868\u3002
 user.summary.deleted=\u5df2\u6210\u529f\u5220\u9664\u7528\u6237\u3002
 user.summary.total_user=\u7528\u6237\u603b\u6570
 user.summary.sorted=\u6309\u7528\u6237\u540d\u6392\u5e8f

src/java/org/jivesoftware/wildfire/XMPPServer.java

@@ -281,7 +281,7 @@ public class XMPPServer {
 
         name = JiveGlobals.getProperty("xmpp.domain", "127.0.0.1").toLowerCase();
 
-        version = new Version(2, 6, 0, Version.ReleaseStatus.Beta, -1);
+        version = new Version(2, 6, 0, Version.ReleaseStatus.Release, -1);
         if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
             setupMode = false;
         }

src/java/org/jivesoftware/wildfire/ldap/LdapGroupProvider.java

@@ -257,10 +257,10 @@ public class LdapGroupProvider implements GroupProvider {
         String username = server.isLocal(user) ? JID.unescapeNode(user.getNode()) : user.toString();
         if (!manager.isPosixMode()) {
             try {
-                username = manager.findUserDN(username) + "," +
-                        manager.getBaseDN();
+                username = manager.findUserDN(username) + "," + manager.getBaseDN();
             }
             catch (Exception e) {
+                Log.error("Could not find user in LDAP " + username);
                 return new ArrayList<Group>();
             }
         }

src/web/group-edit.jsp

@@ -520,24 +520,24 @@
                             Presence presence = presenceManager.getPresence(user);
                     %>
                     <% if (presence.getShow() == null) { %>
-                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
+                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="user.properties.available" />" alt="<fmt:message key="user.properties.available" />">
                     <% } %>
                     <% if (presence.getShow() == Presence.Show.chat) { %>
-                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
+                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.chat_available" />" alt="<fmt:message key="session.details.chat_available" />">
                     <% } %>
                     <% if (presence.getShow() == Presence.Show.away) { %>
-                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
+                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.away" />" alt="<fmt:message key="session.details.away" />">
                     <% } %>
                     <% if (presence.getShow() == Presence.Show.xa) { %>
-                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
+                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.extended" />" alt="<fmt:message key="session.details.extended" />">
                     <% } %>
                     <% if (presence.getShow() == Presence.Show.dnd) { %>
-                    <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
+                    <img src="images/user-red-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.not_disturb" />" alt="<fmt:message key="session.details.not_disturb" />">
                     <% } %>
 
                     <%  } else { %>
 
-                    <img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />">
+                    <img src="images/user-clear-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="user.properties.offline" />" alt="<fmt:message key="user.properties.offline" />">
 
                     <%  } %>
                     </td>
@@ -575,21 +575,21 @@
                      <%  if (user != null && presenceManager.isAvailable(user)) {
                             Presence presence = presenceManager.getPresence(user);
                     %>
-                    <% if (presence.getShow() == null) { %>
-                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
-                    <% } %>
-                    <% if (presence.getShow() == Presence.Show.chat) { %>
-                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
-                    <% } %>
-                    <% if (presence.getShow() == Presence.Show.away) { %>
-                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
-                    <% } %>
-                    <% if (presence.getShow() == Presence.Show.xa) { %>
-                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
-                    <% } %>
-                    <% if (presence.getShow() == Presence.Show.dnd) { %>
-                    <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
-                    <% } %>
+                        <% if (presence.getShow() == null) { %>
+                        <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
+                        <% } %>
+                        <% if (presence.getShow() == Presence.Show.chat) { %>
+                        <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
+                        <% } %>
+                        <% if (presence.getShow() == Presence.Show.away) { %>
+                        <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
+                        <% } %>
+                        <% if (presence.getShow() == Presence.Show.xa) { %>
+                        <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
+                        <% } %>
+                        <% if (presence.getShow() == Presence.Show.dnd) { %>
+                        <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
+                        <% } %>
 
                     <%  } else { %>
 

src/web/group-summary.jsp

@@ -49,10 +49,6 @@
     int curPage = (start/range) + 1;
 %>             
 
-<p>
-<fmt:message key="group.summary.list_group" />
-</p>
-
 <%  if (request.getParameter("deletesuccess") != null) { %>
 
     <div class="jive-success">
@@ -69,7 +65,7 @@
 <%  } %>
 
 <p>
-<fmt:message key="group.summary.total_group" /> <%= webManager.getGroupManager().getGroupCount() %>
+<fmt:message key="group.summary.total_group" /> <b><%= webManager.getGroupManager().getGroupCount() %></b>
 <%  if (numPages > 1) { %>
 
     , <fmt:message key="global.showing" /> <%= (start+1) %>-<%= (start+range) %>

src/web/session-details.jsp

@@ -176,33 +176,33 @@
                 if (show == Presence.Show.away) {
             %>
 
-                <img src="images/im_away.gif" width="16" height="16" border="0" title="Away">
+                <img src="images/im_away.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.away" />" alt="<fmt:message key="session.details.away" />">
                 <fmt:message key="session.details.away" /> <%= statusTxt %>
 
             <%
                 } else if (show == Presence.Show.chat) {
             %>
-                <img src="images/im_free_chat.gif" width="16" height="16" border="0" title="Available to Chat">
+                <img src="images/im_free_chat.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.chat_available" />" alt="<fmt:message key="session.details.chat_available" />">
                 <fmt:message key="session.details.chat_available" /> <%= statusTxt %>
             <%
                 } else if (show == Presence.Show.dnd) {
             %>
 
-                <img src="images/im_dnd.gif" width="16" height="16" border="0" title="Do not Disturb">
+                <img src="images/im_dnd.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.not_disturb" />" alt="<fmt:message key="session.details.not_disturb" />">
                 <fmt:message key="session.details.not_disturb" /> <%= statusTxt %>
 
             <%
                 } else if (show == null) {
             %>
 
-                <img src="images/im_available.gif" width="16" height="16" border="0" title="Online">
+                <img src="images/im_available.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.online" />" alt="<fmt:message key="session.details.online" />">
                 <fmt:message key="session.details.online" /> <%= statusTxt %>
 
             <%
                 } else if (show == Presence.Show.xa) {
             %>
 
-                <img src="images/im_away.gif" width="16" height="16" border="0" title="Extended Away">
+                <img src="images/im_away.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.extended" />" alt="<fmt:message key="session.details.extended" />">
                 <fmt:message key="session.details.extended" /> <%= statusTxt %>
 
             <%

src/web/session-summary.jsp

@@ -102,7 +102,7 @@
 
             <%  if (numPages > 1) { %>
 
-                - <fmt:message key="global.showing" /> <%= (start+1) %>-<%= (start+range) %>
+                -- <fmt:message key="global.showing" /> <%= (start+1) %>-<%= (start+range) %>
 
             <%  } %>
 
@@ -123,7 +123,7 @@
                 ]
 
             <%  } %>
-            - <fmt:message key="session.summary.sessions_per_page" />:
+            -- <fmt:message key="session.summary.sessions_per_page" />:
             <select size="1" name="range" onchange="this.form.submit();">
 
                 <%  for (int i=0; i<RANGE_PRESETS.length; i++) { %>
@@ -152,9 +152,6 @@
 </tbody>
 </table>
 <br>
-<p>
-<fmt:message key="session.summary.info" />
-</p>
 
 <div class="jive-table">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">

src/web/user-properties.jsp

@@ -130,24 +130,19 @@
                     Presence presence = presenceManager.getPresence(user);
             %>
                 <% if (presence.getShow() == null) { %>
-                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
-                    <fmt:message key="user.properties.available" />
+                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="user.properties.available" />" alt="<fmt:message key="user.properties.available" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.chat) { %>
-                    <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
-                    <fmt:message key="session.details.chat_available" />
+                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.chat_available" />" alt="<fmt:message key="session.details.chat_available" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.away) { %>
-                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
-                    <fmt:message key="session.details.away" />
+                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.away" />" alt="<fmt:message key="session.details.away" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.xa) { %>
-                    <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
-                    <fmt:message key="session.details.extended" />
+                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.extended" />" alt="<fmt:message key="session.details.extended" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.dnd) { %>
-                    <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
-                    <fmt:message key="session.details.not_disturb" />
+                <img src="images/user-red-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.not_disturb" />" alt="<fmt:message key="session.details.not_disturb" />">
                 <% } %>
 
             <%  } else { %>

src/web/user-summary.jsp

@@ -56,10 +56,6 @@
     int curPage = (start/range) + 1;
 %>
 
-<p>
-<fmt:message key="user.summary.info" />
-</p>
-
 <style type="text/css">
 .jive-current {
     font-weight : bold;
@@ -84,7 +80,7 @@
 
 <p>
 <fmt:message key="user.summary.total_user" />:
-<%= LocaleUtils.getLocalizedNumber(webManager.getUserManager().getUserCount()) %> --
+<b><%= LocaleUtils.getLocalizedNumber(webManager.getUserManager().getUserCount()) %></b> --
 
 <%  if (numPages > 1) { %>
 
@@ -94,7 +90,7 @@
 <%  } %>
 <fmt:message key="user.summary.sorted" />
 
-- <fmt:message key="user.summary.users_per_page" />:
+-- <fmt:message key="user.summary.users_per_page" />:
 <select size="1" onchange="location.href='user-summary.jsp?start=0&range=' + this.options[this.selectedIndex].value;">
 
     <%  for (int i=0; i<RANGE_PRESETS.length; i++) { %>
@@ -189,19 +185,19 @@
                     Presence presence = presenceManager.getPresence(user);
             %>
                 <% if (presence.getShow() == null) { %>
-                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
+                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="user.properties.available" />" alt="<fmt:message key="user.properties.available" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.chat) { %>
-                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
+                <img src="images/user-green-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.chat_available" />" alt="<fmt:message key="session.details.chat_available" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.away) { %>
-                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
+                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.away" />" alt="<fmt:message key="session.details.away" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.xa) { %>
-                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
+                <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.extended" />" alt="<fmt:message key="session.details.extended" />">
                 <% } %>
                 <% if (presence.getShow() == Presence.Show.dnd) { %>
-                <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
+                <img src="images/user-red-16x16.gif" width="16" height="16" border="0" title="<fmt:message key="session.details.not_disturb" />" alt="<fmt:message key="session.details.not_disturb" />">
                 <% } %>
 
             <%  } else { %>