Final touches to LDAP pages.

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

src/i18n/wildfire_i18n_en.properties

@@ -151,7 +151,7 @@
 ##      Added key: 'setup.ldap.test.internal-server-error'
 ##      Added key: 'setup.ldap.group.test.description'
 ##      Added key: 'setup.ldap.group.test.label-description'
-##      Added key: 'setup.ldap.group.test.label-elements'
+##      Added key: 'setup.ldap.group.test.label-members'
 ##      Added key: 'setup.ldap.group.test.group-not-found'
 ##      Added key: 'group.read_only'
 ##      Added key: 'sidebar.profile-settings'
@@ -1530,7 +1530,7 @@ setup.ldap.user.vcard.test.description=A random profile is selected for you to r
   that an error may have been found. To view another profile click 'Next ramdom profile'. When you are finished close \
   this window.
 setup.ldap.user.vcard.test.random=Next random profile
-setup.ldap.user.test.users-not-found=No users were found using the specified configuration. Try changing the base DN,\
+setup.ldap.user.test.users-not-found=No users were found using the specified configuration. Try changing the base DN, \
    user filter or username field. 
 
 setup.ldap.group.description=Configure how Wildfire finds and loads groups from your LDAP directory. \
@@ -1559,7 +1559,7 @@ setup.ldap.group.filter_description=An optional group filter to append to the de
 setup.ldap.group.test.description=A small list of groups is selected for you to review. When you are finished close \
   this window.
 setup.ldap.group.test.label-description=Description
-setup.ldap.group.test.label-elements=Elements
+setup.ldap.group.test.label-members=Members
 setup.ldap.group.test.group-not-found=No groups were found using the specified configuration. Try changing the base DN,\
    group filter or member field. 
 
@@ -2125,5 +2125,6 @@ plugin.enterprise.installed = Enterprise plugin installed successfully. Refreshi
 
 profile-settings.title=Profile Settings
 profile-settings.info=Wildfire is currently using the following user and group system. When using \
-    LDAP it is possible to alter current integration settings.
-profile-settings.ldap_mapping_info=LDAP Mapping Information    
+    LDAP it is possible to alter current integration settings. However, if you want to change the user and group \
+    system then you will need to re-run the setup process.
\ No newline at end of file
+profile-settings.ldap_mapping_info=LDAP Settings    
\ No newline at end of file

src/i18n/wildfire_i18n_es.properties

@@ -1276,7 +1276,7 @@ setup.ldap.user.vcard.test.description=Un perfil aleatorio fue seleccionado para
   valor pueden indicar que un error ha sido encontrado. Para visualizar otro perfil haga clic en 'Siguiente \
   perfil aleatorio'. Cuando finalice cierre esta ventana.
 setup.ldap.user.vcard.test.random=Siguiente perfil aleatorio
-setup.ldap.user.test.users-not-found=No se han encontrado usuarios utilizando la configuraci\u00f3n especificada. Intente cambiar el DN base,\
+setup.ldap.user.test.users-not-found=No se han encontrado usuarios utilizando la configuraci\u00f3n especificada. Intente cambiar el DN base, \
    filtro de usuarios o campo con el nombre del usuario.
 
 setup.ldap.group.description=Configurar la manera que Wildfire busca y carga grupos de su servidor LDAP. \
@@ -1305,7 +1305,7 @@ setup.ldap.group.filter_description=Un grupo opcional de grupo que se agrega al
 setup.ldap.group.test.description=Una peque\u00f1a lista de grupos fue seleccionada para ser revisada. Cuando finalice \
   cierre esta ventana.
 setup.ldap.group.test.label-description=Descripci\u00f3n
-setup.ldap.group.test.label-elements=Elementos
+setup.ldap.group.test.label-members=Miembros
 setup.ldap.group.test.group-not-found=No se han encontrado grupos utilizando la configuraci\u00f3n especificada. Intente cambiar el DN base,\
    filtro de grupos o campo que define los miembros del grupo.
 
@@ -1841,5 +1841,6 @@ plugin.enterprise.installed = Plugin Corporativo instalado exitosamente. Refresc
 
 profile-settings.title=Seteos de Perfil
 profile-settings.info=Wildfire esta utilizando el siguiente sistema de usuarios y grupos. Al utilizar \
-    LDAP es posible cambiar la configuraci\u00f3n actual.
+    LDAP es posible cambiar la configuraci\u00f3n actual. Sin embargo, si desea modificar el sistema de usuarios y grupos \
+    entonces deber\u00e1 volver a realizar el proceso de configuraci\u00f3n inicial.
 profile-settings.ldap_mapping_info=Informaci\u00f3n del Mapeo a LDAP
