Skip to content

O
Openfire
Commit 266504f6 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato
Browse files
Options

More work on the LDAP testing and setup pages. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5620 b35dd754-fafc-0310-a699-88a17e54d16e
parent c6e33b01
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 72 deletions
src/web/setup/setup-datasource-standard.jsp
View file @ 266504f6
...@@ -5,20 +5,27 @@ ...@@ -5,20 +5,27 @@
- $Date: 2005-08-11 12:56:15 -0700 (Thu, 11 Aug 2005) $ - $Date: 2005-08-11 12:56:15 -0700 (Thu, 11 Aug 2005) $
--%> --%>
<%@ page import="org.jivesoftware.util.ParamUtils, <%@ page import="org.jivesoftware.database.DbConnectionManager,
java.util.*,
org.jivesoftware.util.JiveGlobals,
java.sql.Connection,
java.io.File,
java.sql.Statement,
java.sql.SQLException,
org.jivesoftware.database.DbConnectionManager,
org.jivesoftware.database.DefaultConnectionProvider, org.jivesoftware.database.DefaultConnectionProvider,
org.jivesoftware.util.ClassUtils, org.jivesoftware.util.ClassUtils,
org.jivesoftware.util.JiveGlobals,
org.jivesoftware.util.Log, org.jivesoftware.util.Log,
org.jivesoftware.database.DefaultConnectionProvider" org.jivesoftware.util.ParamUtils,
org.jivesoftware.wildfire.XMPPServer,
java.io.File,
java.lang.Double,
java.lang.Exception,
java.lang.Integer,
java.lang.String"
%> %>
<%@ page import="org.jivesoftware.wildfire.XMPPServer"%> <%@ page import="java.lang.Throwable"%>
<%@ page import="java.sql.Connection" %>
<%@ page import="java.sql.SQLException" %>
<%@ page import="java.sql.Statement" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -337,19 +344,27 @@ function checkSubmit() { ...@@ -337,19 +344,27 @@ function checkSubmit() {
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td nowrap align="right"> <td nowrap align="right">
<fmt:message key="setup.datasource.standard.connect" /> <%--<fmt:message key="setup.datasource.standard.connect" />--%>
Minimum Connections:
</td> </td>
<td> <td>
<span style="display: block; float: left; padding: 2px 2px 0px 0px;"><fmt:message key="setup.datasource.standard.min" /></span>
<input type="text" name="minConnections" size="5" maxlength="5" value="<%= ((minConnections != -1) ? ""+minConnections : "") %>"> <input type="text" name="minConnections" size="5" maxlength="5" value="<%= ((minConnections != -1) ? ""+minConnections : "") %>">
<span style="display: block; float: left; padding: 2px 2px 0px 5px;"><fmt:message key="setup.datasource.standard.max" /></span>
<input type="text" name="maxConnections" size="5" maxlength="5" value="<%= ((maxConnections != -1) ? ""+maxConnections : "") %>">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.pool" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span> <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.pool" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
<% if (errors.get("minConnections") != null) { %> <% if (errors.get("minConnections") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<%= errors.get("minConnections") %> <%= errors.get("minConnections") %>
</span> </span>
<% } %> <% } %>
</td>
</tr>
<tr valign="top">
<td nowrap align="right">
<%--<fmt:message key="setup.datasource.standard.connect" />--%>
Maximum Connections:
</td>
<td>
<input type="text" name="maxConnections" size="5" maxlength="5" value="<%= ((maxConnections != -1) ? ""+maxConnections : "") %>">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.pool" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
<% if (errors.get("maxConnections") != null) { %> <% if (errors.get("maxConnections") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<%= errors.get("maxConnections") %> <%= errors.get("maxConnections") %>
...@@ -376,8 +391,8 @@ function checkSubmit() { ...@@ -376,8 +391,8 @@ function checkSubmit() {
<br> <br>
<div align="right"><span class="jive-description"> <div align="right"><div class="jive-description" style="padding-bottom:10px;">
<fmt:message key="setup.datasource.standard.note" /></span> <fmt:message key="setup.datasource.standard.note" /></div>
<input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0"> <input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0">
</div> </div>
</form> </form>
......
src/web/setup/setup-ldap-server.jsp
View file @ 266504f6
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<body> <body>
<% if (test) { %> <% if (test && errors.isEmpty()) { %>
<a href="setup-ldap-server_test.jsp" id="lbmessage" title="Test" style="display:none;"></a> <a href="setup-ldap-server_test.jsp" id="lbmessage" title="Test" style="display:none;"></a>
<script type="text/javascript"> <script type="text/javascript">
...@@ -171,38 +171,57 @@ ...@@ -171,38 +171,57 @@
<div class="jive-contentBox_bluebox"> <div class="jive-contentBox_bluebox">
<table border="0" cellpadding="0" cellspacing="2"> <table border="0" cellpadding="0" cellspacing="2">
<tr> <tr>
<td colspan="4"><strong><fmt:message key="setup.ldap.server.ldap_server" /></strong></td> <td colspan="4"><strong><fmt:message key="setup.ldap.server.ldap_server" /></strong></td>
</tr> </tr>
<tr> <tr>
<td align="right"><fmt:message key="setup.ldap.server.type" />:</td> <td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.ldap.server.type" />:</td>
<td colspan="3" nowrap><select name="servertype" size="1" id="jiveLDAPserverType"> <td colspan="3" nowrap>
<option value="1" SELECTED><fmt:message key="setup.ldap.server.type_select" /></option> <select name="servertype" size="1" id="jiveLDAPserverType" style="width:90%;">
<option value="2">Active Directory</option> <option value="1" selected="selected"><fmt:message key="setup.ldap.server.type_select" /></option>
<option value="3">OpenLDAP</option> <option value="2">Active Directory</option>
<option value="4"><fmt:message key="setup.ldap.server.type_other" /></option> <option value="3">OpenLDAP</option>
</select><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.type_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td> <option value="4"><fmt:message key="setup.ldap.server.type_other" /></option>
</select><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.type_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
</td>
</tr> </tr>
<tr> <tr>
<td align="right"><fmt:message key="setup.ldap.server.host" />:</td> <td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.ldap.server.host" />:</td>
<td><input type="text" name="host" id="jiveLDAPphost" size="22" maxlength="50" value="<%= host!=null?host:"" %>"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.host_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td> <td width="1%">
<td align="right">&nbsp;<fmt:message key="setup.ldap.server.port" />:</td> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<td><input type="text" name="port" id="jiveLDAPport" size="5" maxlength="5" value="<%= port %>"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.port_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td> <tr>
<td width="1%" nowrap="nowrap">
<input type="text" name="host" id="jiveLDAPphost" size="22" maxlength="50" value="<%= host!=null?host:"" %>">
</td>
<td width="99%">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.host_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
</td>
</tr>
</table>
</td>
<td align="right" width="1%" nowrap="nowrap">&nbsp;&nbsp; <fmt:message key="setup.ldap.server.port" />:</td>
<td><input type="text" name="port" id="jiveLDAPport" size="5" maxlength="5" value="<%= port %>"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.port_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td>
</tr> </tr>
<tr> <tr>
<td align="right"><fmt:message key="setup.ldap.server.basedn" />:</td> <td align="right"><fmt:message key="setup.ldap.server.basedn" />:</td>
<td colspan="3"><input type="text" name="basedn" id="jiveLDAPbasedn" size="40" maxlength="150" value="<%= baseDN!=null?baseDN:""%>"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.basedn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 16000);"></span></td> <td colspan="3">
<input type="text" name="basedn" id="jiveLDAPbasedn" size="40" maxlength="150" value="<%= baseDN!=null?baseDN:""%>" style="width:90%;">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.basedn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 16000);"></span>
</td>
</tr> </tr>
<tr><td colspan="4">&nbsp;</td></tr> <tr><td colspan="4">&nbsp;</td></tr>
<tr> <tr>
<td colspan="4"><strong><fmt:message key="setup.ldap.server.auth" />:</strong></td> <td colspan="4"><strong><fmt:message key="setup.ldap.server.auth" />:</strong></td>
</tr> </tr>
<tr> <tr>
<td align="right"><fmt:message key="setup.ldap.server.admindn" />:</td> <td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.ldap.server.admindn" />:</td>
<td colspan="3"><input type="text" name="admindn" id="jiveLDAPadmindn" size="40" maxlength="150" value="<%= adminDN!=null?adminDN:""%>"> <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.admindn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"></span></td> <td colspan="3">
<input type="text" name="admindn" id="jiveLDAPadmindn" size="40" maxlength="150" value="<%= adminDN!=null?adminDN:""%>" style="width:90%;">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.admindn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"></span>
</td>
</tr> </tr>
<tr> <tr>
<td align="right"><fmt:message key="setup.ldap.server.password" />:</td> <td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.ldap.server.password" />:</td>
<td colspan="3"><input type="password" name="adminpwd" id="jiveLDAPadminpwd" size="22" maxlength="30" value="<%= adminPassword!=null?adminPassword:""%>"> <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.password_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td> <td colspan="3"><input type="password" name="adminpwd" id="jiveLDAPadminpwd" size="22" maxlength="30" value="<%= adminPassword!=null?adminPassword:""%>"> <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.password_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td>
</tr> </tr>
</table> </table>
</div> </div>
......
src/web/setup/setup-ldap-user.jsp
View file @ 266504f6
This diff is collapsed.
src/web/style/setup.css
View file @ 266504f6
...@@ -239,7 +239,7 @@ form { ...@@ -239,7 +239,7 @@ form {
.jive-contentBox td select#jiveLDAPserverType, .jive-contentBox td select#jiveLDAPserverType,
.jive-contentBox td input#jiveLDAPbasedn, .jive-contentBox td input#jiveLDAPbasedn,
.jive-contentBox td input#jiveLDAPadmindn { .jive-contentBox td input#jiveLDAPadmindn {
width: 270px; width: 320px;
} }
.jive-contentBox td input#jiveLDAPhost, .jive-contentBox td input#jiveLDAPhost,
.jive-contentBox td input#jiveLDAPadminpwd, .jive-contentBox td input#jiveLDAPadminpwd,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023