ktlili 2005/10/12 15:04:35 CEST
Modified files:
core/src/conf/java ApplicationResources.properties
ApplicationResources_fr.properties
core/src/java/org/jahia/clipbuilder/html/struts
SelectPartForm.java
core/src/webapp/jsp/clipbuilder/html/actions browseAction.jsp
configureAction.jsp
descriptionAction.jsp
editAction.jsp
manageAction.jsp
previewAction.jsp
selectPartAction.jsp
testClipperAction.jsp
core/src/webapp/jsp/clipbuilder/html/templates
formTemplate.jsp
core/src/webapp/jsp/clipbuilder/sql editQueryForm.jsp
Log:
- change HTML clipBuilder CSS
- update cliBuilder-snapshot.jar
- fix bug: tag selection in chew mode + encoding in chew Mode
Revision Changes Path
1.8 +3 -1 jahia/core/src/conf/java/ApplicationResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/ApplicationResources.properties.diff?r1=1.7&r2=1.8&f=h
1.4 +4 -2
jahia/core/src/conf/java/ApplicationResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/ApplicationResources_fr.properties.diff?r1=1.3&r2=1.4&f=h
1.3 +1 -4
jahia/core/src/java/org/jahia/clipbuilder/html/struts/SelectPartForm.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/clipbuilder/html/struts/SelectPartForm.java.diff?r1=1.2&r2=1.3&f=h
1.2 +17 -21
jahia/core/src/webapp/jsp/clipbuilder/html/actions/browseAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/browseAction.jsp.diff?r1=1.1&r2=1.2&f=h
1.5 +4 -4
jahia/core/src/webapp/jsp/clipbuilder/html/actions/configureAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/configureAction.jsp.diff?r1=1.4&r2=1.5&f=h
1.3 +19 -18
jahia/core/src/webapp/jsp/clipbuilder/html/actions/descriptionAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/descriptionAction.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +29 -32
jahia/core/src/webapp/jsp/clipbuilder/html/actions/editAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/editAction.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +8 -45
jahia/core/src/webapp/jsp/clipbuilder/html/actions/manageAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/manageAction.jsp.diff?r1=1.2&r2=1.3&f=h
1.2 +12 -14
jahia/core/src/webapp/jsp/clipbuilder/html/actions/previewAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/previewAction.jsp.diff?r1=1.1&r2=1.2&f=h
1.4 +29 -28
jahia/core/src/webapp/jsp/clipbuilder/html/actions/selectPartAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/selectPartAction.jsp.diff?r1=1.3&r2=1.4&f=h
1.3 +20 -26
jahia/core/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp.diff?r1=1.2&r2=1.3&f=h
1.2 +73 -37
jahia/core/src/webapp/jsp/clipbuilder/html/templates/formTemplate.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/templates/formTemplate.jsp.diff?r1=1.1&r2=1.2&f=h
1.4 +10 -10
jahia/core/src/webapp/jsp/clipbuilder/sql/editQueryForm.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/sql/editQueryForm.jsp.diff?r1=1.3&r2=1.4&f=h
Index: ApplicationResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/ApplicationResources.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationResources.properties 12 Oct 2005 09:01:52 -0000 1.7
+++ ApplicationResources.properties 12 Oct 2005 13:04:34 -0000 1.8
@@ -47,7 +47,7 @@
#info
information = Information
-
+htmlclipbuilder.title = HTML Portlet builder
##################
# Description form
##################
@@ -272,6 +272,7 @@
testClipper.webBrowserSimulator.mode.onload = whith Javascript
testClipper.webBrowserSimulator.mode.loop = whithout Javascript
testClipper.error.parameter = Input parameter value not set
+testClipper.resetCache = Reset cache
#WebBrowser
webBrowser.frame.warning = Warning
@@ -336,6 +337,7 @@
sql.portlet.description = description
sql.query.nbResultPerTable = Max number of rows per table
sql.messages.database.empty = there is no default configuration.
+sql.preview = Preview
error.sql = Error: check values of parameters
error.sql.Numberformat = Error: Table size value must be a positive integer.
Index: ApplicationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/ApplicationResources_fr.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationResources_fr.properties 12 Oct 2005 09:01:52 -0000
1.3
+++ ApplicationResources_fr.properties 12 Oct 2005 13:04:34 -0000
1.4
@@ -31,7 +31,7 @@
#info
information = Information
-
+htmlclipbuilder.title = Générateur de portlet HTML
##################
# Description form
##################
@@ -256,6 +256,7 @@
testClipper.webBrowserSimulator.mode.onload = whith Javascript
testClipper.webBrowserSimulator.mode.loop = whithout Javascript
testClipper.error.parameter = Il manque une valeur de paramètre
+testClipper.resetCache = Initialiser la cache
#WebBrowser
webBrowser.frame.warning = Attention
@@ -320,5 +321,6 @@
sql.portlet.description = Description
sql.query.nbResultPerTable = Nombre de ligne maximal par table
sql.messages.database.empty = Il n'y pas de valeur par défaut.
-error.sql = Erreur: Vérifier la valeurs des différents paramètres.
+sql.preview = Prévisualiser
+error.sql = Erreur: Vérifier la valeur des différents paramètres.
error.sql.Numberformat = Erreur: Le nombre de ligne maximal doit être un
entier positif.
Index: SelectPartForm.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/clipbuilder/html/struts/SelectPartForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SelectPartForm.java 12 Oct 2005 09:01:52 -0000 1.2
+++ SelectPartForm.java 12 Oct 2005 13:04:34 -0000 1.3
@@ -21,7 +21,7 @@
private String webClippingPartHashCode;
private String webClippingTagName;
private String webClippingXPath = "//form";
- private String webClippingShowCss;
+ private String webClippingShowCss = "true";
private String webClippingShowJavascript;
@@ -214,9 +214,6 @@
[EMAIL PROTECTED] The WebClippingTagName value
*/
public String getWebClippingTagName() {
- if (webClippingTagName == null ||
webClippingTagName.equalsIgnoreCase("")) {
- webClippingTagName = "table";
- }
return webClippingTagName;
}
Index: browseAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/browseAction.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- browseAction.jsp 19 Aug 2005 13:42:53 -0000 1.1
+++ browseAction.jsp 12 Oct 2005 13:04:34 -0000 1.2
@@ -4,33 +4,27 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
<table align="center" class="principal" width="100%">
<html:form action="browse" method="post">
<!-- Header -->
- <table align="center" class="text" width="100%">
+ <table align="center" class="principal" width="100%">
<!-- Title -->
<tr>
- <td class="text">
- <b><bean:message key="browse.title"/></b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
+ <td class="boxtitleborder1">
+ <bean:message key="browse.title"/>
</td>
<!-- Help -->
- <td width="10%">
- <%
- String helpUrl =
response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/browseHelp.jsp");
- %>
- <a href="javascript:popitup('<%=helpUrl%>')">
+ <td class="boxtitleborder1" width="10%">
+ <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/browseHelp.jsp")%>')">
<bean:message key="wizard.help"/>
</a>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
</tr>
</table>
<!-- Buttons -->
<table align="center" class="principal" width="100%">
<tr>
- <td>
+ <td class="topmenubuttons">
<!-- Init-->
<html:submit property="webClippingAction">
<bean:message key="browse.resetRecord"/>
@@ -108,36 +102,36 @@
</table>
</logic:messagesPresent>
<!-- Information -->
- <table class="text" align="center" cellpadding="0" cellspacing="1"
width="100%">
+ <table align="center" cellpadding="0" cellspacing="1" width="100%">
<tbody>
<tr>
<td>
- <table class="text" align="center" bgcolor="#ffffff" border="1"
rules="group" width="100%">
+ <table align="center" bgcolor="#ffffff" border="0" width="100%">
<tbody>
<tr>
- <td class="bold install" align="center">
+ <td class="bold" align="center" bgcolor="#dcdcdc">
<bean:message key="information"/>
</td>
</tr>
<tr>
<td>
<!-- Browse Information -->
- <table class="text">
+ <table>
<tr>
<!-- Automatic record-->
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="browse.beginRecord.tilte"/>
</td>
- <td class="text">
+ <td>
<bean:message
key="browse.beginRecord.description"/>
</td>
</tr>
<tr>
<!-- Add manually-->
- <td align="center" width="33%" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="browse.addUrl"/>
</td>
- <td class="text">
+ <td>
<html:text property="sourceUrl" size="25"/>
<html:submit property="webClippingAction"
disabled="false">
<bean:message key="browse.button.addUrl"/>
@@ -153,7 +147,9 @@
</tr>
</tbody>
</table>
+ <table width="100%">
+ <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
+ </table>
</html:form>
</table>
<!-- HTML page -->
-<iframe
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="100%" frameborder="1" scrolling="auto"></iframe>
Index: configureAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/configureAction.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configureAction.jsp 11 Oct 2005 17:58:53 -0000 1.4
+++ configureAction.jsp 12 Oct 2005 13:04:34 -0000 1.5
@@ -22,7 +22,7 @@
</td>
<!-- Help -->
<td class="boxtitleborder1" width="10%">
- <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/configureHelp.jsp")%>')">
+ <a
href="javascript:popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/configureHelp.jsp")%>')">
<bean:message key="wizard.help"/>
</a>
</td>
@@ -316,6 +316,9 @@
<td class="leftlevel2 waInput">
<!-- See HTMLDocument class for value-->
<html:select property="portletContinualClipping"
size="1">
+ <html:option value="3">
+ <bean:message
key="portlet.config.clipbuilder.popup.actif"/>
+ </html:option>
<html:option value="4">
<bean:message
key="portlet.config.clipbuilder.popup.passif"/>
</html:option>
@@ -325,9 +328,6 @@
<html:option value="2">
<bean:message
key="portlet.config.clipbuilder.iframe.passif"/>
</html:option>
- <html:option value="3">
- <bean:message
key="portlet.config.clipbuilder.popup.actif"/>
- </html:option>
</html:select>
</td>
</tr>
Index: descriptionAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/descriptionAction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- descriptionAction.jsp 11 Oct 2005 17:58:53 -0000 1.2
+++ descriptionAction.jsp 12 Oct 2005 13:04:34 -0000 1.3
@@ -4,33 +4,34 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
-
<html:form action="beginExtractWizard" method="post">
<table align="center" class="principal" width="100%" border="1">
+
<!-- Header -->
- <table align="center" width="100%">
+ <table class="header" align="center" width="100%">
<tr>
<!-- title -->
- <td class="text" colspan="2">
- <b><bean:message key="description.title"/></b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
+ <td class="boxtitleborder1">
+ <bean:message key="description.title"/>
</td>
<!-- config -->
- <td align="right">
+ <td class="boxtitleborder1" width="10%">
<html:link
action="/configure.do?webClippingAction=initDescription">
<bean:message key="description.button.configure"/>
</html:link>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
-
+ </td>
+ <!-- Help -->
+ <td class="boxtitleborder1" width="10%">
+ <a
href="javascript:popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/descriptionHelp.jsp")%>')">
+ <bean:message key="wizard.help"/>
+ </a>
</td>
</tr>
</table>
-
<!-- Buttons -->
- <table align="center" class="text" width="100%">
+ <table align="center" class="principal" width="100%">
<tr>
- <td>
+ <td class="topmenubuttons">
<logic:present name="browseForm">
<html:submit property="webClippingAction">
<bean:message key="button.description.update"/>
@@ -77,11 +78,11 @@
</table>
</logic:messagesPresent>
<!-- Main purpose of the page-->
- <table width="66%">
+ <table>
<tr>
<tr>
- <td align="center" class="bold install">
- <bean:message key="description.name"/>
+ <td class="topmenugreen bold waBG">
+ <bean:message key="description.name"/>
</td>
<td class="leftlevel2 waInput">
<html:text property="webClippingName" size="35"/>
@@ -89,7 +90,7 @@
</tr>
<!-- Description -->
<tr>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="description.description"/>
</td>
<td class="leftlevel2 waInput">
@@ -98,7 +99,7 @@
</tr>
<!-- Url -->
<tr>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="description.url"/>
</td>
<td class="leftlevel2 waInput">
@@ -114,7 +115,7 @@
<!-- Buttons -->
<table align="center" class="principal" width="100%">
<tr>
- <td>
+ <td class="topmenubuttons">
<logic:present name="browseForm">
<html:submit property="webClippingAction">
<bean:message key="button.description.update"/>
Index: editAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/editAction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- editAction.jsp 28 Sep 2005 10:19:37 -0000 1.2
+++ editAction.jsp 12 Oct 2005 13:04:34 -0000 1.3
@@ -10,7 +10,6 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
<!-- javaScript-->
<script language="javascript">
// set the value of webClippinAction parameter
@@ -36,25 +35,21 @@
<table align="center" class="principal" width="100%">
<!-- Title -->
<tr>
- <td class="text">
- <b><bean:message key="edit.title"/></b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
+ <td class="boxtitleborder1">
+ <bean:message key="edit.title"/>
</td>
<!-- Help -->
- <td width="10%">
- <%
- String helpUrl =
response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/editHelp.jsp");
- %>
- <a href="javascript:popitup('<%=helpUrl%>')">
<bean:message key="wizard.help"/>
+ <td class="boxtitleborder1" width="10%">
+ <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/editHelp.jsp")%>')">
+ <bean:message key="wizard.help"/>
</a>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
</tr>
</table>
<!-- Buttons -->
- <table align="center" class="text" width="100%">
+ <table align="center" class="principal" width="100%">
<tr>
- <td>
+ <td class="topmenubuttons">
<html:submit property="webClippingAction">
<bean:message key="edit.validate"/>
</html:submit>
@@ -71,9 +66,9 @@
</tr>
</table>
<!-- Edit Information -->
- <table class="text">
+ <table>
<tr valign="middle">
- <td class="text">
+ <td>
<bean:message key="edit.selectUrl"/>
<html:select name="editParamForm" property="selectedUrl"
onchange="setActionAndSubmit(this.form,'changeView')">
<!-- Get all the recorded url-->
@@ -97,33 +92,33 @@
</tr>
</table>
<!-- Main -->
- <table border="1" rules="groups" class="text" width="100%">
+ <table width="100%">
<!-- Edit Form parameters in tabled view -->
<tr>
<!-- All parameter-->
<td>
- <table class="text" width="100%">
+ <table width="100%">
<!-- Labels-->
<tr>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="edit.name"/>
</td>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="edit.mappingName"/>
</td>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="edit.usedValue"/>
</td>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="edit.param.useAsDefaultValue"/>
</td>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="edit.visibility"/>
</td>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="edit.update"/>
</td>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="edit.type"/>
</td>
@@ -135,52 +130,54 @@
<tr>
<!-- Name -->
- <td class="text">
+ <td class="leftlevel2 waInput">
<bean:write name="currentParam" property="name"/>
</td>
<!-- Mapping -->
- <td class="text">
+ <td class="leftlevel2 waInput">
<html:text name="currentParam" property="mapping"/>
</td>
<!-- Values-->
<logic:notEqual name="currentParam" property="type" value="password">
- <td class="text">
+ <td class="leftlevel2 waInput">
<bean:write name="currentParam" property="usedValue"/>
</td>
</logic:notEqual>
<logic:equal name="currentParam" property="type" value="password">
- <td class="text">
+ <td class="leftlevel2 waInput">
<bean:message key="edit.password.value"/>
</td>
</logic:equal>
<!-- Use as default value -->
- <td class="text">
+ <td class="leftlevel2 waInput">
<html:select name="currentParam" property="useAsDefaultValue">
<html:option value="true" key="edit.useAsDefault.true"/>
<html:option value="false" key="edit.useAsDefault.false"/>
</html:select>
</td>
<!-- Visibility -->
- <td class="text">
+ <td class="leftlevel2 waInput">
<html:select name="currentParam" property="visibility">
<html:option value="true" key="edit.visibility.true"/>
<html:option value="false" key="edit.visibility.false"/>
</html:select>
</td>
<!-- Update -->
- <td class="text">
+ <td class="leftlevel2 waInput">
<html:select name="currentParam" property="update">
<html:option value="true" key="edit.update.true"/>
<html:option value="false" key="edit.update.false"/>
</html:select>
</td>
<!-- form type-->
- <td class="text">
+ <td class="leftlevel2 waInput">
<bean:write name="currentParam" property="type"/>
</td>
</tr>
</logic:iterate> </table>
</table>
+<table width="100%">
+ <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
+ </table>
</html:form></table><!-- HTML part -->
-<iframe
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="100%" frameborder="1" scrolling="auto"></iframe>
Index: manageAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/manageAction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- manageAction.jsp 26 Aug 2005 16:17:53 -0000 1.2
+++ manageAction.jsp 12 Oct 2005 13:04:34 -0000 1.3
@@ -4,32 +4,23 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia"%>
<[EMAIL PROTECTED] language="Java"
import="org.jahia.clipbuilder.html.bean.*"%>
-<[EMAIL PROTECTED] language="Java" import="org.jahia.data.*"%>
-<[EMAIL PROTECTED] import="org.jahia.bin.*"%>
-<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
-<%// http files path.%>
-<jsp:useBean id="userMessage" class="java.lang.String" scope="session"/>
<html:form action="manageAction">
<!-- Main table -->
- <table align="center" width="100%">
+ <table class="boxtitleborder1" align="center" width="100%">
<!-- Header -->
- <table class="text" align="center" width="100%">
+ <table align="center" width="100%">
+ <!-- Title-->
<tr>
- <!-- Title-->
- <td class="text" colspan="2">
- <b>
+ <td colspan="2" class="boxtitleborder1">
<bean:message key="manage.title"/>
- </b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
</tr>
</table>
<!-- Buttons -->
- <table align="center" class="principal" width="100%">
+ <table class="principal" align="center" width="100%">
<tr>
- <td>
+ <td class="topmenubuttons">
<!-- Add -->
<html:submit property="webClippingAction">
<bean:message key="manage.button.add"/>
@@ -63,9 +54,9 @@
</tr>
</table>
<!-- Main -->
- <table>
+ <table class="principal">
<tr>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="manage.listClipper"/>
</td>
<logic:notEqual name="<%=ClippersManagerBean.class.toString()%>"
property="empty" value="0">
@@ -88,31 +79,3 @@
</table>
</table>
</html:form>
-<br/>
-<br/>
-<table border="0" cellpadding="0" cellspacing="0">
- <!-- Help -->
- <tr>
- <td nowrap width="145" valign="top">
- <font class="text">
- <b>
- <jahia:adminResourceBundle
resourceName="org.jahia.admin.otherOperations.label"/>
-
- :
-
-</b>
- </font>
- </td>
- <td valign="top">
- <%String helpUrl = response.encodeURL(request.getContextPath() +
"/jsp/clipbuilder/html/help/manageHelp.jsp"); %>
- <li> <font class="text"> <a
href="javascript:popitup('<%=helpUrl%>')"> <bean:message key="wizard.help"/>
</a> </font> </li>
- </td>
- </tr>
- <!-- Back to menu -->
- <tr>
- <td nowrap width="145" valign="top"> </td>
- <td valign="top">
- <li> <font class="text"> <a
href='<%=JahiaAdministration.composeActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle
resourceName="org.jahia.admin.backToMenu.label"/></a><br> </font> </li>
- </td>
- </tr>
-</table>
Index: previewAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/previewAction.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- previewAction.jsp 19 Aug 2005 13:42:53 -0000 1.1
+++ previewAction.jsp 12 Oct 2005 13:04:34 -0000 1.2
@@ -5,34 +5,30 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
<[EMAIL PROTECTED] import="org.jahia.clipbuilder.html.struts.Util.*;"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
<table align="center" class="principal" width="100%">
<html:form action="saveClipper" method="post">
<!-- Header -->
- <table align="center" class="text" width="100%">
+ <table align="center" class="principal" width="100%">
<!-- Title -->
<tr>
- <td class="text">
- <b><bean:message key="preview.title"/></b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
+ <td class="boxtitleborder1">
+ <bean:message key="preview.title"/>
</td>
<!-- Help -->
- <td width="10%">
- <%
- String helpUrl =
response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/previewHelp.jsp");
- %>
- <a href="javascript:popitup('<%=helpUrl%>')">
<bean:message key="wizard.help"/>
+ <td class="boxtitleborder1" width="10%">
+ <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/previewHelp.jsp")%>')">
+
+ <bean:message key="wizard.help"/>
</a>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
</tr>
</table>
<!-- Buttons -->
- <table align="center" class="text" width="100%">
+ <table align="center" class="principal" width="100%">
<tr>
- <td>
+ <td class="topmenubuttons">
<logic:equal name="previewForm" property="from" value="wizard">
<!-- Done -->
<html:submit property="webClippingAction">
@@ -48,7 +44,9 @@
</td>
</tr>
</table>
+ <table width="100%">
+ <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
+ </table>
</html:form>
<!-- HTML page -->
</table>
-<iframe
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="100%" frameborder="1" scrolling="auto"></iframe>
Index: selectPartAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/selectPartAction.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- selectPartAction.jsp 12 Oct 2005 09:01:53 -0000 1.3
+++ selectPartAction.jsp 12 Oct 2005 13:04:34 -0000 1.4
@@ -4,7 +4,6 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
<script language="javascript" type="text/javascript">
// set the selected content
function setSelectContent(f) {
@@ -50,45 +49,44 @@
f.submit();
return;
}
-</script>
-<%
+</script><%
String options = "\n";
javax.swing.text.html.HTML.Tag[] tags =
javax.swing.text.html.HTML.getAllTags();
+ String selectedTagValue = request.getParameter("webClippingTagName");
+ if (selectedTagValue == null) {
+ selectedTagValue = "table";
+ }
for (int i = 0; i < tags.length; i++) {
String name = tags[i].toString();
options = options + "\n" + "<option value=" + name;
- /*if (name.equalsIgnoreCase("table")) {
+ if (name.equalsIgnoreCase(selectedTagValue)) {
options = options + " selected=selected" + " ";
- }*/
+ }
options = options + " > " + name + "</option>";
}
%>
-<table class="text" align="center" width="100%">
+<table align="center" width="100%">
<html:form action="selectPart">
<html:hidden property="selectedContent"/>
<!-- Header -->
- <table align="center" class="text" width="100%">
+ <table align="center" class="principal" width="100%">
<!-- Title -->
<tr>
- <td class="text">
- <b> <bean:message key="select.title"/> </b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
+ <td class="boxtitleborder1">
+ <bean:message key="select.title"/>
</td>
<!-- Help -->
- <td width="10%">
- <%
- String helpUrl =
response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/selectPartHelp.jsp");
- %>
- <a href="javascript:popitup('<%=helpUrl%>')">
<bean:message key="wizard.help"/>
+ <td class="boxtitleborder1" width="10%">
+ <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/selectPartHelp.jsp")%>')">
+ <bean:message key="wizard.help"/>
</a>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
</tr>
</table>
<!-- Buttons -->
<table align="center" class="principal" width="100%">
<tr>
- <td>
+ <td class="topmenubuttons">
<!-- Buttons depending on the clipping method-->
<logic:notEqual name="selectPartForm" value="1"
property="clippingMethod">
<!-- Manual -->
@@ -110,10 +108,10 @@
</tr>
</table>
<!-- Select option -->
- <table class="bold install">
+ <table>
<tr>
<!-- Selecting the clipping method-->
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="select.clipbuilderMethod"/>
<html:select property="clippingMethod" size="1"
onchange="setActionAndSubmit(this.form,'changeClippingMethod');">
<html:option value="1">
@@ -122,10 +120,10 @@
<html:option value="3">
<bean:message key="select.clipbuilderMethod.form"/>
</html:option>
- <html:option value="4">
+ <html:option value="4">
<bean:message key="select.clipbuilderMethod.xPath"/>
</html:option>
- <html:option value="5">
+ <html:option value="5">
<bean:message key="select.clipbuilderMethod.all"/>
</html:option>
<html:option value="0">
@@ -136,7 +134,7 @@
<!-- Selecting the type of the content-->
<logic:equal name="selectPartForm" value="0"
property="clippingMethod">
<!-- case: manual-->
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="select.typeContent"/>
<html:select property="webClippingTypeContent" size="1"
value="0">
<html:option value="0">
@@ -150,26 +148,29 @@
</logic:equal>
<logic:equal name="selectPartForm" value="1"
property="clippingMethod">
<!-- case: chew-->
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="select.tagName"/>
<html:select property="webClippingTagName" size="1"
onchange="setActionAndSubmit(this.form,'autoCut');"><%=options %>
</html:select>
</td>
</logic:equal>
<logic:equal name="selectPartForm" value="4"
property="clippingMethod">
<!-- case: chew-->
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="select.xpath.enter"/>
<html:text property="webClippingXPath" size="10"/>
</td>
</logic:equal>
<!-- all cases-->
- <td align="center" class="bold install">
- <bean:message key="select.showCss"/>
- <html:checkbox property="webClippingShowCss"/>
+ <td class="topmenugreen bold waBG">
+ <bean:message key="select.showCss"/>
+ <html:checkbox property="webClippingShowCss"/>
</td>
</tr>
</table>
+ <table width="100%">
+ <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
+ </table>
</html:form>
</table>
<!-- HTML part -->
-<iframe name="webBrowser"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="100%" frameborder="1" scrolling="auto"></iframe>
+
Index: testClipperAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testClipperAction.jsp 8 Sep 2005 07:54:55 -0000 1.2
+++ testClipperAction.jsp 12 Oct 2005 13:04:34 -0000 1.3
@@ -10,8 +10,6 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
-
<!-- javaScript-->
<script language="javascript" type="">
// set the value of webClippinAction parameter
@@ -31,33 +29,29 @@
return;
}
</script><!-- Main -->
-<table align="center" class="text" width="100%">
+<table align="center" class="principal" width="100%">
<html:form action="testClipper" method="post">
<!-- Header -->
<table align="center" width="100%">
<!-- Title -->
<table align="center" width="100%">
<tr>
- <td class="text">
- <b> <bean:message key="testClipper.title"/> </b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
+ <td class="boxtitleborder1">
+ <bean:message key="testClipper.title"/>
</td>
<!-- Help -->
- <td width="10%">
- <%
- String helpUrl =
response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/testClipperHelp.jsp");
- %>
- <a href="javascript:popitup('<%=helpUrl%>')">
<bean:message key="wizard.help"/>
+ <td class="boxtitleborder1" width="10%">
+ <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/testHelp.jsp")%>')">
+ <bean:message key="wizard.help"/>
</a>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
</tr>
</table>
<!-- Buttons -->
<table align="center" class="principal" width="100%">
<table align="center" width="100%">
- <tr>
- <td>
+ <tr class="topmenubuttons">
+ <td class="topmenubuttons">
<html:submit property="webClippingAction">
<bean:message key="testClipper.button.go"/>
</html:submit>
@@ -82,7 +76,7 @@
<tr>
<td>
<UL>
- <li> <bean:write
name="testClipper.error.parameter"/> </li>
+ <li> <bean:message
key="testClipper.error.parameter"/> </li>
<html:messages id="error">
<LI> <bean:write name="error"/> </LI>
</html:messages>
@@ -97,30 +91,31 @@
</table>
</logic:messagesPresent>
<!-- Edit Information -->
- <table class="text">
+ <table>
<tr valign="middle">
- <td align="center" class="bold install">
+ <td>
<bean:message key="testClipper.select.url"/>
- <html:select name="testClipperForm" property="selectedUrl"
onchange="setActionAndSubmit(this.form,'changeView')">
+ <html:select name="testClipperForm" property="selectedUrl"
onchange="setActionAndSubmit(this.form,'changeView')">
<!-- Get all the recorded url-->
<html:optionsCollection name="clipperBean"
property="urlListBean" value="position" label="labelForStrut"/>
</html:select>
+ <html:checkbox property="resetCache"
value="true"><bean:message key="testClipper.resetCache"/></html:checkbox>
</td>
</tr>
</table>
<!-- Main -->
- <table class="text" width="100%">
+ <table width="100%">
<!-- Edit Form parameters in tabled view -->
<tr>
<!-- All parameter-->
<td>
- <table border="1" rules="group" class="text" width="100%">
+ <table width="100%">
<!-- Labels-->
<tr>
- <td width="50%" align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="testClipper.parameter"/>
</td>
- <td align="center" class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="testClipper.value"/>
</td>
</tr>
@@ -130,17 +125,17 @@
<!-- new parameter-->
<tr>
<!-- Mapping -->
- <td class="text">
+ <td class="leftlevel2 waInput">
<bean:write name="currentParam" property="mapping"/>
</td>
<!-- Values-->
<logic:notEqual name="currentParam" property="type"
value="password">
- <td class="text">
+ <td class="leftlevel2 waInput">
<html:text name="currentParam"
property="usedValue"/>
</td>
</logic:notEqual>
<logic:equal name="currentParam" property="type"
value="password">
- <td class="text">
+ <td class="leftlevel2 waInput">
<html:password name="currentParam"
property="usedValue"/>
</td>
</logic:equal>
@@ -158,7 +153,6 @@
</table>
-
</html:form>
</table>
</table>
Index: formTemplate.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/templates/formTemplate.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- formTemplate.jsp 19 Aug 2005 13:42:55 -0000 1.1
+++ formTemplate.jsp 12 Oct 2005 13:04:35 -0000 1.2
@@ -4,17 +4,15 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
-
+<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia"%>
+<[EMAIL PROTECTED] import="org.jahia.bin.*"%>
<[EMAIL PROTECTED] language="Java" import="java.util.*"%>
<html:html>
<head>
<link rel="stylesheet"
href="<%=response.encodeURL(request.getContextPath()+"/html/startup/clipbuilder/web_css.jsp?colorSet=blue")%>"
type="text/css"/>
<link rel="stylesheet"
href="<%=response.encodeURL(request.getContextPath()+"/jsp/jahia/engines/css/jahia.css")%>"
type="text/css">
<link rel="stylesheet"
href="<%=response.encodeURL(request.getContextPath()+"/html/startup/clipbuilder/style.css")%>"
type="text/css"/>
-
- <script language="javascript"
src="<%=response.encodeURL(request.getContextPath()+"/jsp/jahia/engines/../javascript/jahia.js")%>"></script>
- <html:base/>
+<script language="javascript"
src="<%=response.encodeURL(request.getContextPath()+"/jsp/jahia/engines/../javascript/jahia.js")%>"></script>
<html:base/>
<script LANGUAGE="JavaScript" TYPE="text/javascript">
<!--
function popitup(url)
@@ -25,40 +23,78 @@
// -->
</script></head>
-<body class="text" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0" onUnload="closeEngineWin()" onClose="closeEngineWin()">
- <table width="100%" height="63" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="126" height="63"><img
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.header.image"/>" width="126" height="63" alt=""></td>
- <td width="100%" height="63"><img
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.headerBg.image"/>" width="100%" height="63" alt=""></td>
- </tr>
- </table>
-
- <table class="text" align="center" width="100%">
- <!-- Main table-->
- <!-- Wizard header-->
- <logic:present name="descriptionClipperForm">
+<body class="install">
+ <center>
+ <br/>
+ <br/>
+ <br/>
+ <table cellpadding="1" cellspacing="0" width="80%" border="0">
<tr>
- <td align="center">
- <jsp:include flush="true" page="/jsp/clipbuilder/html/wizard.jsp"/>
+ <td>
+ <!-- Jahia Image -->
+ <table class="text" height="63" border="0" cellspacing="0"
cellpadding="0">
+ <tr>
+ <td width="126" height="63">
+ <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.header.image"/>" width="126" height="63" alt="">
+ </td>
+ <td width="100%" height="63">
+ <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.headerBg.image"/>" width="100%" height="63" alt="">
+ </td>
+ </tr>
+ </table>
+ <!-- back to menu-->
+ <table class="text" width="100%">
+ <!-- Title -->
+ <tr>
+ <td class="text">
+ <table class="text" width="100%">
+ <tr>
+ <td class="text">
+ <b>
+ <bean:message key="htmlclipbuilder.title"/>
+ </b>
+ </td>
+ <td align="right" class="text">
+ <a
href='<%=JahiaAdministration.composeActionURL(request,response,"displaymenu","")%>'>
+ <jahia:adminResourceBundle
resourceName="org.jahia.admin.backToMenu.label"/>
+ </a>
+ </td>
+ </tr>
+ </table>
+ <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
+ </td>
+ </tr>
+ </table>
+ <table class="text" align="center" width="100%">
+ <!-- Main table-->
+ <!-- Wizard header-->
+ <logic:present name="descriptionClipperForm">
+ <tr>
+ <td align="center">
+ <jsp:include flush="true"
page="/jsp/clipbuilder/html/wizard.jsp"/>
+ </td>
+ </tr>
+ </logic:present>
+ <logic:notPresent name="descriptionClipperForm">
+ <logic:present name="testClipperForm">
+ <tr>
+ <td align="center">
+ <jsp:include flush="true"
page="/jsp/clipbuilder/html/testHeader.jsp"/>
+ </td>
+ </tr>
+ </logic:present>
+ </logic:notPresent>
+ <!-- Action -->
+ <tr>
+ <td>
+ <!-- put here the inculded jsp depending on the action -->
+ <tiles:get name="jahia.webClipping.action"/>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
- </logic:present>
- <logic:notPresent name="descriptionClipperForm">
- <logic:present name="testClipperForm">
- <tr>
- <td align="center">
- <jsp:include flush="true"
page="/jsp/clipbuilder/html/testHeader.jsp"/>
- </td>
- </tr>
- </logic:present>
- </logic:notPresent>
- <!-- Action -->
- <tr>
- <td>
- <!-- put here the inculded jsp depending on the action -->
- <tiles:get name="jahia.webClipping.action"/>
- </td>
- </tr>
- </table>
+ </table>
+ </center>
</body>
</html:html>
Index: editQueryForm.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/sql/editQueryForm.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- editQueryForm.jsp 11 Oct 2005 17:58:53 -0000 1.3
+++ editQueryForm.jsp 12 Oct 2005 13:04:35 -0000 1.4
@@ -24,7 +24,7 @@
<center></br></br></br> <table cellpadding="1" cellspacing="0"
width="80%" border="0">
<tr>
<td bgcolor="#000000">
- <!-- Jhaia Image -->
+ <!-- Jahia Image -->
<table class="text" height="63" border="0" cellspacing="0"
cellpadding="0">
<tr>
<td width="126" height="63">
@@ -68,7 +68,7 @@
<table class="principal" width="100%">
<!-- Database connection -->
<tr>
- <td class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="sql.database.connection"/>
</td>
</tr>
@@ -109,7 +109,6 @@
</logic:messagesPresent>
</td>
</tr>
-
<!-- Properties-->
<tr>
<td>
@@ -185,7 +184,7 @@
</td>
</tr>
<tr>
- <td class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="sql.query.properties"/>
</td>
</tr>
@@ -231,7 +230,7 @@
</td>
</tr>
<tr>
- <td class="bold install">
+ <td class="topmenugreen bold waBG">
<bean:message key="sql.portlet.properties"/>
</td>
</tr>
@@ -267,7 +266,9 @@
</td>
</tr>
<tr>
- <td class="bold install">Preview</td>
+ <td class="topmenugreen bold waBG">
+ <bean:message key="sql.preview"/>
+ </td>
</tr>
<tr>
<td>
@@ -304,9 +305,8 @@
</td>
</tr>
</table>
-
-
-
-
+ </td>
+ </tr>
+ </table>
</body>
</html:html>
