Commit 56ff6912 authored by GregDThomas's avatar GregDThomas Committed by Guus der Kinderen

Display the current clustering status on the admin screens (#726)

OF-1256: Display the current clustering status on the admin screens
parent db51e056
...@@ -2369,6 +2369,11 @@ component.settings.modification.denied=Requested operation is not allowed. ...@@ -2369,6 +2369,11 @@ component.settings.modification.denied=Requested operation is not allowed.
setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
setup.ldap.user.vcard.photo=Photo/Avatar setup.ldap.user.vcard.photo=Photo/Avatar
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
muc.room.occupants.kick=Kick muc.room.occupants.kick=Kick
muc.room.occupants.kicked=Kicked {0} from the room. muc.room.occupants.kicked=Kicked {0} from the room.
muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner. muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner.
......
...@@ -2332,6 +2332,11 @@ component.settings.modification.denied=Requested operation is not allowed. ...@@ -2332,6 +2332,11 @@ component.settings.modification.denied=Requested operation is not allowed.
setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
setup.ldap.user.vcard.photo=Photo/Avatar setup.ldap.user.vcard.photo=Photo/Avatar
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
muc.room.occupants.kick=Kick muc.room.occupants.kick=Kick
muc.room.occupants.kicked=Kicked {0} from the room. muc.room.occupants.kicked=Kicked {0} from the room.
muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner. muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner.
......
...@@ -699,6 +699,11 @@ admin.console.listening=Admin console listening at ...@@ -699,6 +699,11 @@ admin.console.listening=Admin console listening at
admin.console.devmode=Using development mode admin.console.devmode=Using development mode
admin.console=Administration Console admin.console=Administration Console
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
# Server messages (to users) # Server messages (to users)
......
...@@ -235,6 +235,11 @@ admin.console.listening=Consola de administraci\u00f3n escuchando en ...@@ -235,6 +235,11 @@ admin.console.listening=Consola de administraci\u00f3n escuchando en
admin.console.devmode=Usando modo desarrollo admin.console.devmode=Usando modo desarrollo
admin.console=Consola de Administraci\u00f3n admin.console=Consola de Administraci\u00f3n
admin.logged_in_as=Conectado como {0} admin.logged_in_as=Conectado como {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
# Server messages (to users) # Server messages (to users)
......
...@@ -1945,6 +1945,11 @@ component.settings.modification.denied=Requested operation is not allowed. ...@@ -1945,6 +1945,11 @@ component.settings.modification.denied=Requested operation is not allowed.
setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
setup.ldap.user.vcard.photo=Photo/Avatar setup.ldap.user.vcard.photo=Photo/Avatar
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
muc.room.occupants.kick=Kick muc.room.occupants.kick=Kick
muc.room.occupants.kicked=Kicked {0} from the room. muc.room.occupants.kicked=Kicked {0} from the room.
muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner. muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner.
......
...@@ -2316,6 +2316,11 @@ component.settings.modification.denied=Requested operation is not allowed. ...@@ -2316,6 +2316,11 @@ component.settings.modification.denied=Requested operation is not allowed.
setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
setup.ldap.user.vcard.photo=Photo/Avatar setup.ldap.user.vcard.photo=Photo/Avatar
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
muc.room.occupants.kick=Kick muc.room.occupants.kick=Kick
muc.room.occupants.kicked=Kicked {0} from the room. muc.room.occupants.kicked=Kicked {0} from the room.
muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner. muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner.
......
...@@ -2334,6 +2334,11 @@ component.settings.modification.denied=Requested operation is not allowed. ...@@ -2334,6 +2334,11 @@ component.settings.modification.denied=Requested operation is not allowed.
setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
setup.ldap.user.vcard.photo=Photo/Avatar setup.ldap.user.vcard.photo=Photo/Avatar
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
muc.room.occupants.kick=Kick muc.room.occupants.kick=Kick
muc.room.occupants.kicked=Kicked {0} from the room. muc.room.occupants.kicked=Kicked {0} from the room.
muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner. muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner.
......
...@@ -2303,6 +2303,11 @@ component.settings.modification.denied=Requested operation is not allowed. ...@@ -2303,6 +2303,11 @@ component.settings.modification.denied=Requested operation is not allowed.
setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
setup.ldap.user.vcard.photo=Photo/Avatar setup.ldap.user.vcard.photo=Photo/Avatar
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
muc.room.occupants.kick=Kick muc.room.occupants.kick=Kick
muc.room.occupants.kicked=Kicked {0} from the room. muc.room.occupants.kicked=Kicked {0} from the room.
muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner. muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner.
......
...@@ -2336,6 +2336,11 @@ component.settings.modification.denied=Requested operation is not allowed. ...@@ -2336,6 +2336,11 @@ component.settings.modification.denied=Requested operation is not allowed.
setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
setup.ldap.user.vcard.photo=Photo/Avatar setup.ldap.user.vcard.photo=Photo/Avatar
admin.logged_in_as=Logged in as {0} admin.logged_in_as=Logged in as {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
muc.room.occupants.kick=Kick muc.room.occupants.kick=Kick
muc.room.occupants.kicked=Kicked {0} from the room. muc.room.occupants.kicked=Kicked {0} from the room.
muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner. muc.room.occupants.kickfailed=Failed to kick {0} from the room. Most likely this is because they are a moderator or owner.
......
...@@ -676,6 +676,11 @@ admin.console.listening=Painel de Controlo disponivel em ...@@ -676,6 +676,11 @@ admin.console.listening=Painel de Controlo disponivel em
admin.console.devmode=A utilizar o modo de desenvolvimento admin.console.devmode=A utilizar o modo de desenvolvimento
admin.console=Painel de Controlo admin.console=Painel de Controlo
admin.logged_in_as=Entrou como {0} admin.logged_in_as=Entrou como {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
# Server messages (to users) # Server messages (to users)
......
...@@ -26,6 +26,11 @@ admin.error.socket-setup=\u041D\u0435 \u043C\u043E\u0433\u0443 \u0443\u0441\u044 ...@@ -26,6 +26,11 @@ admin.error.socket-setup=\u041D\u0435 \u043C\u043E\u0433\u0443 \u0443\u0441\u044
admin.error.ssl=\u041D\u0435 \u043C\u043E\u0433\u0443 \u0443\u0441\u0442\u0430\u043D\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u0441 SSL admin.error.ssl=\u041D\u0435 \u043C\u043E\u0433\u0443 \u0443\u0441\u0442\u0430\u043D\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u0441 SSL
admin.error.stream=\u041E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u044B \u043E\u0448\u0438\u0431\u043A\u0438 \u0432 \u043F\u043E\u0442\u043E\u043A\u0435 admin.error.stream=\u041E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u044B \u043E\u0448\u0438\u0431\u043A\u0438 \u0432 \u043F\u043E\u0442\u043E\u043A\u0435
admin.logged_in_as=\u0412\u044B \u0432\u043E\u0448\u043B\u0438 \u043A\u0430\u043A {0} admin.logged_in_as=\u0412\u044B \u0432\u043E\u0448\u043B\u0438 \u043A\u0430\u043A {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
admin.password.update={0} \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u043F\u0430\u0440\u043E\u043B\u044F \u0434\u043B\u044F \u0441\u0435\u0430\u043D\u0441\u0430 {1} admin.password.update={0} \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u043F\u0430\u0440\u043E\u043B\u044F \u0434\u043B\u044F \u0441\u0435\u0430\u043D\u0441\u0430 {1}
admin.shutdown.now=\u0421\u0435\u0440\u0432\u0435\u0440 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0430\u0431\u043E\u0442\u0443 admin.shutdown.now=\u0421\u0435\u0440\u0432\u0435\u0440 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0430\u0431\u043E\u0442\u0443
admin.warn.license=\u041B\u0438\u0446\u0435\u043D\u0437\u0438\u043E\u043D\u043D\u044B\u0439 \u043F\u0440\u0435\u0434\u0435\u043B \u043F\u0440\u0435\u0432\u044B\u0448\u0435\u043D, \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D admin.warn.license=\u041B\u0438\u0446\u0435\u043D\u0437\u0438\u043E\u043D\u043D\u044B\u0439 \u043F\u0440\u0435\u0434\u0435\u043B \u043F\u0440\u0435\u0432\u044B\u0448\u0435\u043D, \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D
......
...@@ -239,6 +239,11 @@ admin.console.listening=Konzola spr\u00e1vcu po\u010d\u00fava na ...@@ -239,6 +239,11 @@ admin.console.listening=Konzola spr\u00e1vcu po\u010d\u00fava na
admin.console.devmode=Pou\u017e\u00edva sa v\u00fdvojov\u00fd re\u017eim admin.console.devmode=Pou\u017e\u00edva sa v\u00fdvojov\u00fd re\u017eim
admin.console=Konzola spr\u00e1vcu admin.console=Konzola spr\u00e1vcu
admin.logged_in_as=Prihl\u00e1sen\u00fd ako {0} admin.logged_in_as=Prihl\u00e1sen\u00fd ako {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
# Server messages (to users) # Server messages (to users)
......
...@@ -239,6 +239,11 @@ admin.console.listening=\u7ba1\u7406\u5e73\u53f0\u5f00\u59cb\u76d1\u542c ...@@ -239,6 +239,11 @@ admin.console.listening=\u7ba1\u7406\u5e73\u53f0\u5f00\u59cb\u76d1\u542c
admin.console.devmode=\u4f7f\u7528\u5f00\u53d1\u6a21\u5f0f admin.console.devmode=\u4f7f\u7528\u5f00\u53d1\u6a21\u5f0f
admin.console=\u7ba1\u7406\u754c\u9762 admin.console=\u7ba1\u7406\u754c\u9762
admin.logged_in_as=\u767b\u5f55\u7528\u6237 {0} admin.logged_in_as=\u767b\u5f55\u7528\u6237 {0}
admin.clustering.status=Clustering status
admin.clustering.starting=Starting up
admin.clustering.senior=Senior member
admin.clustering.junior=Junior member
admin.clustering.disabled=Disabled
# Server messages (to users) # Server messages (to users)
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<%@ page import="org.jivesoftware.util.StringUtils, <%@ page import="org.jivesoftware.util.StringUtils,
org.jivesoftware.admin.AdminConsole, org.jivesoftware.admin.AdminConsole,
org.jivesoftware.util.LocaleUtils" org.jivesoftware.util.LocaleUtils,
org.jivesoftware.openfire.cluster.ClusterManager"
errorPage="../error.jsp" errorPage="../error.jsp"
%><%@ page import="org.xmpp.packet.JID"%> %><%@ page import="org.xmpp.packet.JID"%>
...@@ -96,7 +97,21 @@ ...@@ -96,7 +97,21 @@
</div> </div>
<div id="jive-userstatus"> <div id="jive-userstatus">
<%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %><br/> <%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %><br/>
<fmt:message key="admin.logged_in_as"><fmt:param value="<strong>${usernameHtmlEscaped}</strong>"/></fmt:message> - <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %></a> <fmt:message key="admin.logged_in_as"><fmt:param value="<strong>${usernameHtmlEscaped}</strong>"/></fmt:message> - <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %></a><br/>
<fmt:message key="admin.clustering.status"/> -
<% if (ClusterManager.isClusteringEnabled()) { %>
<% if (ClusterManager.isClusteringStarted()) { %>
<% if (ClusterManager.isSeniorClusterMember()) { %>
<fmt:message key="admin.clustering.senior"/>
<% } else { %>
<fmt:message key="admin.clustering.junior"/>
<% } %>
<% } else { %>
<fmt:message key="admin.clustering.starting"/>
<% } %>
<% } else { %>
<fmt:message key="admin.clustering.disabled"/>
<% } %>
</div> </div>
<div id="jive-nav"> <div id="jive-nav">
<div id="jive-nav-left"></div> <div id="jive-nav-left"></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