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
Show 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">
...@@ -174,34 +174,53 @@ ...@@ -174,34 +174,53 @@
<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="1" selected="selected"><fmt:message key="setup.ldap.server.type_select" /></option>
<option value="2">Active Directory</option> <option value="2">Active Directory</option>
<option value="3">OpenLDAP</option> <option value="3">OpenLDAP</option>
<option value="4"><fmt:message key="setup.ldap.server.type_other" /></option> <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> </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%">
<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> <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>
......
src/web/setup/setup-ldap-user.jsp
View file @ 266504f6
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.BeanUtils,
java.util.HashMap, org.jivesoftware.util.JiveGlobals,
java.util.Map, org.jivesoftware.util.LocaleUtils,
org.jivesoftware.util.JiveGlobals" %> org.jivesoftware.util.ParamUtils" %>
<%@ page import="org.jivesoftware.wildfire.XMPPServer"%> <%@ page import="org.jivesoftware.wildfire.XMPPServer"%>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Map" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="vcardBean" scope="session" class="org.jivesoftware.admin.LdapUserProfile" />
<% <%
// Redirect if we've already run setup: // Redirect if we've already run setup:
...@@ -28,14 +31,23 @@ ...@@ -28,14 +31,23 @@
String defaultSearchFields = JiveGlobals.getXMLProperty("ldap.searchFields"); String defaultSearchFields = JiveGlobals.getXMLProperty("ldap.searchFields");
String defaultSearchFilter = JiveGlobals.getXMLProperty("ldap.searchFilter"); String defaultSearchFilter = JiveGlobals.getXMLProperty("ldap.searchFilter");
if (serverType.equals("activedirectory")) { if (serverType.equals("activedirectory")) {
if (defaultUsernameField == null) {
// Initialize vCard mappings
vcardBean.initForActiveDirectory();
}
if (defaultUsernameField == null) { if (defaultUsernameField == null) {
defaultUsernameField = "sAMAccountName"; defaultUsernameField = "sAMAccountName";
// Initialize vCard mappings
} }
if (defaultSearchFilter == null) { if (defaultSearchFilter == null) {
defaultSearchFilter = "(objectClass=organizationalPerson)"; defaultSearchFilter = "(objectClass=organizationalPerson)";
} }
} }
else { else {
if (defaultUsernameField == null) {
// Initialize vCard mappings
vcardBean.initForOpenLDAP();
}
if (defaultUsernameField == null) { if (defaultUsernameField == null) {
defaultUsernameField = "uid"; defaultUsernameField = "uid";
} }
...@@ -55,6 +67,8 @@ ...@@ -55,6 +67,8 @@
} }
searchFields = ParamUtils.getParameter(request, "searchFields"); searchFields = ParamUtils.getParameter(request, "searchFields");
searchFilter = ParamUtils.getParameter(request, "searchFilter"); searchFilter = ParamUtils.getParameter(request, "searchFilter");
// Set the properties to the vCard bean with the user input
BeanUtils.setProperties(vcardBean, request.getParameterMap());
// Save settings and redirect. // Save settings and redirect.
if (errors.isEmpty()) { if (errors.isEmpty()) {
...@@ -65,6 +79,8 @@ ...@@ -65,6 +79,8 @@
if (searchFilter != null) { if (searchFilter != null) {
JiveGlobals.setXMLProperty("ldap.searchFilter", searchFilter); JiveGlobals.setXMLProperty("ldap.searchFilter", searchFilter);
} }
// Save vCard mappings
vcardBean.saveXMLProperties();
// Enable the LDAP auth and user providers. The group provider will be enabled on the next step. // Enable the LDAP auth and user providers. The group provider will be enabled on the next step.
JiveGlobals.setXMLProperty("provider.user.className", JiveGlobals.setXMLProperty("provider.user.className",
...@@ -167,7 +183,6 @@ ...@@ -167,7 +183,6 @@
} }
</script> </script>
<%--
<!-- BEGIN jive-contentBox_greybox --> <!-- BEGIN jive-contentBox_greybox -->
<div class="jive-contentBox_greybox"> <div class="jive-contentBox_greybox">
<strong>User Profiles (vCard)</strong> <strong>User Profiles (vCard)</strong>
...@@ -187,7 +202,7 @@ ...@@ -187,7 +202,7 @@
<strong>Name</strong> <strong>Name</strong>
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="name" value="{cn}" id="jiveLDAPname" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="name" value="<%= vcardBean.getName() %>" id="name" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -195,7 +210,7 @@ ...@@ -195,7 +210,7 @@
<strong>Email</strong> <strong>Email</strong>
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="email" value="{mail}" id="jiveLDAPemail" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="email" value="<%= vcardBean.getEmail() %>" id="email" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -211,7 +226,7 @@ ...@@ -211,7 +226,7 @@
<strong>Full Name</strong> <strong>Full Name</strong>
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="fullname" value="{firstName} {middleName} {lastName}" id="jiveLDAPfullname" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="fullname" value="<%= vcardBean.getFullName() %>" id="fullName" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -219,7 +234,7 @@ ...@@ -219,7 +234,7 @@
<strong>Nickname</strong> <strong>Nickname</strong>
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="nickname" value="{nick}" id="jiveLDAPnickname" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="nickname" value="<%= vcardBean.getNickname() %>" id="nickname" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -227,7 +242,7 @@ ...@@ -227,7 +242,7 @@
<strong>Birthday</strong> <strong>Birthday</strong>
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="dob" value="{dob}" id="jiveLDAPdob" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="dob" value="<%= vcardBean.getBirthday() %>" id="birthday" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -243,7 +258,7 @@ ...@@ -243,7 +258,7 @@
- Street Address - Street Address
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homestreet" value="{homeAddress} {homeExtrAddress}" id="jiveLDAPhomestreet" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homestreet" value="<%= vcardBean.getHome_street() %>" id="home_street" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -251,7 +266,7 @@ ...@@ -251,7 +266,7 @@
- City - City
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homecity" value="{homeCity}" id="jiveLDAPhomecity" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homecity" value="<%= vcardBean.getHome_city() %>" id="home_city" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -259,7 +274,7 @@ ...@@ -259,7 +274,7 @@
- State/Province - State/Province
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homestate" value="{homeState}" id="jiveLDAPhomestate" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homestate" value="<%= vcardBean.getHome_state() %>" id="home_state" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -267,7 +282,7 @@ ...@@ -267,7 +282,7 @@
- Postal Code - Postal Code
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homezip" value="{homeZip}" id="jiveLDAPhomezip" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homezip" value="<%= vcardBean.getHome_zip() %>" id="home_zip" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -275,7 +290,7 @@ ...@@ -275,7 +290,7 @@
- Country - Country
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homecountry" value="{homeCountry}" id="jiveLDAPhomecountry" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homecountry" value="<%= vcardBean.getHome_country() %>" id="home_country" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -283,7 +298,7 @@ ...@@ -283,7 +298,7 @@
- Phone Number - Phone Number
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homephone" value="{homePhone}" id="jiveLDAPhomephone" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homephone" value="<%= vcardBean.getHome_phone() %>" id="home_phone" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -291,7 +306,7 @@ ...@@ -291,7 +306,7 @@
- Mobile Number - Mobile Number
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homemobile" value="{homeMobile}" id="jiveLDAPhomemobile" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homemobile" value="<%= vcardBean.getHome_mobile() %>" id="home_mobile" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -299,7 +314,7 @@ ...@@ -299,7 +314,7 @@
- Fax - Fax
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homefax" value="{homeFax}" id="jiveLDAPhomefax" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homefax" value="<%= vcardBean.getHome_fax() %>" id="home_fax" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -307,7 +322,7 @@ ...@@ -307,7 +322,7 @@
- Pager - Pager
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="homepager" value="{homePager}" id="jiveLDAPhomePager" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="homepager" value="<%= vcardBean.getHome_pager() %>" id="home_pager" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -323,7 +338,7 @@ ...@@ -323,7 +338,7 @@
- Street Address - Street Address
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workstreet" value="317 SW Alder St, Ste 500" id="jiveLDAPworkstreet" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workstreet" value="<%= vcardBean.getBusiness_street() %>" id="business_street" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -331,7 +346,7 @@ ...@@ -331,7 +346,7 @@
- City - City
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workcity" value="Portland" id="jiveLDAPworkcity" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workcity" value="<%= vcardBean.getBusiness_city() %>" id="business_city" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -339,7 +354,7 @@ ...@@ -339,7 +354,7 @@
- State/Province - State/Province
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workstate" value="Oregon" id="jiveLDAPworkstate" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workstate" value="<%= vcardBean.getBusiness_state() %>" id="business_state" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -347,7 +362,7 @@ ...@@ -347,7 +362,7 @@
- Postal Code - Postal Code
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workzip" value="97204" id="jiveLDAPworkzip" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workzip" value="<%= vcardBean.getBusiness_zip() %>" id="business_zip" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -355,7 +370,7 @@ ...@@ -355,7 +370,7 @@
- Country - Country
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workcountry" value="USA" id="jiveLDAPworkcountry" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workcountry" value="<%= vcardBean.getBusiness_country() %>" id="business_country" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -363,7 +378,7 @@ ...@@ -363,7 +378,7 @@
- Job Title - Job Title
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="worktitle" value="{title}" id="jiveLDAPworktitle" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="worktitle" value="<%= vcardBean.getBusiness_job_title() %>" id="business_job_title" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -371,7 +386,7 @@ ...@@ -371,7 +386,7 @@
- Department - Department
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workdept" value="{department}" id="jiveLDAPworkdept" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workdept" value="<%= vcardBean.getBusiness_department() %>" id="business_department" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -379,7 +394,7 @@ ...@@ -379,7 +394,7 @@
- Phone Number - Phone Number
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workphone" value="{workPhone}" id="jiveLDAPworkphone" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workphone" value="<%= vcardBean.getBusiness_phone() %>" id="business_phone" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -387,7 +402,7 @@ ...@@ -387,7 +402,7 @@
- Mobile Number - Mobile Number
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workmobile" value="{workMobile}" id="jiveLDAPworkmobile" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workmobile" value="<%= vcardBean.getBusiness_mobile() %>" id="business_mobile" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -395,7 +410,7 @@ ...@@ -395,7 +410,7 @@
- Fax - Fax
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workfax" value="{workFax}" id="jiveLDAPworkfax" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workfax" value="<%= vcardBean.getBusiness_fax() %>" id="business_fax" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -403,7 +418,7 @@ ...@@ -403,7 +418,7 @@
- Pager - Pager
</td> </td>
<td class="jive-vcardTable-value jive-vardBorderBottom"> <td class="jive-vcardTable-value jive-vardBorderBottom">
<input type="text" name="workpager" value="{workPager}" id="jiveLDAPworkPager" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workpager" value="<%= vcardBean.getBusiness_pager() %>" id="business_pager" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -411,7 +426,7 @@ ...@@ -411,7 +426,7 @@
- Web page - Web page
</td> </td>
<td class="jive-vcardTable-value"> <td class="jive-vcardTable-value">
<input type="text" name="workurl" value="{webAddress}" id="jiveLDAPworkurl" size="22" maxlength="50" onFocus="jiveRowHighlight(this);"> <input type="text" name="workurl" value="<%= vcardBean.getBusiness_web_page() %>" id="business_web_page" size="22" maxlength="50" onFocus="jiveRowHighlight(this);">
</td> </td>
</tr> </tr>
</table> </table>
...@@ -420,10 +435,6 @@ ...@@ -420,10 +435,6 @@
</div> </div>
<!-- END jive-contentBox_greybox --> <!-- END jive-contentBox_greybox -->
--%>
<!-- BEGIN jive-buttons --> <!-- BEGIN jive-buttons -->
<div class="jive-buttons"> <div class="jive-buttons">
......
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