Commit 8f13afce authored by Tom Evans's avatar Tom Evans Committed by tevans

OF-660: Add local/remote node indicator for session detail and summary pages

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13609 b35dd754-fafc-0310-a699-88a17e54d16e
parent a6457cb7
...@@ -1102,6 +1102,9 @@ session.details.clientip=IP klienta ...@@ -1102,6 +1102,9 @@ session.details.clientip=IP klienta
session.details.close_connect=Zav\u0159\u00edt relaci session.details.close_connect=Zav\u0159\u00edt relaci
session.details.session_detail=Naho\u0159e jsou detaily sou\u010dasn\u00e9 relace. session.details.session_detail=Naho\u0159e jsou detaily sou\u010dasn\u00e9 relace.
session.details.back_button=Zp\u011bt na p\u0159ehled session.details.back_button=Zp\u011bt na p\u0159ehled
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -1055,6 +1055,9 @@ session.details.clientip=Client-IP ...@@ -1055,6 +1055,9 @@ session.details.clientip=Client-IP
session.details.close_connect=Verbindung schliessen session.details.close_connect=Verbindung schliessen
session.details.session_detail=Aktuelle Sitzungsdetails oben. session.details.session_detail=Aktuelle Sitzungsdetails oben.
session.details.back_button=Zur\u00fcck zur \u00dcbersicht session.details.back_button=Zur\u00fcck zur \u00dcbersicht
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -515,6 +515,9 @@ ...@@ -515,6 +515,9 @@
## Added key: 'server.props.jmx_enabled' ## Added key: 'server.props.jmx_enabled'
## Added key: 'server.props.jmx_secure' ## Added key: 'server.props.jmx_secure'
## Added key: 'server.props.jmx_port' ## Added key: 'server.props.jmx_port'
## Added key: 'session.details.node'
## Added key: 'session.details.local'
## Added key: 'session.details.remote'
# Openfire # Openfire
...@@ -1696,6 +1699,9 @@ session.details.clientip=Client IP ...@@ -1696,6 +1699,9 @@ session.details.clientip=Client IP
session.details.close_connect=Close Connection session.details.close_connect=Close Connection
session.details.session_detail=Current session details above. session.details.session_detail=Current session details above.
session.details.back_button=Back to Summary session.details.back_button=Back to Summary
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -1093,6 +1093,9 @@ session.details.clientip=IP del Cliente ...@@ -1093,6 +1093,9 @@ session.details.clientip=IP del Cliente
session.details.close_connect=Cerrar Conexi\u00f3n session.details.close_connect=Cerrar Conexi\u00f3n
session.details.session_detail=Detalles de la sesi\u00f3n actual arriba. session.details.session_detail=Detalles de la sesi\u00f3n actual arriba.
session.details.back_button=Volver al Resumen session.details.back_button=Volver al Resumen
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -923,6 +923,9 @@ session.details.clientip = IP du Client ...@@ -923,6 +923,9 @@ session.details.clientip = IP du Client
session.details.close_connect = Cl\u00F4turer Connexion session.details.close_connect = Cl\u00F4turer Connexion
session.details.session_detail = Session courante d\u00E9tail ci-contre. session.details.session_detail = Session courante d\u00E9tail ci-contre.
session.details.back_button = Retour \u00E0 la page de D\u00E9tail session.details.back_button = Retour \u00E0 la page de D\u00E9tail
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
session.row.cliked = Cliquer pour plus d'info... session.row.cliked = Cliquer pour plus d'info...
session.row.cliked_ssl = L'Utilisateur est connect\u00E9 par SSL session.row.cliked_ssl = L'Utilisateur est connect\u00E9 par SSL
......
...@@ -1126,6 +1126,9 @@ session.details.clientip=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8IP ...@@ -1126,6 +1126,9 @@ session.details.clientip=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8IP
session.details.close_connect=\u63a5\u7d9a\u306e\u30af\u30ed\u30fc\u30ba session.details.close_connect=\u63a5\u7d9a\u306e\u30af\u30ed\u30fc\u30ba
session.details.session_detail=\u4e0a\u8a18\u306e\u73fe\u5728\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u8a73\u7d30 session.details.session_detail=\u4e0a\u8a18\u306e\u73fe\u5728\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u8a73\u7d30
session.details.back_button=\u8981\u7d04\u306b\u623b\u308a\u307e\u3059 session.details.back_button=\u8981\u7d04\u306b\u623b\u308a\u307e\u3059
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -1056,6 +1056,9 @@ session.details.clientip=Client IP ...@@ -1056,6 +1056,9 @@ session.details.clientip=Client IP
session.details.close_connect=Verbinding verbreken session.details.close_connect=Verbinding verbreken
session.details.session_detail=Informatie over de huidige sessie staat hierboven. session.details.session_detail=Informatie over de huidige sessie staat hierboven.
session.details.back_button=Terug naar overzicht session.details.back_button=Terug naar overzicht
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -1047,6 +1047,9 @@ session.details.clientip=Adres IP klienta ...@@ -1047,6 +1047,9 @@ session.details.clientip=Adres IP klienta
session.details.close_connect=Zamknij po\u0142\u0105czenie session.details.close_connect=Zamknij po\u0142\u0105czenie
session.details.session_detail=Szczeg\u00f3\u0142y sesji poni\u017cej. session.details.session_detail=Szczeg\u00f3\u0142y sesji poni\u017cej.
session.details.back_button=Powr\u00f3t session.details.back_button=Powr\u00f3t
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -1100,6 +1100,9 @@ session.details.clientip=Ip do Cliente ...@@ -1100,6 +1100,9 @@ session.details.clientip=Ip do Cliente
session.details.close_connect=Fechar conex\u00e3o session.details.close_connect=Fechar conex\u00e3o
session.details.session_detail=Detalhes da sess\u00e3o corrente acima. session.details.session_detail=Detalhes da sess\u00e3o corrente acima.
session.details.back_button=Voltar para Lista session.details.back_button=Voltar para Lista
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -1074,6 +1074,9 @@ session.details.clientip=IP klienta ...@@ -1074,6 +1074,9 @@ session.details.clientip=IP klienta
session.details.close_connect=Zatvori\u0165 spojenie session.details.close_connect=Zatvori\u0165 spojenie
session.details.session_detail=Podrobnosti aktu\u00e1lnej rel\u00e1cie s\u00fa vy\u0161\u0161ie. session.details.session_detail=Podrobnosti aktu\u00e1lnej rel\u00e1cie s\u00fa vy\u0161\u0161ie.
session.details.back_button=Sp\u00e4\u0165 na zhrnutie session.details.back_button=Sp\u00e4\u0165 na zhrnutie
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -1023,6 +1023,9 @@ session.details.clientip=\u5ba2\u6237\u673a IP ...@@ -1023,6 +1023,9 @@ session.details.clientip=\u5ba2\u6237\u673a IP
session.details.close_connect=\u5173\u95ed\u8fde\u63a5 session.details.close_connect=\u5173\u95ed\u8fde\u63a5
session.details.session_detail=\u4e0a\u9762\u6709\u5f53\u524d\u4f1a\u8bdd\u8be6\u7ec6\u4fe1\u606f\u3002 session.details.session_detail=\u4e0a\u9762\u6709\u5f53\u524d\u4f1a\u8bdd\u8be6\u7ec6\u4fe1\u606f\u3002
session.details.back_button=\u8fd4\u56de\u5230\u6458\u8981 session.details.back_button=\u8fd4\u56de\u5230\u6458\u8981
session.details.node=Node
session.details.local=Local
session.details.remote=Remote
# Session row Page # Session row Page
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<%@ page import="org.jivesoftware.openfire.PresenceManager, <%@ page import="org.jivesoftware.openfire.PresenceManager,
org.jivesoftware.openfire.SessionManager, org.jivesoftware.openfire.SessionManager,
org.jivesoftware.openfire.session.ClientSession, org.jivesoftware.openfire.session.ClientSession,
org.jivesoftware.openfire.session.LocalClientSession,
org.jivesoftware.openfire.user.User, org.jivesoftware.openfire.user.User,
org.jivesoftware.openfire.user.UserManager, org.jivesoftware.openfire.user.UserManager,
org.jivesoftware.util.JiveGlobals, org.jivesoftware.util.JiveGlobals,
...@@ -134,6 +135,18 @@ ...@@ -134,6 +135,18 @@
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr>
<td class="c1">
<fmt:message key="session.details.node" />
</td>
<td>
<% if (currentSess instanceof LocalClientSession) { %>
<fmt:message key="session.details.local" />
<% } else { %>
<fmt:message key="session.details.remote" />
<% } %>
</td>
</tr>
<tr> <tr>
<td class="c1"> <td class="c1">
<fmt:message key="session.details.status" />: <fmt:message key="session.details.status" />:
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
--%> --%>
<%@ page import="org.jivesoftware.openfire.session.Session, <%@ page import="org.jivesoftware.openfire.session.Session,
org.jivesoftware.openfire.session.LocalClientSession,
org.jivesoftware.util.LocaleUtils, org.jivesoftware.util.LocaleUtils,
org.jivesoftware.util.StringUtils, org.jivesoftware.util.StringUtils,
org.xmpp.packet.JID, org.xmpp.packet.JID,
...@@ -40,6 +41,13 @@ ...@@ -40,6 +41,13 @@
<td width="15%" nowrap> <td width="15%" nowrap>
<%= StringUtils.escapeForXML(sess.getAddress().getResource()) %> <%= StringUtils.escapeForXML(sess.getAddress().getResource()) %>
</td> </td>
<td nowrap>
<% if (sess instanceof LocalClientSession) { %>
<fmt:message key="session.details.local" />
<% } else { %>
<fmt:message key="session.details.remote" />
<% } %>
</td>
<td> <td>
<% int _status = sess.getStatus(); <% int _status = sess.getStatus();
if (_status == Session.STATUS_CLOSED) { if (_status == Session.STATUS_CLOSED) {
......
...@@ -225,6 +225,7 @@ ...@@ -225,6 +225,7 @@
%> %>
</th> </th>
<th nowrap><fmt:message key="session.details.resource" /></th> <th nowrap><fmt:message key="session.details.resource" /></th>
<th nowrap><fmt:message key="session.details.node" /></th>
<th nowrap colspan="2"><fmt:message key="session.details.status" /></th> <th nowrap colspan="2"><fmt:message key="session.details.status" /></th>
<th nowrap colspan="2"><fmt:message key="session.details.presence" /></th> <th nowrap colspan="2"><fmt:message key="session.details.presence" /></th>
<th nowrap><fmt:message key="session.details.priority" /></th> <th nowrap><fmt:message key="session.details.priority" /></th>
...@@ -237,7 +238,7 @@ ...@@ -237,7 +238,7 @@
if (sessions.isEmpty()) { if (sessions.isEmpty()) {
%> %>
<tr> <tr>
<td colspan="10"> <td colspan="11">
<fmt:message key="session.summary.not_session" /> <fmt:message key="session.summary.not_session" />
......
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