Text and UI tweaks.

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

src/i18n/messenger_i18n_en.properties

@@ -72,7 +72,7 @@
 ##       Removed duplicate key: 'session.details.unknown'
 ##       Fixed invalid value for key: 'logviewer.normal'
 ##
-##   2.2.0
+##   2.2.0 Beta 1
 ##       Added key: 'global.click_edit'
 ##       Added key: 'global.click_delete'
 ##       Added key: 'global.delete'
@@ -131,7 +131,16 @@
 ##       Removed key: 'user.summary.delete'
 ##       Removed key: 'user.summary.pages'
 ##       Removed key: 'user.summary.showing'
-
+##
+##   2.2.0 Beta 2
+##       Modified key: 'server2server.settings.title'
+##       Modified key: 'server2server.settings.info'
+##       Modified key: 'server2server.settings.label_enable_info'
+##       Modified key: 'server2server.settings.whitelist'
+##       Modified key: 'server2server.settings.remotePort'
+##       Modified key: 'component.settings.info'
+##       Modified key: 'server.session.summary.info'
+##       Removed key: 'server2server.settings.port'
 
 # Messenger
 
@@ -954,16 +963,14 @@ server.stopped.wait_restarted2=the server.
 
 # Server-to-server settings Page
 
-server2server.settings.title=Server to server Settings
-server2server.settings.info=Use the forms below to configure settings for connections between \
-        servers. Click on {0}this link{1} to view the remote servers that are currently \
-        connected to this server.
+server2server.settings.title=Server to Server Settings
+server2server.settings.info=Use the forms below to configure settings for connections to remote \
+        servers. You can also {0}view{1} the current remote server connections.
 server2server.settings.enabled.legend=Service Enabled
 server2server.settings.label_disable=Disabled
 server2server.settings.label_disable_info=Remote servers are not allowed to connect to this server.
 server2server.settings.label_enable=Enabled
-server2server.settings.label_enable_info=Remote servers can connect to this server.
-server2server.settings.port=Port:
+server2server.settings.label_enable_info=Remote servers can connect to this server on port
 server2server.settings.valid.port=Please enter a valid port.
 server2server.settings.update=Idle connections settings updated successfully.
 server2server.settings.valid.idle_minutes=Please enter a valid number for max idle minutes.
@@ -976,7 +983,7 @@ server2server.settings.allowed=Allowed to Connect
 server2server.settings.anyone=Anyone
 server2server.settings.anyone_info=Any remote server is allowed to connect to this server. Use the \
         table below to override the default settings.
-server2server.settings.whitelist=Whitelist
+server2server.settings.whitelist=White List
 server2server.settings.whitelist_info=Only some remote servers are allowed to connect to this \
         server. Use the table below to define the allowed remote servers and their settings.
 server2server.settings.disallowed=Not Allowed to Connect
@@ -984,7 +991,7 @@ server2server.settings.disallowed.info=The remote servers listed in the followin
         be able to connect to this server. Use the form below to block new remote servers from \
         connecting to this server.
 server2server.settings.domain=Domain
-server2server.settings.remotePort=Remote server port
+server2server.settings.remotePort=Port
 server2server.settings.empty_list=No remote servers
 server2server.settings.allow=Add Server
 server2server.settings.block=Block Server
@@ -997,7 +1004,7 @@ server2server.settings.confirm.deleted=Remote server information was deleted.
 # External component settings Page
 
 component.settings.title=External Components Settings
-component.settings.info=XMPP allows trusted components to connect to the server providing new \
+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.
 component.settings.enabled.legend=Service Enabled
@@ -1122,10 +1129,10 @@ session.summary.sessions_per_page=Sessions per page
 server.session.summary.title=Server Sessions Summary
 server.session.summary.close=Session closed successfully.
 server.session.summary.active=Connected Remote Servers
-server.session.summary.info=Below is a list of sessions for sending and receiving packets to/from \
-        remote servers. Server-to-server communication requires two independent connections. One \
-        is used for receiving packets and the other for sending packets. Clink on {0}this link{1} \
-        to modify the remote servers settings.
+server.session.summary.info=Below is a list of sessions to remote servers.  \
+        Server to server communication requires two independent connections: one \
+        is used for receiving packets and the other for sending packets. You can also modify \
+        {0}remote server settings{1}.
 server.session.summary.not_session=No Sessions
 server.session.summary.last_update=List last updated
 server.session.label.host=Host

src/web/server2server-settings.jsp

@@ -273,25 +273,7 @@
             <td width="99%">
                 <label for="rb02">
                 <b><fmt:message key="server2server.settings.label_enable" /></b> - <fmt:message key="server2server.settings.label_enable_info" />
-                </label>
-            </td>
-        </tr>
-        <tr valign="top">
-            <td width="1%" nowrap>
-                &nbsp;
-            </td>
-            <td width="99%">
-                <table cellpadding="3" cellspacing="0" border="0" width="100%">
-                <tr valign="top">
-                    <td width="1%" nowrap class="c1">
-                        <fmt:message key="server2server.settings.port" />
-                    </td>
-                    <td width="99%">
-                        <input type="text" size="15" maxlength="50" name="port"
-                         value="<%= port %>">
-                    </td>
-                </tr>
-                </table>
+                </label>  <input type="text" size="5" maxlength="10" name="port" value="<%= port %>">
             </td>
         </tr>
     </tbody>
@@ -429,21 +411,12 @@
     <table cellpadding="3" cellspacing="1" border="0" width="100%">
     <form action="server2server-settings.jsp" method="post">
     <tr>
-        <td nowrap width="1%">
+        <td nowrap>
             <fmt:message key="server2server.settings.domain" />
-        </td>
-        <td>
             <input type="text" size="40" name="domain" value="<%= serverAllowed ?  domain : "" %>"/>
-        </td>
-        <td nowrap width="1%">
+            &nbsp;
             <fmt:message key="server2server.settings.remotePort" />
-        </td>
-        <td>
-            <input type="text" size="40" name="remotePort"value="<%= serverAllowed ?  remotePort : "5269" %>"/>
-        </td>
-    </tr>
-    <tr align="center">
-        <td colspan="4">
+            <input type="text" size="5" name="remotePort"value="<%= serverAllowed ?  remotePort : "5269" %>"/>
             <input type="submit" name="serverAllowed" value="<fmt:message key="server2server.settings.allow" />">
         </td>
     </tr>
@@ -457,9 +430,12 @@
 
 <fieldset>
     <legend><fmt:message key="server2server.settings.disallowed" /></legend>
-    <p><fmt:message key="server2server.settings.disallowed.info" /></p>
     <div>
-    <table class="jive-table" cellpadding="0" cellspacing="0" border="0" width="100%">
+    <table cellpadding="3" cellspacing="1" border="0" width="100%"><tr><td>
+    <fmt:message key="server2server.settings.disallowed.info" />
+    </td></tr></table>
+    <p>
+    <table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="100%">
     <thead>
         <tr>
             <th width="1%">&nbsp;</th>