tdraier 2005/11/30 13:20:57 CET
Modified files:
src/conf SenseiAdministrationResources.properties
SenseiAdministrationResources_en.properties
SenseiAdministrationResources_fr.properties
src/webapp/jsp/sensei/include footer.jsp header.jsp
src/webapp/jsp/sensei wizardDb.jsp wizardError.jsp
wizardMail.jsp wizardUrl.jsp
wizardUser.jsp wizardWelcome.jsp
Added files:
src/webapp/jsp/sensei/images nav_left_green.gif pix.gif
Log:
fixed missing stuff
Revision Changes Path
1.11 +6 -3 sensei/src/conf/SenseiAdministrationResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/conf/SenseiAdministrationResources.properties.diff?r1=1.10&r2=1.11&f=h
1.5 +3 -4
sensei/src/conf/SenseiAdministrationResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/conf/SenseiAdministrationResources_en.properties.diff?r1=1.4&r2=1.5&f=h
1.7 +2 -2
sensei/src/conf/SenseiAdministrationResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/conf/SenseiAdministrationResources_fr.properties.diff?r1=1.6&r2=1.7&f=h
1.1 +19 -0 sensei/src/webapp/jsp/sensei/images/nav_left_green.gif
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/images/nav_left_green.gif?rev=1.1&content-type=text/plain
1.1 +1 -0 sensei/src/webapp/jsp/sensei/images/pix.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/images/pix.gif?rev=1.1&content-type=text/plain
1.4 +21 -10 sensei/src/webapp/jsp/sensei/include/footer.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/include/footer.jsp.diff?r1=1.3&r2=1.4&f=h
1.6 +95 -13 sensei/src/webapp/jsp/sensei/include/header.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/include/header.jsp.diff?r1=1.5&r2=1.6&f=h
1.7 +24 -1 sensei/src/webapp/jsp/sensei/wizardDb.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/wizardDb.jsp.diff?r1=1.6&r2=1.7&f=h
1.5 +1 -1 sensei/src/webapp/jsp/sensei/wizardError.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/wizardError.jsp.diff?r1=1.4&r2=1.5&f=h
1.3 +0 -0 sensei/src/webapp/jsp/sensei/wizardMail.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/wizardMail.jsp.diff?r1=1.2&r2=1.3&f=h
1.5 +0 -0 sensei/src/webapp/jsp/sensei/wizardUrl.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/wizardUrl.jsp.diff?r1=1.4&r2=1.5&f=h
1.7 +0 -0 sensei/src/webapp/jsp/sensei/wizardUser.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/wizardUser.jsp.diff?r1=1.6&r2=1.7&f=h
1.5 +1 -1 sensei/src/webapp/jsp/sensei/wizardWelcome.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/wizardWelcome.jsp.diff?r1=1.4&r2=1.5&f=h
Index: SenseiAdministrationResources.properties
===================================================================
RCS file:
/home/cvs/repository/sensei/src/conf/SenseiAdministrationResources.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SenseiAdministrationResources.properties 29 Nov 2005 14:46:51 -0000
1.10
+++ SenseiAdministrationResources.properties 30 Nov 2005 12:20:56 -0000
1.11
@@ -1,9 +1,9 @@
-title.jbpms = Jahia Business
Process Mangement Server
+title.jbpms = Jahia Business
Process Management Server
title.jbpmsAdmin = Jahia Business
Process Management Server Administration
title.schema = JBPMS Management
title.process = Deployed process
list
title.connectors = Connectors
-title.welcomeConfigurationWizard
= Welcome to Business Process Mangement Server configuration wizard
+title.welcomeConfigurationWizard
= Welcome to Business Process Management Server configuration wizard
title.serviceReply
= Service reply
title.copyright
= © Copyright 2002-2005 <a
href="http://www.jahia.org"; target="newJahia">Jahia Ltd</a> - All rights
reserved.
label.selectedUri = Current URI
@@ -13,6 +13,10 @@
label.userPassword
= Password
label.userPasswordConfirmation
= Confirm password
label.useJass
= Use JAAS configuration
+label.dbType = Source Type
+label.dsName = Datasource name
+label.dbType.driver = JDBC Driver
+label.dbType.datasource = Datasource
label.dbUrl
= Database URL
label.dbDriver
= JDBC driver
label.createTables
= Automatically create tables
@@ -73,7 +77,6 @@
property.sourceProperty = Property
property.destinationProperty = Target property
property.value = Value
-property.value = Instance value
property.xpath = XPath
property.xforms = XForms document
property.process = Process
Index: SenseiAdministrationResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/sensei/src/conf/SenseiAdministrationResources_en.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SenseiAdministrationResources_en.properties 29 Nov 2005 14:46:51
-0000 1.4
+++ SenseiAdministrationResources_en.properties 30 Nov 2005 12:20:56
-0000 1.5
@@ -1,9 +1,9 @@
-title.jbpms = Jahia Business
Process Mangement Server
+title.jbpms = Jahia Business
Process Management Server
title.jbpmsAdmin = Jahia Business
Process Management Server Administration
title.schema = JBPMS Management
title.process = Deployed process
list
title.connectors = Connectors
-title.welcomeConfigurationWizard
= Welcome to Business Process Mangement Server configuration wizard
+title.welcomeConfigurationWizard
= Welcome to Business Process Management Server configuration wizard
title.serviceReply
= Service reply
title.copyright
= © Copyright 2002-2005 <a
href="http://www.jahia.org"; target="newJahia">Jahia Ltd</a> - All rights
reserved.
label.selectedUri = Current URI
@@ -59,7 +59,7 @@
ldap.url = Server URL
-ldap.bind.dn = Public BIND DN
+label.dbType=Source type
ldap.bind.password = Password
ldap.base = Base DN
ldap.user.uid = User UID Attribute
@@ -71,7 +71,6 @@
property.sourceProperty = Property
property.destinationProperty = Target property
property.value = Value
-property.value = Instance value
property.xpath = XPath
property.xforms = XForms document
property.process = Process
Index: SenseiAdministrationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/sensei/src/conf/SenseiAdministrationResources_fr.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SenseiAdministrationResources_fr.properties 29 Nov 2005 14:46:51
-0000 1.6
+++ SenseiAdministrationResources_fr.properties 30 Nov 2005 12:20:56
-0000 1.7
@@ -1,9 +1,9 @@
-title.jbpms = Jahia Business
Process Mangement Server
+title.jbpms = Jahia Business
Process Management Server
title.jbpmsAdmin = Jahia Business
Process Management Server Administration
title.schema = JBPMS Management
title.process = Liste des process
déployés
title.connectors = Connecteurs
-title.welcomeConfigurationWizard
= Bienvenue dans l'assistant de configuration de Jahia Business Process
Mangement Server
+title.welcomeConfigurationWizard
= Bienvenue dans l'assistant de configuration de Jahia Business Process
Management Server
title.serviceReply
= Réponse du service
title.copyright
= © Copyright 2002-2005 <a
href="http://www.jahia.org"; target="newJahia">Jahia Ltd</a> - Tous droits
réservé
label.selectedUri = URI courante
Index: nav_left_green.gif
===================================================================
<<Binary file>>
Index: pix.gif
===================================================================
<<Binary file>>
Index: footer.jsp
===================================================================
RCS file:
/home/cvs/repository/sensei/src/webapp/jsp/sensei/include/footer.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- footer.jsp 10 Jan 2005 15:39:38 -0000 1.3
+++ footer.jsp 30 Nov 2005 12:20:57 -0000 1.4
@@ -5,27 +5,38 @@
</td>
</tr>
</html:messages>
-<tr>
- <td colspan="2" align="right">
- <br> <br>
- <font class="text"><bean:message
key="title.copyright"/> </font>
+<br>
+ <table align="center" border="0" cellspacing="0" cellpadding="5"
class="text" width="90%">
+ <tr>
+ <td align="right" colspan="2">
+ <br>
+
+ </td>
+ </tr>
+
+ </table>
</td>
</tr>
-<tr>
- <td colspan="2"> </td>
-</tr>
-</table>
+<tr><td colspan="2" align="left">
+<table border="0" width="100%" bgcolor="#ffffff"><tr><td width="48"><img
name="logo" src="images/logo-jahia.gif" border="0" width="45"
height="34"></td><td><img src="/jahia/jsp/jahia/engines/images/pix.gif"
border="0" width="1" height="10">
+<div id="copyright"><bean:message key="title.copyright"/></div><span
class="version">Jahia v. 5.0</span>
+</td></tr></table>
+ </td></tr>
+</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
-
<br><br>
</center>
</body>
-</html>
\ No newline at end of file
+</html>
+
+
+
+
Index: header.jsp
===================================================================
RCS file:
/home/cvs/repository/sensei/src/webapp/jsp/sensei/include/header.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- header.jsp 7 Feb 2005 11:24:37 -0000 1.5
+++ header.jsp 30 Nov 2005 12:20:57 -0000 1.6
@@ -3,30 +3,112 @@
<%@ taglib uri="/WEB-INF/etc/struts/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/etc/struts/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/etc/struts/struts-logic.tld" prefix="logic" %>
+
+
<html>
<head>
- <title><bean:message key="title.sensei"/></title>
- <html:base/>
- <link rel="stylesheet" href="sensei.css" type="text/css">
+ <title><bean:message key="title.jbpms"/></title>
+ <html:base/>
+
<% if (request.getAttribute("refresh")!= null) { %>
<meta http-equiv="refresh" content="<%= request.getAttribute("refresh")
%>">
<% } %>
</head>
+ <link rel="stylesheet" href="sensei.css" type="text/css">
+
+
+<style type="text/css">
+
+
+#copyright {
+ font-family: Verdana,Arial,Helvetica,sans-serif;
+ font-size: 12px;
+ color: #838383;
+
+}
+
+#poweredby {
+ color: #3E77B0;
+}
+
+.version {
+ float: right;
+ text-align: right;
+ font-size: 9px;
+ vertical-align: bottom;
+}
+
+h3 {
+ font-size: 16px;
+ color: #398EC3;
+ text-decoration: none;
+ font-weight: bold;
+}
+.copyright a:link {
+ color: #398EC3;
+ text-decoration: none;
+ font-weight: bold;
+}
+.button {
+ height: 30px;
+ display: inline;
+}
+
+.button a:link,
+ #wrapper .button a:visited {
+ text-decoration: none;
+ background-image: url( images/bg_button_up.gif );
+ border: 1px solid;
+ border-color: #D0D0D0 #555555 #555555 #D0D0D0;
+ font-size: 11px;
+ cursor: default;
+ color: black;
+ font-style: normal;
+ padding: 5px 5px 5px 5px;
+ height: 24px;
+ margin-left: 6px;
+}
+
+.button a:focus,
+ #wrapper .button a:hover {
+ border-top: 1px solid;
+ border-right: 2px solid;
+ border-left: 1px solid;
+ border-bottom: 2px solid;
+ border-color: #D0D0D0 #555555 #555555 #D0D0D0;
+ cursor: default;
+ height: 24px;
+ margin-left: 5px;
+}
+
+.button a:active {
+ background-image: url( images/bg_button_down.gif );
+ border: 1px solid;
+ border-color: #555555 #D0D0D0 #D0D0D0 #555555;
+ cursor: default;
+ margin-left: 6px;
+}
+
+</style>
+</head>
<body class="install" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0">
<center>
<br> <br> <br>
-<table cellpadding="1" cellspacing="0" bgcolor="#000000" width="90%"
border="0">
+<table cellpadding="2" cellspacing="0" bgcolor="#000033" width="700"
border="0">
<tr>
<td>
- <table cellpadding="0" cellspacing="0" width="100%" border="0">
+ <table cellpadding="0" cellspacing="0" width="700" border="0">
<tr>
- <td bgcolor="#92A4AD">
- <table width="100%" height="63" border="0" cellspacing="0"
cellpadding="0">
- <tr>
- <td width="126" height="63"><html:img
src="images/header.gif" width="126" height="63" /></td>
- <td width="100%" height="63"><html:img
src="images/header_bg.gif" width="100%" height="63" /></td>
- </tr>
-
-
+ <td bgcolor="#ffffff">
+ <table width="700" height="63" border="0" cellspacing="0"
cellpadding="0">
+
+ <tr>
+ <td align="center" class="text"><img name="process"
src="images/node.gif" width="48" height="48" border="0" align="middle"></td><td
align="left" class="text"><br><h3><bean:message
key="title.jbpms"/></h3> </td>
+ </tr>
+ </table>
+<center>
+<table cellpadding="2" cellspacing="0" border="0" width="90%">
+<tr>
+ <td>
Index: wizardDb.jsp
===================================================================
RCS file: /home/cvs/repository/sensei/src/webapp/jsp/sensei/wizardDb.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wizardDb.jsp 29 Nov 2005 14:46:52 -0000 1.6
+++ wizardDb.jsp 30 Nov 2005 12:20:57 -0000 1.7
@@ -2,6 +2,18 @@
<html:form action="configuration">
+ <tr>
+ <td class="text"><bean:message key="label.dbType"/></td>
+ <td>
+ <html:select property="dbType" styleClass="input"
onchange="javascript:submitButton.value='';submit()">
+ <html:option value="driver"
key="label.dbType.driver" />
+ <html:option value="datasource"
key="label.dbType.datasource" />
+ </html:select>
+ </td>
+ </tr>
+
+ <% if (!"datasource".equals(request.getAttribute("db.dbType")))
{ %>
+
<tr>
<td class="text"><bean:message key="label.dbUrl"/></td>
<td>
@@ -32,6 +44,17 @@
</td>
</tr>
+<% } else { %>
+
+ <tr>
+ <td class="text"><bean:message key="label.dsName"/></td>
+ <td>
+ <html:text property="dbDsName" styleClass="input"
size="30"/>
+ </td>
+ </tr>
+<% } %>
+
+
<tr>
<td class="text"><bean:message key="label.createTables"/></td>
<td>
@@ -40,7 +63,7 @@
</tr>
<tr>
- <td width="100%" height="2" colspan="2"><br><p></td>
+ <td width="100%" height="2" colspan="2"><img src="images/hr.gif"
width="300" height="2"></td>
</tr>
<tr>
Index: wizardError.jsp
===================================================================
RCS file: /home/cvs/repository/sensei/src/webapp/jsp/sensei/wizardError.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wizardError.jsp 29 Nov 2005 14:46:52 -0000 1.4
+++ wizardError.jsp 30 Nov 2005 12:20:57 -0000 1.5
@@ -12,7 +12,7 @@
<td width="100%" height="2" colspan="2" align="right">
<div id="buttons"> <div class="button">
<html:hidden property="submitButton" value="Previous" />
- <a
href="javascript:document.configurationForm.submit();"><bean:message
key="button.previous"/></a>
+ <br><a
href="javascript:document.configurationForm.submit();"><bean:message
key="button.previous"/></a>
</div></div>
</td>
</tr>
Index: wizardWelcome.jsp
===================================================================
RCS file:
/home/cvs/repository/sensei/src/webapp/jsp/sensei/wizardWelcome.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wizardWelcome.jsp 29 Nov 2005 14:46:52 -0000 1.4
+++ wizardWelcome.jsp 30 Nov 2005 12:20:57 -0000 1.5
@@ -12,7 +12,7 @@
<tr>
<td width="100%" height="2" colspan="2" align="right"> <div
id="buttons"> <div class="button">
<html:hidden property="submitButton" value="Next" />
- <a
href="javascript:document.configurationForm.submit();"><bean:message
key="button.next"/></a>
+ <br> <a
href="javascript:document.configurationForm.submit();"><bean:message
key="button.next"/></a>
</div></div>
</td>
</tr>
