Skip to content

O
Openfire
Commit 649a1c59 authored by Ryan Graham's avatar Ryan Graham Committed by ryan
Browse files
Options

fixes to the CSS, including the non-wrapping text on Server Settings (and... 

fixes to the CSS, including the non-wrapping text on Server Settings (and elsewhere), adding the (?) tooltips to the rest of the setup, and finally a fix to the IE crash bug with the show/hide 'Advanced Settings' pieces. Hooray!

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4880 b35dd754-fafc-0310-a699-88a17e54d16e
parent f82aa108
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 166 deletions
src/web/decorators/setup.jsp
View file @ 649a1c59
......@@ -92,8 +92,16 @@
<style type="text/css" title="setupStyle" media="screen">
@import "../style/setup.css";
@import "../style/lightbox.css";
</style>
<script language="JavaScript" type="text/javascript" src="../js/prototype.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/scriptaculous.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/lightbox.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domLib.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domTT.js"></script>
<script language="javascript" type="text/javascript" src="../js/setup.js"></script>
</head>
<body>
......
src/web/js/setup.js 0 → 100644
View file @ 649a1c59
/*
togglePanel function
This is for showing and hiding the advanced options panel.
This toggles toggles an individual panel (slides up and down).
*/
function togglePanel(thisID) {
activeLink = thisID.id+"Link";
if ($(thisID).style.display != 'none') {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "";
} else {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "jiveAdvancedButtonOn";
}
}
src/web/setup/setup-datasource-standard.jsp
View file @ 649a1c59
......@@ -283,17 +283,11 @@ function checkSubmit() {
<td>
<input type="text" name="driver" size="50" maxlength="150"
value="<%= ((driver != null) ? driver : "") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.datasource.standard.jdbc_info" />
</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.jdbc_info" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("driver") != null) { %>
<br>
<span class="jive-error-text">
<%= errors.get("driver") %>
</span>
<% } %>
</td>
</tr>
......@@ -304,17 +298,11 @@ function checkSubmit() {
<td>
<input type="text" name="serverURL" size="50" maxlength="250"
value="<%= ((serverURL != null) ? serverURL : "") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.datasource.standard.valid_url" />
</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.valid_url" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("serverURL") != null) { %>
<br>
<span class="jive-error-text">
<%= errors.get("serverURL") %>
</span>
<% } %>
</td>
</tr>
......@@ -326,17 +314,11 @@ function checkSubmit() {
<td>
<input type="text" name="username" size="20" maxlength="50"
value="<%= ((username != null) ? username : "") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.datasource.standard.username_info" />
</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.username_info" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("username") != null) { %>
<br>
<span class="jive-error-text">
<%= errors.get("username") %>
</span>
<% } %>
</td>
</tr>
......@@ -347,17 +329,11 @@ function checkSubmit() {
<td>
<input type="password" name="password" size="20" maxlength="50"
value="<%= ((password != null) ? password : "") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.datasource.standard.password_info" />
</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.password_info" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("password") != null) { %>
<br>
<span class="jive-error-text">
<%= errors.get("password") %>
</span>
<% } %>
</td>
</tr>
......@@ -367,30 +343,20 @@ function checkSubmit() {
<fmt:message key="setup.datasource.standard.connect" />
</td>
<td>
<fmt:message key="setup.datasource.standard.min" /> <input type="text" name="minConnections" size="5" maxlength="5"
value="<%= ((minConnections != -1) ? ""+minConnections : "") %>">
&nbsp;
<fmt:message key="setup.datasource.standard.max" /> <input type="text" name="maxConnections" size="5" maxlength="5"
value="<%= ((maxConnections != -1) ? ""+maxConnections : "") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.datasource.standard.pool" />
</span>
<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 : "") %>">
<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"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.pool" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("minConnections") != null) { %>
<br>
<span class="jive-error-text">
<%= errors.get("minConnections") %>
</span>
<% } %>
<% if (errors.get("maxConnections") != null) { %>
<br>
<span class="jive-error-text">
<%= errors.get("maxConnections") %>
</span>
<% } %>
</td>
</tr>
......@@ -400,24 +366,18 @@ function checkSubmit() {
</td>
<td>
<input type="text" name="connectionTimeout" size="5" maxlength="5"
value="<%= connectionTimeout %>">
<span class="jive-description">
<br>
<fmt:message key="setup.datasource.standard.timeout_info" />
</span>
value="<%= connectionTimeout %>"> <span style="display: block; float: left; padding: 2px 5px 0px 2px;">Days</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.datasource.standard.timeout_info" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("connectionTimeout") != null) { %>
<br>
<span class="jive-error-text">
<%= errors.get("connectionTimeout") %>
</span>
<% } %>
</td>
</tr>
</table>
<br><br>
<br>
<div align="right"><span class="jive-description">
<fmt:message key="setup.datasource.standard.note" /></span>
......
src/web/setup/setup-host-settings.jsp
View file @ 649a1c59
......@@ -118,56 +118,47 @@
<tr valign="top">
<td width="1%" nowrap align="right">
<fmt:message key="setup.host.settings.domain" />
<% if (errors.get("domain") != null) { %>
<span class="jive-error-text"><br>
<fmt:message key="setup.host.settings.invalid_domain" />
</span>
<% } %>
</td>
<td width="99%">
<input type="text" size="30" maxlength="150" name="domain"
value="<%= ((domain != null) ? domain : "") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.host.settings.hostname" />
</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.host.settings.hostname" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("domain") != null) { %>
<span class="jive-error-text">
<fmt:message key="setup.host.settings.invalid_domain" />
</span>
<% } %>
</td>
</tr>
<% if (XMPPServer.getInstance().isStandAlone()){ %>
<tr valign="top">
<td width="1%" nowrap align="right">
<fmt:message key="setup.host.settings.port" />
<% if (errors.get("embeddedPort") != null) { %>
<span class="jive-error-text"><br>
<fmt:message key="setup.host.settings.invalid_port" />
</span>
<% } %>
</td>
<td width="99%">
<input type="text" size="6" maxlength="6" name="embeddedPort"
value="<%= ((embeddedPort != Integer.MIN_VALUE) ? ""+embeddedPort : "9090") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.host.settings.port_number" />
</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.host.settings.port_number" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("embeddedPort") != null) { %>
<span class="jive-error-text">
<fmt:message key="setup.host.settings.invalid_port" />
</span>
<% } %>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap align="right">
<fmt:message key="setup.host.settings.secure_port" />
<% if (errors.get("securePort") != null) { %>
<span class="jive-error-text"><br>
<fmt:message key="setup.host.settings.invalid_port" />
</span>
<% } %>
</td>
<td width="99%">
<input type="text" size="6" maxlength="6" name="securePort"
value="<%= ((securePort != Integer.MIN_VALUE) ? ""+securePort : "9091") %>">
<span class="jive-description">
<br>
<fmt:message key="setup.host.settings.secure_port_number" />
</span>
<span class="jive-setup-helpicon"><a href="" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.host.settings.secure_port_number" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></a></span>
<% if (errors.get("securePort") != null) { %>
<span class="jive-error-text">
<fmt:message key="setup.host.settings.invalid_port" />
</span>
<% } %>
</td>
</tr>
<% } %>
......
src/web/setup/setup-ldap-group.jsp
View file @ 649a1c59
......@@ -36,35 +36,7 @@
</head>
<style type="text/css" title="setupStyle" media="screen">
@import "../style/lightbox.css";
</style>
<body>
<script language="JavaScript" type="text/javascript" src="../js/prototype.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/scriptaculous.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/lightbox.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domLib.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domTT.js"></script>
<script language="javascript" type="text/javascript">
/*
togglePanel function
This is for showing and hiding the advanced options panel.
This toggles toggles an individual panel (slides up and down).
*/
function togglePanel(thisID) {
activeLink = thisID.id+"Link";
if ($(thisID).style.display != 'none') {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "";
} else {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "jiveAdvancedButtonOn";
}
}
</script>
<h1>Profile Settings <span>- Group Mapping</span></h1>
......
src/web/setup/setup-ldap-server.jsp
View file @ 649a1c59
......@@ -36,35 +36,7 @@
</head>
<style type="text/css" title="setupStyle" media="screen">
@import "../style/lightbox.css";
</style>
<body>
<script language="JavaScript" type="text/javascript" src="../js/prototype.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/scriptaculous.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/lightbox.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domLib.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domTT.js"></script>
<script language="javascript" type="text/javascript">
/*
togglePanel function
This is for showing and hiding the advanced options panel.
This toggles toggles an individual panel (slides up and down).
*/
function togglePanel(thisID) {
activeLink = thisID.id+"Link";
if ($(thisID).style.display != 'none') {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "";
} else {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "jiveAdvancedButtonOn";
}
}
</script>
<h1>Profile Settings <span>- LDAP Connection Settings</span></h1>
......
src/web/setup/setup-ldap-user.jsp
View file @ 649a1c59
......@@ -36,35 +36,7 @@
</head>
<style type="text/css" title="setupStyle" media="screen">
@import "../style/lightbox.css";
</style>
<body>
<script language="JavaScript" type="text/javascript" src="../js/prototype.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/scriptaculous.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/lightbox.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domLib.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domTT.js"></script>
<script language="javascript" type="text/javascript">
/*
togglePanel function
This is for showing and hiding the advanced options panel.
This toggles toggles an individual panel (slides up and down).
*/
function togglePanel(thisID) {
activeLink = thisID.id+"Link";
if ($(thisID).style.display != 'none') {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "";
} else {
Effect.toggle($(thisID),'slide', {duration: .4});
$(activeLink).className = "jiveAdvancedButtonOn";
}
}
</script>
<h1>Profile Settings <span>- User Mapping</span></h1>
......
src/web/style/setup.css
View file @ 649a1c59
......@@ -244,17 +244,19 @@ form {
.jive-contentBox td input#jiveLDAPhost,
.jive-contentBox td input#jiveLDAPadminpwd,
.jive-contentBox td input#jiveLDAPusername,
.jive-contentBox td input#jiveLDAPsearchfields,
.jive-contentBox td input#jiveLDAPsearchfilter,
.jive-contentBox td input#jiveLDAPgroupname,
.jive-contentBox td input#jiveLDAPgroupmember,
.jive-contentBox td input#jiveLDAPgroupdesc,
.jive-contentBox td input#jiveLDAPgroupsearchfilter{
width: 160px;
}
.jive-contentBox td input#jiveLDAPsearchfields,
.jive-contentBox td input#jiveLDAPsearchfilter {
width: 220px;
}
.jive-contentBox td label {
margin-right: 5px;
}
}
/* button to toggle the advanced settings panel */
......@@ -284,6 +286,7 @@ a.jiveAdvancedButtonOn {
display: block;
position: relative;
clear: both;
width: 100%;
background: #ececec;
border: 1px solid #dcdcdc;
margin: 5px 0px 10px 0px;
......@@ -334,6 +337,7 @@ a.jiveAdvancedButtonOn {
}
.jiveadvancedPanelu {
margin-top: 8px;
width: 97%;
background-color: #fafafa;
border: 1px solid #dcdcdc;
-moz-border-radius: 3px;
......@@ -342,6 +346,9 @@ a.jiveAdvancedButtonOn {
.jiveadvancedPanelu td {
white-space: nowrap;
}
.jive-vcardTable {
width: 90%;
background-color: #fff;
......@@ -435,9 +442,13 @@ html>body .jive-vcardTable {
border: 0px;
}
.jive-description {
display: block;
clear: both;
font-size: 11px;
}
.jive-error-text {
display: block;
clear: both;
color : #f00;
}
.jive_setup_launchAdmin a,
......
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