Setup fixes.

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

src/i18n/wildfire_i18n_en.properties

@@ -1389,7 +1389,7 @@ setup.ldap.server.debug_help=Write trace information about LDAP connections to S
 setup.ldap.server.referral=Follow Referrals
 setup.ldap.server.referral_help=Automatically follow LDAP referrals when found
 
-setup.ldap.user.description=Configure user mapping settings for your LDAP directory below. \
+setup.ldap.user.description=Configure how Wildfire finds and loads users from your LDAP directory. \
   If you need additional information about a field, hover your mouse over the corresponsing help icon.
 setup.ldap.user.username_field=Username Field
 setup.ldap.user.username_field_description=The field name that the username lookups will be \
@@ -1398,7 +1398,7 @@ setup.ldap.user.username_field_description=The field name that the username look
 setup.ldap.user.username_field_error=Enter a valid username field.
 setup.ldap.user.search_fields=Search Fields
 setup.ldap.user.search_fields_description=The LDAP fields that will be used for user searches. It \
-  is not recommended that you set a value for this field unless the default search fields does not \
+  is not recommended that you set a value for this field unless the default search fields do not \
   work for you (username, name, and email fields). An example search value is \
   "Username/uid,Name/cname". That searches the uid and cname fields in the directory and \
   labels them as "Username" and "Name" in the search UI. You can add as many \
@@ -1407,13 +1407,13 @@ setup.ldap.user.search_fields_description=The LDAP fields that will be used for
 setup.ldap.user.user_filter=User Filter
 setup.ldap.user.user_filter_description=An optional user filter to append to the default filter \
   when loading users. The default user filter is created using the attribute specified by \
-  ldap.usernameField. For example, if the username field is "uid", then the default \
+  the username field. For example, if the username field is "uid", then the default \
   user filter would be "(uid={0})" where {0} is dynamically replaced with the username \
   being searched for.
 
-setup.ldap.group.description=Configure group mapping settings for your LDAP directory below. \
+setup.ldap.group.description=Configure how Wildfire finds and loads groups from your LDAP directory. \
   If you need additional information about a field, hover your mouse over the corresponsing help icon.
-setup.ldap.group.name_field=Name Field
+setup.ldap.group.name_field=Group Field
 setup.ldap.group.name_field_description=The field name that the group name lookups will be \
   performed on. If this property is not set, the default value is <b>cn</b>.
 setup.ldap.group.member_field=Member Field
@@ -1423,14 +1423,14 @@ setup.ldap.group.description_field=Description Field
 setup.ldap.group.description_field_description=The field name that holds the description a group. \
   If this property is not set, the default value is <b>description</b>.
 setup.ldap.group.posix=Posix Mode
-setup.ldap.group.posix_description=A value of &quot;true&quot; means that users are stored within \
-  the group by their user name alone. A value of &quot;false&quot; means that users are stored by \
-  their entire DN within the group. If this property is not set, the default value is <b>false</b>. \
+setup.ldap.group.posix_description=A value of &quot;Yes&quot; means that users are stored within \
+  the group by their user name alone. A value of &quot;No&quot; means that users are stored by \
+  their entire DN within the group. If this property is not set, the default value is <b>No</b>. \
   The posix mode must be set correctly for your server in order for group integration to work.
 setup.ldap.group.filter=Group Filter
 setup.ldap.group.filter_description=An optional group filter to append to the default filter when \
-  loading groups. The default group filter is created using the attribute specified by \
-  ldap.groupNameField. For example, if the group name field is &quot;cn&quot;, then the default \
+  loading groups. The default group filter is created using the group name. \
+  For example, if the group name field is &quot;cn&quot;, then the default \
   group filter would be &quot;(cn={0})&quot; where {0} is dynamically replaced with the \
   group name being searched for.
 

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

@@ -120,7 +120,7 @@
 
 <body>
 
-	<h1><fmt:message key="setup.ldap.profile" /> <span><fmt:message key="setup.ldap.group_mapping" /></h1>
+	<h1><fmt:message key="setup.ldap.profile" />: <span><fmt:message key="setup.ldap.group_mapping" /></h1>
 
 	<!-- BEGIN jive-contentBox_stepbar -->
 	<div id="jive-contentBox_stepbar">
@@ -195,10 +195,10 @@
 
 			<!-- BEGIN right-aligned buttons -->
 			<div align="right">
