Updated session tab layout.

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

src/i18n/messenger_i18n_en.properties

@@ -160,6 +160,20 @@
 ##       Modified key: 'component.settings.info'
 ##       Modified key: 'server.session.summary.info'
 ##       Removed key: 'server2server.settings.port'
+##
+##  2.2.0 Release Candidate
+##      Added key: 'sidebar.active-sessions'
+##      Modified key: 'sidebar.session-summary'
+##      Modified key: 'sidebar.server-session-summary'
+##      Modified key: 'sidebar.component-session-summary'
+##      Modified key: 'server.session.summary.title'
+##      Modified key: 'component.settings.title'
+##      Modified key: 'component.session.summary.title'
+##      Modified key: 'component.session.summary.info'
+##      Modified key: 'component.session.details.title'
+##      Removed key: 'sidebar.client-session'
+##      Removed key: 'sidebar.server-session'
+##      Removed key: 'sidebar.component-session'
 
 # Messenger
 
@@ -230,17 +244,16 @@ tab.tab-users.descr=Click to manage users and groups
         sidebar.group-create.descr=Click to add a new group to the system
 tab.tab-session=Sessions
 tab.tab-session.descr=Click to manage connected sessions
-    sidebar.client-session=Client Sessions
-        sidebar.session-summary=View Client Sessions
-        sidebar.session-summary.descr=Click to manage XMPP sessions
+   sidebar.active-sessions=Active Sessions
+        sidebar.session-summary=Client Sessions
+        sidebar.session-summary.descr=Click to manage client sessions
+        sidebar.server-session-summary=Server Sessions
+        sidebar.server-session-summary.descr=Click to manage server sessions
+        sidebar.component-session-summary=Component Sessions
+        sidebar.component-session-summary.descr=Click to manage component sessions
+   sidebar.tools=Tools
         sidebar.user-message=Send Message
         sidebar.user-message.descr=Click to send a message
-    sidebar.server-session=Server Sessions
-        sidebar.server-session-summary=View Server Sessions
-        sidebar.server-session-summary.descr=Click to manage server sessions
-    sidebar.component-session=Component Sessions
-        sidebar.component-session-summary=View Component Sessions
-        sidebar.component-session-summary.descr=Click to manage component connections
 tab.tab-groupchat=Group Chat
 tab.tab-groupchat.descr=Click to manage group chat setting
     sidebar.sidebar-groupchat-settings=Group Chat Settings
@@ -1056,7 +1069,7 @@ server2server.settings.confirm.deleted=Remote server information was deleted.
 
 # External component settings Page
 
-component.settings.title=External Components Settings
+component.settings.title=External Component Settings
 component.settings.info=XMPP allows trusted components to connect to the server to provide new \
         services. Components will use a subdomain to provide their services. Click on {0}this \
         link{1} to view the external components that are currently connected to this server.
@@ -1169,17 +1182,17 @@ session.row.confirm_close=Are you sure you want to close this connection?
 
 # Session summary Page
 
-session.summary.title=Session Summary
-session.summary.close=Session closed successfully.
-session.summary.active=Active Sessions
-session.summary.info=Below is a list of sessions on this server.
-session.summary.not_session=No Sessions
+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
 
 # Server Session summary Page
 
-server.session.summary.title=Server Sessions Summary
+server.session.summary.title=Server Sessions
 server.session.summary.close=Session closed successfully.
 server.session.summary.active=Connected Remote Servers
 server.session.summary.info=Below is a list of sessions to remote servers.  \
@@ -1211,11 +1224,11 @@ server.session.details.outgoing_statistics=Statistics (Packets Sent)
 
 # External Component Session summary Page
 
-component.session.summary.title=Components Sessions Summary
+component.session.summary.title=Component Sessions
 component.session.summary.close=Session closed successfully.
 component.session.summary.active=Connected External Components
 component.session.summary.info=Below is a list of connected external components to this server. \
-        Clink on {0}this link{1} to modify the external components settings.
+        You can also modify the {0}external components settings{1}.
 component.session.summary.not_session=No Sessions
 component.session.summary.last_update=List last updated
 component.session.label.domain=Domain
@@ -1229,7 +1242,7 @@ component.session.summary.sessions_per_page=Sessions per page
 
 # External Component Session details page
 
-component.session.details.title=External Component Connections Details
+component.session.details.title=External Component Connection Details
 component.session.details.info=Below are details about the session with the external component {0}.
 
 # General Setup

src/resources/jar/admin-sidebar.xml

@@ -169,33 +169,28 @@
     <!-- Sessions -->
     <tab id="tab-session" name="${tab.tab-session}" url="session-summary.jsp" description="${tab.tab-session.descr}">
 
-        <!-- Client Sessions -->
-        <sidebar id="sidebar-session" name="${sidebar.client-session}">
+        <!-- Active Sessions -->
+        <sidebar id="sidebar-session" name="${sidebar.active-sessions}">
 
             <item id="session-summary" name="${sidebar.session-summary}"
                     url="session-summary.jsp"
                     description="${sidebar.session-summary.descr}" />
 
-            <item id="user-message" name="${sidebar.user-message}"
-                    url="user-message.jsp"
-                    description="${sidebar.user-message.descr}" />
-        </sidebar>
-
-        <!-- Server Sessions -->
-        <sidebar id="sidebar-session" name="${sidebar.server-session}">
-
             <item id="server-session-summary" name="${sidebar.server-session-summary}"
                     url="server-session-summary.jsp"
                     description="${sidebar.server-session-summary.descr}" />
 
+            <item id="component-session-summary" name="${sidebar.component-session-summary}"
+                                url="component-session-summary.jsp"
+                                description="${sidebar.component-session-summary.descr}" />
         </sidebar>
 
-        <!-- Component Sessions -->
-        <sidebar id="sidebar-session" name="${sidebar.component-session}">
+        <!-- Tools -->
+        <sidebar id="sidebar-tools" name="${sidebar.tools}">
 
-            <item id="component-session-summary" name="${sidebar.component-session-summary}"
-                    url="component-session-summary.jsp"
-                    description="${sidebar.component-session-summary.descr}" />
+            <item id="user-message" name="${sidebar.user-message}"
+                    url="user-message.jsp"
+                    description="${sidebar.user-message.descr}" />
 
         </sidebar>
     </tab>