Skip to content

O
Openfire
Commit 503387d2 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

[JM-1218] Setup is now skinned in new style. Other mods as well. Still some todos! 

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9836 b35dd754-fafc-0310-a699-88a17e54d16e
parent e7aa89a9
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 285 deletions
src/web/decorators/setup.jsp
View file @ 503387d2
......@@ -9,7 +9,6 @@
--%>
<%@ page import="org.jivesoftware.util.LocaleUtils"%>
<%@ page import="org.jivesoftware.util.ClassUtils"%>
<%@ page import="java.beans.PropertyDescriptor"%>
<%@ page import="java.io.File"%>
<%@ page import="org.jivesoftware.database.DbConnectionManager"%>
......@@ -17,7 +16,7 @@
<%@ page import="java.util.Map"%>
<%@ page import="java.sql.Statement"%>
<%@ page import="java.sql.SQLException"%>
<%@ page import="org.jivesoftware.openfire.XMPPServer"%>
<%@ page import="org.jivesoftware.admin.AdminConsole" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
......@@ -39,9 +38,9 @@
<%!
final PropertyDescriptor getPropertyDescriptor(PropertyDescriptor[] pd, String name) {
for (int i=0; i<pd.length; i++) {
if (name.equals(pd[i].getName())) {
return pd[i];
for (PropertyDescriptor aPd : pd) {
if (name.equals(aPd.getName())) {
return aPd;
}
}
return null;
......@@ -88,96 +87,125 @@
<html>
<head>
<title><fmt:message key="title" /> <fmt:message key="setup.title" />: <decorator:title /></title>
<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>
<decorator:head />
<title><fmt:message key="title" /> <fmt:message key="setup.title" />: <decorator:title /></title>
<style type="text/css" title="setupStyle" media="screen">
@import "../style/global.css";
@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>
<decorator:head />
</head>
<body onload="<decorator:getProperty property="body.onload" />">
<!-- BEGIN jive-header -->
<div id="jive-header">
<div id="jive-logo" title="openfire"></div>
<div id="jive-header-text"><fmt:message key="setup.title" /></div>
<div id="sidebar-top"></div>
</div>
<!-- END jive-header -->
<!-- BEGIN jive-main -->
<div id="main">
<!-- BEGIN jive-header -->
<div id="jive-header">
<div id="jive-logo">
<a href="/index.jsp"><img src="/images/login_logo.gif" alt="Openfire" width="179" height="53" /></a>
</div>
<div id="jive-userstatus">
<%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %><br/>
</div>
<div id="jive-nav">
<div id="jive-nav-left"></div>
<ul>
<li><a><fmt:message key="setup.title"/></a></li>
</ul>
<div id="jive-nav-right"></div>
</div>
<div id="jive-subnav">
&nbsp;
</div>
</div>
<!-- END jive-header -->
<div id="jive-main">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="1%">
<div id="jive-sidebar-container">
<div id="jive-sidebar-box">
<!-- BEGIN jive-sidebar -->
<div id="jive-sidebar">
<% if (showSidebar) {
String[] names = {
LocaleUtils.getLocalizedString("setup.sidebar.language"),
LocaleUtils.getLocalizedString("setup.sidebar.settings"),
LocaleUtils.getLocalizedString("setup.sidebar.datasource"),
LocaleUtils.getLocalizedString("setup.sidebar.profile"),
LocaleUtils.getLocalizedString("setup.sidebar.admin")
};
String[] links = {
"index.jsp",
"setup-host-settings.jsp",
"setup-datasource-settings.jsp",
"setup-profile-settings.jsp",
"setup-admin-settings.jsp"
};
%>
<div class="jive-sidebar-group">
<strong><fmt:message key="setup.sidebar.title" /></strong>
<ul>
<% for (int i=0; i<names.length; i++) { %>
<% if (currentStep < i) { %>
<li><%= names[i] %></li>
<% } else if (currentStep == i) { %>
<li class="jiveCurrent"><%= names[i] %></li>
<% } else { %>
<li class="jiveComplete"><!--<a href="<%= links[i] %>">--><%= names[i] %></li>
<% } %>
<% } %>
</ul>
</div>
<div class="jive-sidebar-group">
<strong><fmt:message key="setup.sidebar.title" /></strong>
<img src="../images/setup_sidebar_progress<%= currentStep %>.gif" alt="" width="142" height="13" border="0">
</div>
<% } %>
</div>
<div id="jive-sidebar">
<% if (showSidebar) {
String[] names = {
LocaleUtils.getLocalizedString("setup.sidebar.language"),
LocaleUtils.getLocalizedString("setup.sidebar.settings"),
LocaleUtils.getLocalizedString("setup.sidebar.datasource"),
LocaleUtils.getLocalizedString("setup.sidebar.profile"),
LocaleUtils.getLocalizedString("setup.sidebar.admin")
};
String[] links = {
"index.jsp",
"setup-host-settings.jsp",
"setup-datasource-settings.jsp",
"setup-profile-settings.jsp",
"setup-admin-settings.jsp"
};
%>
<ul id="jive-sidebar-progress">
<li class="category"><fmt:message key="setup.sidebar.title" /></li>
<li><img src="../images/setup_sidebar_progress<%= currentStep %>.gif" alt="" width="142" height="13" border="0"></li>
<% for (int i=0; i<names.length; i++) { %>
<% if (currentStep < i) { %>
<li><a href="<%= links[i] %>"><%= names[i] %></a></li>
<% } else if (currentStep == i) { %>
<li class="currentlink"><a href="<%= links[i] %>"><%= names[i] %></a></li>
<% } else { %>
<li class="completelink"><a href="<%= links[i] %>"><%= names[i] %></a></li>
<% } %>
<% } %>
</ul>
<% } %>
</div>
<!-- END jive-sidebar -->
</div>
</div>
</td>
<td width="99%" id="jive-content">
<!-- BEGIN jive-body -->
<div id="jive-body">
<decorator:body/>
<div id="jive-main-content">
<decorator:body/>
</div>
</div>
<!-- END jive-body -->
</td>
</tr>
</tbody>
</table>
</div>
</div>
<!-- END jive-main -->
<!-- BEGIN jive-footer -->
<div id="jive-footer"></div>
<div id="jive-footer">
<div class="jive-footer-copyright">
Built by <a href="http://www.jivesoftware.com">Jive Software</a> and the <a href="http://www.igniterealtime.org">IgniteRealtime.org</a> community
</div>
</div>
<!-- END jive-footer -->
</body>
</html>
\ No newline at end of file
src/web/login.jsp
View file @ 503387d2
......@@ -155,7 +155,7 @@
<div align="center" id="jive-loginTable">
<span id="jive-login-header" style="background: transparent url(images/login_logo.gif) no-repeat left; padding: 29px 0px 10px 205px;">
<span id="jive-login-header" style="background: transparent url(images/login_logo.gif) no-repeat left; padding: 29px 0 10px 205px;">
<fmt:message key="admin.console" />
</span>
......@@ -200,11 +200,6 @@
<td>&nbsp;</td>
</tr>
</table>
<script language="JavaScript" type="text/javascript">
<!--
document.loginForm.username.focus();
//-->
</script>
</td>
</tr>
<tr>
......
src/web/style/global.css
View file @ 503387d2
......@@ -455,7 +455,7 @@ iframe {
}
#jive-sidebar ul.subitems li.currentlink a, #jive-sidebar ul.subitems li.currentlink a:visited, #jive-sidebar ul.subitems li.currentlink a:hover {
background:transparent url(../images/jive-tertnav-arrow.gif) no-repeat scroll left center;
color:#06698C;
color:#555555;
font-weight:bold;
text-decoration:none;
}
......@@ -793,7 +793,7 @@ a.cal:hover {
background-color:#F9F9F9;
}
.jive-contentBox h3 {
color:#09345B;
color:#555555;
font-size:10pt;
margin:0;
padding:0 0 5px;
......@@ -801,7 +801,7 @@ a.cal:hover {
.jive-contentBox h4 {
background-color:#FCFCFC;
border:1px solid #E9E9E9;
color:#34679A;
color:#555555;
font-size:10pt;
margin:0 0 4px;
padding:3px 0 3px 4px;
......@@ -818,14 +818,14 @@ a.cal:hover {
padding:2px;
}
.jive-contentBox table th {
background-color:#F3F7FA;
background-color:#eeeeee;
padding:4px;
}
th.jive-table-th-center {
text-align:center;
}
.jive-contentBox table td.jive-formLabel {
color:#09345B;
color:#555555;
font-weight:bold;
padding-right:5px;
text-align:right;
......@@ -841,7 +841,7 @@ th.jive-table-th-center {
padding:12px 0;
}
.jive-contentBox-plain h3 {
color:#34679A;
color:#555555;
font-size:14pt;
margin:2px 0;
}
......@@ -868,7 +868,7 @@ th.jive-table-th-center {
width:390px;
}
#jive-roster b {
color:#09345B;
color:#555555;
display:block;
font-size:8pt;
padding:0 0 3px;
......@@ -882,7 +882,7 @@ th.jive-table-th-center {
clear:both;
}
.jive-enterprise-info h3 {
color:#34679A;
color:#555555;
font-size:13pt;
margin:4px 0;
padding:0;
......
src/web/style/login.css
View file @ 503387d2
......@@ -8,7 +8,7 @@
#jive-loginHeader {
font-size: 14pt;
font-weight: bold;
color: #06698c;
color: #555555;
margin: 0;
}
#jive-loginTable {
......@@ -25,8 +25,8 @@
}
#jive-loginTable td.loginFormTable {
padding: 17px 17px 7px 55px;
background: #d8e4e9 url(../images/jive-login-form-bg.gif) repeat-x top;
border: 1px solid #b6c5d3;
background: #ffffff url(../images/jive-login-form-bg-gray.gif) repeat-x top;
border: 1px solid #bbbbbb;
-moz-border-radius: 5px;
}
.loginFormTable TD {
......@@ -52,7 +52,7 @@
#jive-login-header {
font-size: 14pt;
font-weight: bold;
color: #06698c;
color: #555555;
margin: 0;
}
......
src/web/style/setup.css
View file @ 503387d2
body {
margin: 0;
padding: 0;
background: #fff url("../images/setup_sidebar_bg.gif") repeat-y;
font-family: arial, helvetica, sans-serif;
}
body, div, p, td, th {
font-size: 10pt;
}
form {
margin: 0;
padding: 0;
}
/* --------------------------------------------- */
/* Header */
/* --------------------------------------------- */
#jive-header {
width: 100%;
height: 82px;
border: 0;
background: #fff url("../images/setup_header_bg.gif") repeat-x;
min-width: 720px;
}
#jive-logo {
display: block;
position: absolute;
top: 0;
left: 0;
width: 150px;
height: 50px;
background: url("../images/setup_header_logo.gif") no-repeat;
overflow: hidden;
}
#jive-header-text {
display: block;
position: absolute;
left: 158px;
top: 24px;
color: #fff;
font-size: 20px;
}
/* --------------------------------------------- */
/* Sidebar */
/* --------------------------------------------- */
#jive-header #sidebar-top {
display: block;
position: absolute;
width: 192px;
height: 9px;
left: 0;
top: 73px;
background: url("../images/setup_sidebar_bg-top.gif") no-repeat;
overflow: hidden;
}
#jive-sidebar {
width: 192px;
margin: 0;
padding: 0;
float: left;
}
.jive-sidebar-group {
display: block;
position: relative;
width: 161px;
margin: 0 0 16px 13px;
padding: 0 0 8px 0;
background-color: #cad6e2;
-moz-border-radius: 3px;
}
.jive-sidebar-group strong {
display: block;
color: #143350;
padding: 7px 9px 2px 9px;
margin: 0;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 8pt;
/* completed step */
#jive-sidebar ul li.completelink {
background:transparent url(/images/setup_sidebar_check.gif) no-repeat scroll left center;
font-weight:bold;
}
.jive-sidebar-group img {
display: block;
border: 1px solid #9e9e9e;
margin: 3px 0 3px 9px;
}
.jive-sidebar-group ul {
margin: 0; /*removes indent IE and Opera*/
margin-left: 9px;
padding: 0 0 0 0; /*removes indent Mozilla and NN7*/
list-style-type: none; /*turns off display of bullet*/
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
width: 143px;
}
.jive-sidebar-group ul li {
margin: 1px 0 2px 0;
padding: 2px 0 2px 15px;
color: #474747;
}
.jive-sidebar-group ul li.jiveCurrent {
border: 1px solid #34679A;
background-color: #5C7D9D;
color: #fff;
font-weight: bold;
-moz-border-radius: 3px;
}
.jive-sidebar-group ul li.jiveComplete {
color: #003366;
background: transparent url(../images/setup_sidebar_check.gif) no-repeat left;
}
/* --------------------------------------------- */
/* Body */
/* --------------------------------------------- */
#jive-body {
display: block;
position: absolute;
left: 192px;
padding: 17px 28px 15px 28px;
/* progress bar */
#jive-sidebar-progress {
}
#jive-body h1 {
font-size: 13pt;
margin: 0;
padding: 0 0 14px 0;
}
#jive-body h1 span {
color: #255480;
#jive-sidebar-progress img {
display: block;
border: 1px solid #9e9e9e;
margin: 3px 0 3px 9px;
}
#jive-body p {
margin: 0;
padding: 0 0 14px 0;
#jive-sidebar-progress a {
padding-left: 15px;
}
#jive-body tt {
font-size: 8pt;
font-weight: bold;
}
.jive-contentBox {
display: block;
margin: 5px 0 20px 0;
padding: 18px 20px 18px 20px;
border: 1px solid #dcdcdc;
background: #f5f5f5 url(../images/setup_contentbox_bg.gif) repeat-x top;
-moz-border-radius: 4px;
}
.jive-contentBox h2 {
margin: 0;
padding: 0 0 10px 0;
font-size: 11pt;
color: #09345b;
}
/* styles specific to the 'stepbar' (seen on the LDAP screens) */
#jive-contentBox_stepbar {
display: block;
margin: 5px 0 0 0;
padding: 3px;
border: 1px solid #aec2d6;
background-color: #eaf1f8;
color: #09345b;
border: 1px solid #bbbbbb;
background-color: #eeeeee;
color: #000000;
font-size: 8pt;
}
#jive-contentBox_stepbar span {
margin-right: 32px;
}
#jive-contentBox_stepbar span strong {
color: #09345b;
color: #000000;
}
#jive-contentBox_stepbar span em {
color: #666;
......@@ -186,7 +44,7 @@ form {
}
.jive-contentBox_for-stepbar h2 {
font-size: 14pt;
color: #396b9c;
color: #555555;
}
.jive-contentBox_for-stepbar h2 span {
font-size: 10pt;
......@@ -197,8 +55,8 @@ form {
.jive-contentBox_bluebox {
display: block;
position: relative;
border: 1px solid #dcdcdc;
background-color: #eaeff4;
border: 1px solid #bbbbbb;
background-color: #eeeeee;
-moz-border-radius: 3px;
margin: 0 0 12px 0;
padding: 12px;
......@@ -206,7 +64,7 @@ form {
.jive-contentBox_bluebox strong {
display: block;
position: relative;
color: #09345b;
color: #000000;
padding-bottom: 3px;
}
......@@ -214,8 +72,8 @@ form {
.jive-contentBox_greybox {
display: block;
position: relative;
border: 1px solid #dcdcdc;
background-color: #ececec;
border: 1px solid #bbbbbb;
background-color: #eeeeee;
-moz-border-radius: 3px;
margin: 0 0 12px 0;
padding: 12px;
......@@ -223,7 +81,7 @@ form {
.jive-contentBox_greybox strong {
display: block;
position: relative;
color: #09345b;
color: #555555;
padding-bottom: 3px;
}
......@@ -271,7 +129,7 @@ form {
margin: 0 0 5px 0;
background: url('../images/twisty_closed_9x9.gif') no-repeat left;
background-position: 1px;
color: #34679a;
color: #555555;
}
a.jiveAdvancedButtonOn {
background: transparent url('../images/twisty_opened_9x9.gif') no-repeat left;
......@@ -286,8 +144,8 @@ a.jiveAdvancedButtonOn {
position: relative;
clear: both;
width: 100%;
background: #ececec;
border: 1px solid #dcdcdc;
background: #eeeeee;
border: 1px solid #bbbbbb;
margin: 5px 0 10px 0;
padding: 0;
overflow: hidden;
......@@ -307,14 +165,14 @@ a.jiveAdvancedButtonOn {
}
.jiveadvancedPanelcs div table th,
.jive-vcardTable th {
color: #fff;
color: #000;
font-weight: bold;
background-color: #82a1bc;
background-color: #dddddd;
}
.jiveadvancedPanelcs div table td.jive-advancedLabel {
color: #09345b;
color: #000000;
font-weight: bold;
background-color: #eaeff4;
background-color: #dddddd;
text-align: right;
}
.jiveadvancedPanelcs div table td.jive-advancedDesc {
......@@ -469,7 +327,7 @@ html>body .jive-vcardTable {
font-weight: bold;
color: #fff;
border: 1px solid #0c2d4c;
background: #255480 url(../images/setup_btn_bg-bigblue.gif) repeat-x;
background: #D76C0D url(../images/setup_btn_bg-orange.gif) repeat-x;
text-decoration: none;
-moz-border-radius: 4px;
}
......@@ -554,7 +412,7 @@ div.jiveTooltip .contents {
}
.jive-testPanel-content h2 {
font-size: 14pt;
color: #396b9c;
color: #555555;
margin: 0 0 10px 0;
padding: 0;
}
......@@ -577,7 +435,7 @@ div.jiveTooltip .contents {
display: block;
float: left;
width: 682px;
border: 1px solid #d8d7c6;
border: 1px solid #bbbbbb;
padding: 4px;
background-color: #fff;
}
......@@ -603,7 +461,7 @@ div.jiveTooltip .contents {
font-size: 8pt;
}
.jive-testpanel-vcard-value a {
color: #34679a;
color: #555555;
}
.jive-testpanel-vcard-value strong {
color: #890000;
......@@ -619,19 +477,6 @@ div.jiveTooltip .contents {
padding-right: 18px;
margin-right: 4px;
background: transparent url(../images/setup_nextprofile.gif) no-repeat right;
color: #34679a;
color: #555555;
text-decoration: none;
}
/* --------------------------------------------- */
/* Footer */
/* --------------------------------------------- */
/* not relevant here, so hiding it. */
#jive-footer {
display: none;
visibility: hidden;
}
\ No newline at end of file
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