Reuse of existing LDAP setup wizard in admin console. JM-877

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

src/i18n/wildfire_i18n_en.properties

@@ -154,6 +154,9 @@
 ##      Added key: 'setup.ldap.group.test.label-elements'
 ##      Added key: 'setup.ldap.group.test.group-not-found'
 ##      Added key: 'group.read_only'
+##      Added key: 'sidebar.profile-settings'
+##      Added key: 'sidebar.profile-settings.descr'
+##      Added section: 'profile-settings.*'
 
 # Wildfire
 
@@ -182,6 +185,8 @@ tab.server.descr=Click to manage server settings
         sidebar.server-email=Email Settings
         sidebar.server-email.descr=Click to configure email settings
     sidebar.sidebar-server-settings=Server Settings
+        sidebar.profile-settings=Profile Settings
+        sidebar.profile-settings.descr=Click to configure user and group profile settings
         sidebar.server2server-settings=Server to Server
         sidebar.server2server-settings.descr=Click to configure server to server settings
         sidebar.external-components-settings=External Components
@@ -2114,4 +2119,11 @@ calendar.time = Time:
 plugin.enterprise.download.error =  Unable to download the Enterprise plugin. Please try again.
 plugin.enterprise.dont.show= Don't show this page again
 plugin.enterprise.installing = Installing Enterprise Plugin...
-plugin.enterprise.installed = Enterprise plugin installed successfully. Refreshing momentarily...
+plugin.enterprise.installed = Enterprise plugin installed successfully. Refreshing momentarily...
\ No newline at end of file
+
+# Profile Settings
+
+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    
\ No newline at end of file

src/i18n/wildfire_i18n_es.properties

@@ -33,6 +33,8 @@ tab.server.descr=Presione para administrar la configuraci\u00f3n del servidor
         sidebar.server-email=Configuraci\u00f3n de Correo
         sidebar.server-email.descr=Presione para configurar el correo
     sidebar.sidebar-server-settings=Configuraci\u00f3n del Servidor
+        sidebar.profile-settings=Seteos de Perfil
+        sidebar.profile-settings.descr=Presione para configurar los perfiles de usuarios y grupos
         sidebar.server2server-settings=Servidor a Servidor
         sidebar.server2server-settings.descr=Presione para configurar las conexiones a otros servidores
         sidebar.external-components-settings=Componentes Externos
@@ -1833,4 +1835,11 @@ calendar.time = Hora:
 plugin.enterprise.download.error = No se ha podido descarga el plugin Corporativo. Intente nuevamente.
 plugin.enterprise.dont.show= No mostrar esta p\u00e1gina nuevamente
 plugin.enterprise.installing = Instalando Plugin Corporativo...
-plugin.enterprise.installed = Plugin Corporativo instalado exitosamente. Refrescando en un instante...
+plugin.enterprise.installed = Plugin Corporativo instalado exitosamente. Refrescando en un instante...
\ No newline at end of file
+
+# Profile Settings
+
+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.
+profile-settings.ldap_mapping_info=Informaci\u00f3n del Mapeo a LDAP
\ No newline at end of file

src/resources/jar/admin-sidebar.xml

@@ -52,6 +52,11 @@
         <!-- Server Settings -->
         <sidebar id="sidebar-server-settings" name="${sidebar.sidebar-server-settings}">
 
+            <!-- Profile Settings -->
+            <item id="profile-settings" name="${sidebar.profile-settings}"
+                    url="profile-settings.jsp"
+                    description="${sidebar.profile-settings.descr}" />
+
             <!-- Server to server -->
             <item id="server2server-settings" name="${sidebar.server2server-settings}"
                     url="server2server-settings.jsp"

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

@@ -279,7 +279,7 @@ html>body .jive-testPanel {
 				</tr>
 				<tr>
 					<td colspan="2" class="jive-testpanel-vcard-next">
-						<a href="setup-ldap-user.jsp?test=true&serverType=<%= ParamUtils.getParameter(request, "serverType")%>&userIndex=<%=userIndex%>"><fmt:message key="setup.ldap.user.vcard.test.random" /></a>
+						<a href="<%= ParamUtils.getParameter(request, "currentPage")%>?test=true&serverType=<%= ParamUtils.getParameter(request, "serverType")%>&userIndex=<%=userIndex%>"><fmt:message key="setup.ldap.user.vcard.test.random" /></a>
 					</td>
 				</tr>
 			</table>