-				<a href="setup-ldap-group_test.jsp" class="lbOn" id="jive-setup-test2">
+				<%--<a href="setup-ldap-group_test.jsp" class="lbOn" id="jive-setup-test2">
 				<img src="../images/setup_btn_gearplay.gif" alt="" width="14" height="14" border="0">
                 <fmt:message key="setup.ldap.test" />
-				</a>
+				</a>--%>
 
 				<input type="Submit" name="save" value="<fmt:message key="setup.ldap.continue" />" id="jive-setup-save" border="0">
 			</div>

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

@@ -107,7 +107,7 @@
 
 <body>
 
-	<h1><fmt:message key="setup.ldap.profile" /> <span><fmt:message key="setup.ldap.connection_settings" /></span></h1>
+	<h1><fmt:message key="setup.ldap.profile" />: <span><fmt:message key="setup.ldap.connection_settings" /></span></h1>
 
 	<!-- BEGIN jive-contentBox_stepbar -->
 	<div id="jive-contentBox_stepbar">
@@ -157,7 +157,7 @@
 			</tr>
 			<tr>
 			<td align="right"><fmt:message key="setup.ldap.server.basedn" />:</td>
-			<td colspan="3"><input type="text" name="basedn" id="jiveLDAPbasedn" size="40" maxlength="50" value="<%= baseDN!=null?baseDN:""%>"><span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.basedn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 16000);"></a></span></td>
+			<td colspan="3"><input type="text" name="basedn" id="jiveLDAPbasedn" size="40" maxlength="150" value="<%= baseDN!=null?baseDN:""%>"><span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.basedn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 16000);"></a></span></td>
 			</tr>
             <tr><td colspan="4">&nbsp;</td></tr>
             <tr>
@@ -165,7 +165,7 @@
 			</tr>
 			<tr>
 			<td align="right"><fmt:message key="setup.ldap.server.admindn" />:</td>
-			<td colspan="3"><input type="text" name="admindn" id="jiveLDAPadmindn" size="40" maxlength="50" value="<%= adminDN!=null?adminDN:""%>"><span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.admindn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"></a></span></td>
+			<td colspan="3"><input type="text" name="admindn" id="jiveLDAPadmindn" size="40" maxlength="150" value="<%= adminDN!=null?adminDN:""%>"><span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.admindn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"></a></span></td>
 			</tr>
 			<tr>
 			<td align="right"><fmt:message key="setup.ldap.server.password" />:</td>
@@ -263,10 +263,10 @@
 
 			<!-- BEGIN right-aligned buttons -->
 			<div align="right">
-				<a href="setup-ldap-server_test.jsp" class="lbOn" id="jive-setup-test2">
+				<%--<a href="setup-ldap-server_test.jsp" class="lbOn" id="jive-setup-test2">
 				<img src="../images/setup_btn_gearplay.gif" alt="" width="14" height="14" border="0">
 				<fmt:message key="setup.ldap.test" />
-				</a>
+				</a>--%>
 
 				<input type="Submit" name="save" value="<fmt:message key="setup.ldap.continue" />" id="jive-setup-save" border="0">
 			</div>

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

@@ -87,7 +87,7 @@
 
 <body>
 
-	<h1><fmt:message key="setup.ldap.profile" /> <span><fmt:message key="setup.ldap.user_mapping" /></h1>
+	<h1><fmt:message key="setup.ldap.profile" />: <span><fmt:message key="setup.ldap.user_mapping" /></h1>
 
 	<!-- BEGIN jive-contentBox_stepbar -->
 	<div id="jive-contentBox_stepbar">
@@ -429,10 +429,10 @@
 
 			<!-- BEGIN right-aligned buttons -->
 			<div align="right">
-				<a href="setup-ldap-user_test.jsp" class="lbOn" id="jive-setup-test2">
+				<%--<a href="setup-ldap-user_test.jsp" class="lbOn" id="jive-setup-test2">
 				<img src="../images/setup_btn_gearplay.gif" alt="" width="14" height="14" border="0">
 				<fmt:message key="setup.ldap.test" />
-				</a>
+				</a>--%>
 
 				<input type="Submit" name="save" value="<fmt:message key="setup.ldap.continue" />" id="jive-setup-save" border="0">
 			</div>