Skip to content

O
Openfire
Commit 37e928ea authored by Ryan Graham's avatar Ryan Graham Committed by ryan
Browse files
Options

more look-and-feel applied to most of the rest of the setup tool 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4824 b35dd754-fafc-0310-a699-88a17e54d16e
parent 5f7392a0
Show whitespace changes
Inline Side-by-side
Showing with 199 additions and 121 deletions
src/web/setup/setup-admin-settings.jsp
View file @ 37e928ea
...@@ -100,18 +100,19 @@ ...@@ -100,18 +100,19 @@
} }
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="setup.admin.settings.account" /></title> <title><fmt:message key="setup.admin.settings.account" /></title>
</head> </head>
<body> <body>
<p class="jive-setup-page-header">
<fmt:message key="setup.admin.settings.account" />
</p>
<p> <h1>
<fmt:message key="setup.admin.settings.info" /> <fmt:message key="setup.admin.settings.account" />
</p> </h1>
<p>
<fmt:message key="setup.admin.settings.info" />
</p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -129,6 +130,11 @@ ...@@ -129,6 +130,11 @@
<% } %> <% } %>
<!-- BEGIN jive-contentBox -->
<div class="jive-contentBox">
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
var clicked = false; var clicked = false;
function checkClick() { function checkClick() {
...@@ -199,7 +205,7 @@ function checkClick() { ...@@ -199,7 +205,7 @@ function checkClick() {
%> %>
<tr valign="top"> <tr valign="top">
<td class="jive-label"> <td class="jive-label" align="right">
<fmt:message key="setup.admin.settings.email" /> <fmt:message key="setup.admin.settings.email" />
</td> </td>
<td> <td>
...@@ -218,7 +224,7 @@ function checkClick() { ...@@ -218,7 +224,7 @@ function checkClick() {
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label"> <td class="jive-label" align="right">
<fmt:message key="setup.admin.settings.new_password" /> <fmt:message key="setup.admin.settings.new_password" />
</td> </td>
<td> <td>
...@@ -237,7 +243,7 @@ function checkClick() { ...@@ -237,7 +243,7 @@ function checkClick() {
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label"> <td class="jive-label" align="right">
<fmt:message key="setup.admin.settings.confirm_password" /> <fmt:message key="setup.admin.settings.confirm_password" />
</td> </td>
<td> <td>
...@@ -252,16 +258,19 @@ function checkClick() { ...@@ -252,16 +258,19 @@ function checkClick() {
</tr> </tr>
</table> </table>
<br><br>
<hr size="0">
<div align="right"> <br>
<input type="submit" name="continue" value=" <fmt:message key="global.continue" /> ">
<input type="submit" name="doSkip" value="<fmt:message key="setup.admin.settings.skip_this_step" />"> <div align="right">
</div> <input type="submit" name="doSkip" value="<fmt:message key="setup.admin.settings.skip_this_step" />" id="jive-setup-skip" border="0">
<input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0">
</div>
</form>
</div>
<!-- END jive-contentBox -->
</form>
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<!-- <!--
......
src/web/setup/setup-datasource-settings.jsp
View file @ 37e928ea
...@@ -131,19 +131,19 @@ ...@@ -131,19 +131,19 @@
<html> <html>
<head> <head>
<title><fmt:message key="setup.datasource.settings.title" /></title> <title><fmt:message key="setup.datasource.settings.title" /></title>
</head> </head>
<body> <body>
<p class="jive-setup-page-header"> <h1>
<fmt:message key="setup.datasource.settings.title" /> <fmt:message key="setup.datasource.settings.title" />
</p> </h1>
<p> <p>
<fmt:message key="setup.datasource.settings.info"> <fmt:message key="setup.datasource.settings.info">
<fmt:param value="<%= LocaleUtils.getLocalizedString("short.title") %>" /> <fmt:param value="<%= LocaleUtils.getLocalizedString("short.title") %>" />
</fmt:message> </fmt:message>
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -153,7 +153,11 @@ ...@@ -153,7 +153,11 @@
<% } %> <% } %>
<form action="setup-datasource-settings.jsp"> <!-- BEGIN jive-contentBox -->
<div class="jive-contentBox">
<form action="setup-datasource-settings.jsp">
<input type="hidden" name="next" value="true"> <input type="hidden" name="next" value="true">
<table cellpadding="3" cellspacing="2" border="0"> <table cellpadding="3" cellspacing="2" border="0">
...@@ -197,11 +201,15 @@ ...@@ -197,11 +201,15 @@
<br><br> <br><br>
<hr size="0">
<div align="right"><input type="submit" value=" <fmt:message key="global.continue" /> "></div> <div align="right">
<input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0">
</div>
</form>
</div>
<!-- END jive-contentBox -->
</form>
</body> </body>
</html> </html>
\ No newline at end of file
src/web/setup/setup-datasource-standard.jsp
View file @ 37e928ea
...@@ -194,22 +194,22 @@ ...@@ -194,22 +194,22 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="setup.datasource.standard.title" /></title> <title><fmt:message key="setup.datasource.standard.title" /></title>
</head> </head>
<body> <body>
<p class="jive-setup-page-header"> <h1>
<fmt:message key="setup.datasource.standard.title" /> <fmt:message key="setup.datasource.standard.title" />
</p> </h1>
<p> <p>
<fmt:message key="setup.datasource.standard.info" /> <fmt:message key="title" />. <fmt:message key="setup.datasource.standard.info" /> <fmt:message key="title" />.
</p> </p>
<p> <p>
<b><fmt:message key="setup.datasource.standard.info2" /> </b><fmt:message key="setup.datasource.standard.info3" /><tt>[Wildfire_HOME]/resources/database</tt>. <b><fmt:message key="setup.datasource.standard.info2" /> </b><fmt:message key="setup.datasource.standard.info3" /> <tt>[Wildfire_HOME]/resources/database</tt>.
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -227,6 +227,12 @@ ...@@ -227,6 +227,12 @@
<% } %> <% } %>
<!-- BEGIN jive-contentBox -->
<div class="jive-contentBox">
<% // DB preset data <% // DB preset data
List<String[]> presets = new ArrayList<String []>(); List<String[]> presets = new ArrayList<String []>();
presets.add(new String[]{"MySQL","com.mysql.jdbc.Driver","jdbc:mysql://[host-name]:3306/[database-name]"}); presets.add(new String[]{"MySQL","com.mysql.jdbc.Driver","jdbc:mysql://[host-name]:3306/[database-name]"});
...@@ -256,13 +262,12 @@ function checkSubmit() { ...@@ -256,13 +262,12 @@ function checkSubmit() {
} }
</script> </script>
<form action="setup-datasource-standard.jsp" method="post" name="dbform" <form action="setup-datasource-standard.jsp" method="post" name="dbform" onsubmit="return checkSubmit();">
onsubmit="return checkSubmit();">
<table cellpadding="3" cellspacing="2" border="0"> <table cellpadding="3" cellspacing="2" border="0">
<tr> <tr>
<td colspan="2"> <td nowrap align="right"><fmt:message key="setup.datasource.standard.label" />:</td>
<fmt:message key="setup.datasource.standard.label" />: <td>
<select size="1" name="presets" onchange="populate(this.options[this.selectedIndex].value)"> <select size="1" name="presets" onchange="populate(this.options[this.selectedIndex].value)">
<option value=""><fmt:message key="setup.datasource.standard.pick_database" /> <option value=""><fmt:message key="setup.datasource.standard.pick_database" />
<% for (int i=0; i<presets.size(); i++) { <% for (int i=0; i<presets.size(); i++) {
...@@ -271,11 +276,10 @@ function checkSubmit() { ...@@ -271,11 +276,10 @@ function checkSubmit() {
<option value="<%= i %>"> &#149; <%= data[0] %> <option value="<%= i %>"> &#149; <%= data[0] %>
<% } %> <% } %>
</select> </select>
<br><br>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td nowrap align="right">
<fmt:message key="setup.datasource.standard.jdbc" /> <fmt:message key="setup.datasource.standard.jdbc" />
</td> </td>
<td> <td>
...@@ -295,9 +299,8 @@ function checkSubmit() { ...@@ -295,9 +299,8 @@ function checkSubmit() {
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td nowrap align="right">
<fmt:message key="setup.datasource.standard.url" /> <fmt:message key="setup.datasource.standard.url" />
</td> </td>
<td> <td>
...@@ -319,7 +322,7 @@ function checkSubmit() { ...@@ -319,7 +322,7 @@ function checkSubmit() {
</tr> </tr>
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td nowrap align="right">
<fmt:message key="setup.datasource.standard.username" /> <fmt:message key="setup.datasource.standard.username" />
</td> </td>
<td> <td>
...@@ -339,9 +342,8 @@ function checkSubmit() { ...@@ -339,9 +342,8 @@ function checkSubmit() {
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td nowrap align="right">
<fmt:message key="setup.datasource.standard.password" /> <fmt:message key="setup.datasource.standard.password" />
</td> </td>
<td> <td>
...@@ -363,7 +365,7 @@ function checkSubmit() { ...@@ -363,7 +365,7 @@ function checkSubmit() {
</tr> </tr>
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td nowrap align="right">
<fmt:message key="setup.datasource.standard.connect" /> <fmt:message key="setup.datasource.standard.connect" />
</td> </td>
<td> <td>
...@@ -394,9 +396,8 @@ function checkSubmit() { ...@@ -394,9 +396,8 @@ function checkSubmit() {
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td nowrap align="right">
<fmt:message key="setup.datasource.standard.timeout" /> <fmt:message key="setup.datasource.standard.timeout" />
</td> </td>
<td> <td>
...@@ -420,15 +421,15 @@ function checkSubmit() { ...@@ -420,15 +421,15 @@ function checkSubmit() {
<br><br> <br><br>
<hr size="0"> <div align="right"><span class="jive-description">
<fmt:message key="setup.datasource.standard.note" /></span>
<input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0">
</div>
</form>
<div align="right"> </div>
<input type="submit" name="continue" value=" <fmt:message key="global.continue" /> "> <!-- END jive-contentBox -->
<br>
<fmt:message key="setup.datasource.standard.note" />
</div>
</form>
</body> </body>
</html> </html>
\ No newline at end of file
src/web/setup/setup-finished.jsp
View file @ 37e928ea
...@@ -39,19 +39,20 @@ ...@@ -39,19 +39,20 @@
<html> <html>
<head> <head>
<title><fmt:message key="setup.finished.title" /></title> <title><fmt:message key="setup.finished.title" /></title>
<meta name="showSidebar" content="false"/>
</head> </head>
<body> <body>
<p class="jive-setup-page-header">
<fmt:message key="setup.finished.title" />
</p>
<p> <h1>
<fmt:message key="setup.finished.info"> <fmt:message key="setup.finished.title" />
</h1>
<p>
<fmt:message key="setup.finished.info">
<fmt:param value="<%= LocaleUtils.getLocalizedString("title") %>" /> <fmt:param value="<%= LocaleUtils.getLocalizedString("title") %>" />
</fmt:message> </fmt:message>
</p> </p>
<% <%
// Figure out the URL that the user can use to login to the admin console. // Figure out the URL that the user can use to login to the admin console.
......
src/web/setup/setup-host-settings.jsp
View file @ 37e928ea
...@@ -103,30 +103,28 @@ ...@@ -103,30 +103,28 @@
</head> </head>
<body> <body>
<style type="text/css">
LABEL { font-weight : normal; }
</style>
<p class="jive-setup-page-header"> <h1>
<fmt:message key="setup.host.settings.title" /> <fmt:message key="setup.host.settings.title" />
</p> </h1>
<p> <p>
<fmt:message key="setup.host.settings.info" /> <fmt:message key="setup.host.settings.info" />
</p> </p>
<form action="setup-host-settings.jsp" name="f" method="post"> <!-- BEGIN jive-contentBox -->
<div class="jive-contentBox">
<form action="setup-host-settings.jsp" name="f" method="post">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap align="right">
<fmt:message key="setup.host.settings.domain" /> <fmt:message key="setup.host.settings.domain" />
<% if (errors.get("domain") != null) { %> <% if (errors.get("domain") != null) { %>
<span class="jive-error-text"><br> <span class="jive-error-text"><br>
<fmt:message key="setup.host.settings.invalid_domain" /> <fmt:message key="setup.host.settings.invalid_domain" />
</span> </span>
<% } %> <% } %>
</td> </td>
<td width="99%"> <td width="99%">
...@@ -140,14 +138,12 @@ LABEL { font-weight : normal; } ...@@ -140,14 +138,12 @@ LABEL { font-weight : normal; }
</tr> </tr>
<% if (XMPPServer.getInstance().isStandAlone()){ %> <% if (XMPPServer.getInstance().isStandAlone()){ %>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap align="right">
<fmt:message key="setup.host.settings.port" /> <fmt:message key="setup.host.settings.port" />
<% if (errors.get("embeddedPort") != null) { %> <% if (errors.get("embeddedPort") != null) { %>
<span class="jive-error-text"><br> <span class="jive-error-text"><br>
<fmt:message key="setup.host.settings.invalid_port" /> <fmt:message key="setup.host.settings.invalid_port" />
</span> </span>
<% } %> <% } %>
</td> </td>
<td width="99%"> <td width="99%">
...@@ -160,14 +156,12 @@ LABEL { font-weight : normal; } ...@@ -160,14 +156,12 @@ LABEL { font-weight : normal; }
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap align="right">
<fmt:message key="setup.host.settings.secure_port" /> <fmt:message key="setup.host.settings.secure_port" />
<% if (errors.get("securePort") != null) { %> <% if (errors.get("securePort") != null) { %>
<span class="jive-error-text"><br> <span class="jive-error-text"><br>
<fmt:message key="setup.host.settings.invalid_port" /> <fmt:message key="setup.host.settings.invalid_port" />
</span> </span>
<% } %> <% } %>
</td> </td>
<td width="99%"> <td width="99%">
...@@ -184,17 +178,21 @@ LABEL { font-weight : normal; } ...@@ -184,17 +178,21 @@ LABEL { font-weight : normal; }
<br><br> <br><br>
<hr size="0">
<div align="right"> <div align="right">
<input type="submit" name="continue" value=" <fmt:message key="global.continue" /> "> <input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0">
</div> </div>
</form> </form>
</div>
<!-- END jive-contentBox -->
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
// give focus to domain field // give focus to domain field
document.f.domain.focus(); document.f.domain.focus();
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
src/web/setup/setup-profile-settings.jsp
View file @ 37e928ea
...@@ -31,23 +31,65 @@ ...@@ -31,23 +31,65 @@
%> %>
<html> <html>
<head> <head>
<title>Profile Settings</title> <title>Profile Settings</title>
</head> </head>
<body> <body>
<p class="jive-setup-page-header"> <h1>
Profile Settings Profile Settings
</p> </h1>
<p> <p>
Blah blah. Choose whether or not Wildfire integrates with an existing directory server for user profiles.
</p> </p>
<!-- BEGIN jive-contentBox -->
<div class="jive-contentBox">
<form action="setup-profile-settings.jsp" name="profileform" method="post">
<table cellpadding="3" cellspacing="2" border="0">
<tr>
<td align="center" valign="top">
<input type="radio" name="mode" value="" id="rb01" checked>
</td>
<td>
<label for="rb01"><b>None (default)</b></label><br>
No directory server available.
</td>
</tr>
<tr>
<td align="center" valign="top">
<input type="radio" name="mode" value="" id="rb02" disabled>
</td>
<td>
<label for="rb02"><b>Integrate with a directory server</b></label><br>
Use an existing directory server (such as Active Directory, OpenLDAP, etc) for profile integration.
</td>
</tr>
<tr>
<td align="center" valign="top">
<input type="radio" name="mode" value="" id="rb03" disabled>
</td>
<td>
<label for="rb03"><b>Other</b></label><br>
If you have a custom profile integration system, selecting this will create the config file
<tt>\wildfire\foo.conf</tt>, though you will need to edit it manually after you complete the setup process.
</td>
</tr>
</table>
<br>
<div align="right">
<input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0">
</div>
</form>
</div>
<!-- END jive-contentBox -->
<form action="setup-profile-settings.jsp" name="profileform" method="post">
</form>
</body> </body>
</html> </html>
src/web/setup/setup-style.css
View file @ 37e928ea
...@@ -87,24 +87,24 @@ A:active { ...@@ -87,24 +87,24 @@ A:active {
padding-left : 20px; padding-left : 20px;
} }
.jive-setup-checklist-box { .jive-setup-checklist-box {
border-width : 0px 1px 1px 0px; border-width: 0px 1px 1px 0px;
border-color : #ccc; border-color: #ccc;
border-style : solid; border-style : solid;
padding-left : 1em; padding-left : 1em;
padding-right : 1em; padding-right : 1em;
} }
.jive-error-text { .jive-error-text {
color : #f00; color: #f00;
} }
.jive-label { .jive-label {
padding-right : 10px; padding-right: 10px;
padding-top : 6px; padding-top: 6px;
} }
.jive-description { .jive-description {
font-family : verdana; font-family: verdana;
font-size : 0.8em; font-size: 0.8em;
} }
.jive-custom-datasource .jive-label { .jive-custom-datasource .jive-label {
font-size : 0.8em; font-size: 0.8em;
font-family : verdana; font-family: verdana;
} }
\ No newline at end of file \ No newline at end of file
src/web/style/setup.css
View file @ 37e928ea
...@@ -135,6 +135,10 @@ form { ...@@ -135,6 +135,10 @@ form {
margin: 0px; margin: 0px;
padding: 0px 0px 14px 0px; padding: 0px 0px 14px 0px;
} }
#jive-body tt {
font-size: 8pt;
font-weight: bold;
}
.jive-contentBox { .jive-contentBox {
display: block; display: block;
margin: 5px 0px 20px 0px; margin: 5px 0px 20px 0px;
...@@ -165,7 +169,22 @@ form { ...@@ -165,7 +169,22 @@ form {
border: 1px solid #7c7c7c; border: 1px solid #7c7c7c;
background: #d6892c url(../images/setup_btn_bg-orange.gif) repeat-x; background: #d6892c url(../images/setup_btn_bg-orange.gif) repeat-x;
} }
.jive-contentBox input#jive-setup-skip {
padding: 2px 5px 2px 5px;
margin: 0px 10px 0px 0px;
font-size: 11px;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: bold;
color: #fff;
border: 1px solid #7c7c7c;
background: #8c8c8c url(../images/setup_btn_bg-grey.gif) repeat-x;
}
.jive-description {
font-size: 11px;
}
.jive-error-text {
color : #f00;
}
......
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