\ No newline at end of file

src/java/org/jivesoftware/admin/LdapGroupTester.java

@@ -41,7 +41,7 @@ public class LdapGroupTester {
 
     /**
      * Returns fist N groups found in LDAP. The returned groups are only able to return their name,
-     * description and count of elements. Count of elements is considering all values that were found
+     * description and count of members. Count of members is considering all values that were found
      * in the member field.
      *
      * @param maxGroups max number of groups to return.
@@ -124,8 +124,8 @@ public class LdapGroupTester {
 
     /**
      * Representation of a group found in LDAP. This representatio is read-only and only provides
-     * some basic information: name, description and number of elements in the group. Note that
-     * group elements are not validated (i.e. checked that they are valid JIDs and that the JID belongs
+     * some basic information: name, description and number of members in the group. Note that
+     * group members are not validated (i.e. checked that they are valid JIDs and that the JID belongs
      * to an existing user).
      */
     public static class Group {
@@ -135,13 +135,13 @@ public class LdapGroupTester {
          * Elements that the group contains. This includes admins, members or anything listed
          * in the <tt>member field</tt>. At this point JIDs are not validated.
          */
-        private int elements;
+        private int members;
 
 
-        public Group(String name, String description, int elements) {
+        public Group(String name, String description, int members) {
             this.name = name;
             this.description = description;
-            this.elements = elements;
+            this.members = members;
         }
 
 
@@ -153,8 +153,8 @@ public class LdapGroupTester {
             return description;
         }
 
-        public int getElements() {
-            return elements;
+        public int getMembers() {
+            return members;
         }
     }
 }

src/java/org/jivesoftware/admin/LdapUserProfile.java

@@ -270,19 +270,19 @@ public class LdapUserProfile {
         homeCity = "";
         homeState = "";
         homeZip = "{homeZip}";
-        homeCountry = "{countryCode}";
+        homeCountry = "{co}";
         homePhone = "{homePhone}";
-        homeMobile = "";
+        homeMobile = "{mobile}";
         homeFax = "";
         homePager = "";
         businessStreet = "{streetAddress}";
         businessCity = "{l}";
         businessState = "{st}";
         businessZip = "{postalCode}";
-        businessCountry = "{countryCode}";
+        businessCountry = "{co}";
         businessJobTitle = "{title}";
         businessDepartment = "{department}";
-        businessPhone = "{otherTelephone}";
+        businessPhone = "{telephoneNumber}";
         businessMobile = "{mobile}";
         businessFax = "{facsimileTelephoneNumber}";
         businessPager = "{pager}";

src/web/profile-settings.jsp

@@ -120,14 +120,14 @@
                                     <%= adminDN %>
                                 </td>
                             </tr>
-                            <tr>
-                                <td colspan="2" align="center">
-                                    <input type="submit" name="edit" value="<fmt:message key="server.properties.edit" />">
-                                </td>
-                            </tr>
                         </tbody>
                         </table>
                     </td>
+                    <tr>
+                        <td colspan="2" align="center">
+                            <input type="submit" name="edit" value="<fmt:message key="server.properties.edit" />">
+                        </td>
+                    </tr>
                 </tr>
                 <% } %>
             </tbody>

src/web/setup/setup-ldap-group_test.jsp

@@ -71,13 +71,13 @@
             <tr>
                 <td width="19%" class="jive-testpanel-vcard-header"><fmt:message key="group.summary.page_name" /></td>
                 <td width="80%" class="jive-testpanel-vcard-header"><fmt:message key="setup.ldap.group.test.label-description" /></td>
-                <td width="1%" class="jive-testpanel-vcard-header"><fmt:message key="setup.ldap.group.test.label-elements" /></td>
+                <td width="1%" class="jive-testpanel-vcard-header"><fmt:message key="setup.ldap.group.test.label-members" /></td>
             </tr>
             <% for (LdapGroupTester.Group group : groups) { %>
             <tr>
                 <td valign="top" class="jive-testpanel-vcard-value"><%= group.getName()%></td>
                 <td valign="top" class="jive-testpanel-vcard-value"><%= group.getDescription()%></td>
-                <td valign="top" class="jive-testpanel-vcard-value"><%= group.getElements()%></td>
+                <td valign="top" class="jive-testpanel-vcard-value"><%= group.getMembers()%></td>
             </tr>
             <% } %>
         </table>