Additional work on LDAP setup process.

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

src/i18n/wildfire_i18n_en.properties

@@ -1335,6 +1335,8 @@ setup.ldap.connection_settings=Connection Settings
 setup.ldap.user_mapping=User Mapping
 setup.ldap.group_mapping=Group Mapping
 setup.ldap.step_one=Step 1 of 3
+setup.ldap.continue=Save & Continue
+setup.ldap.test=Test Settings
 
 setup.ldap.server.title=Profile Settings - Directory Server
 setup.ldap.server.description=Configure connection settings for your LDAP directory below. All \
@@ -1348,14 +1350,17 @@ setup.ldap.server.type_other=Other or Unknown
 setup.ldap.server.type_help=The type of directory server you are connecting to.
 setup.ldap.server.host=Host
 setup.ldap.server.host_help=LDAP server host name; e.g. ldap.example.com, etc.
+setup.ldap.server.host_error=Enter a valid LDAP server host name.
 setup.ldap.server.port=Port
 setup.ldap.server.port_help=LDAP server port number. The default value is 389.
+setup.ldap.server.port_error=Enter a valid LDAP server port number.
 setup.ldap.server.basedn=Base DN
 setup.ldap.server.basedn_help=The starting DN that contains all user accounts. The entire subtree \
   under the base DN will be searched for user accounts (unless subtree searching is disabled).
+setup.ldap.server.basedn_error=Enter a valid LDAP base DN.
 setup.ldap.server.auth=Authentication
 setup.ldap.server.admindn=Administrator DN
-setup.ldap.server.admindn_help=The DN of a directory administrator. All directory operations will be \
+setup.ldap.server.admindn_help=The full DN of a directory administrator. All directory operations will be \
   performed with this account. The admin must be able to perform searches and load user records. \
   The user does not need to be able to make changes to the directory, as Wildfire treats the \
   directory as read-only. If this property is not set, an anonymous login to the server will be attempted.
@@ -1367,8 +1372,9 @@ setup.ldap.server.connection_pool_help=Connection Pooling. Default is 'Yes'
 setup.ldap.server.ssl=Use SSL
 setup.ldap.server.ssl_help=Enable SSL connections to your LDAP server, default port is usually 636
 setup.ldap.server.debug=Enable Debug
-setup.ldap.server.debug_help=Trace information about buffers written to System.out
-setup.ldap.server.
+setup.ldap.server.debug_help=Write trace information about LDAP connections to System.out
+setup.ldap.server.referral=Follow Referrals
+setup.ldap.server.referral_help=Automatically follow LDAP referrals when found
 
 # Setup finished Page
 

src/web/setup/setup-datasource-standard.jsp

 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision: 1772 $
@@ -210,8 +209,7 @@
 	</p>
 
 <%  if (errors.size() > 0) { %>
-
-    <span class="jive-error-text">
+    <div class="error">
     <%  if (errors.get("general") != null) { %>
 
         <%= errors.get("general") %>
@@ -221,8 +219,7 @@
         <fmt:message key="setup.datasource.standard.failed_connect" />
 
     <%  } %>
-    </span>
-
+    </div>
 <%  } %>
 
 

src/web/style/setup.css

@@ -446,11 +446,20 @@ html>body .jive-vcardTable {
 	clear: both;
 	font-size: 11px;
 	}
-.jive-error-text {
-	display: block;
-	clear: both;
-	color : #f00;
-	}
+.error {
+    color : #900;
+    font-weight : bold;
+    background-color : #EDB9B1;
+    padding : 5px;
+    border: 1px solid #BB8888;
+    margin-top : 10px;
+	margin-bottom: 20px;
+    padding-left : 28px;
+    background-image : url(../../images/error-16x16.gif);
+    background-repeat : no-repeat;
+    background-position : 5px 5px;
+	-moz-border-radius: 3px;
+}
 .jive_setup_launchAdmin a,
 .jive_setup_launchAdmin a:visited {
 	position: relative;