ktlili 2005/10/11 19:58:53 CEST
Modified files:
core/src/webapp/jsp/clipbuilder/html/actions
configureAction.jsp
descriptionAction.jsp
core/src/webapp/jsp/clipbuilder/sql editQueryForm.jsp
Log:
- add default values for HTMlclipBuilder
Revision Changes Path
1.4 +15 -15
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.3&r2=1.4&f=h
1.2 +0 -8
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.1&r2=1.2&f=h
1.3 +8 -1
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.2&r2=1.3&f=h
Index: configureAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/configureAction.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configureAction.jsp 1 Oct 2005 15:32:24 -0000 1.3
+++ configureAction.jsp 11 Oct 2005 17:58:53 -0000 1.4
@@ -127,15 +127,15 @@
</td>
<td class="leftlevel2 waInput">
<html:select property="browserJavascriptCode" size="1">
+ <html:option value="2">
+ <bean:message
key="configuration.browser.javascript.code.nothing"/>
+ </html:option>
<html:option value="0">
<bean:message
key="configuration.browser.javascript.code.remove"/>
</html:option>
<html:option value="1">
<bean:message
key="configuration.browser.javascript.code.refactor"/>
</html:option>
- <html:option value="2">
- <bean:message
key="configuration.browser.javascript.code.nothing"/>
- </html:option>
</html:select>
</td>
</tr>
@@ -146,15 +146,15 @@
</td>
<td class="leftlevel2 waInput">
<html:select property="browserJavascriptEvent"
size="1">
+ <html:option value="2">
+ <bean:message
key="configuration.browser.javascript.event.nothing"/>
+ </html:option>
<html:option value="0">
<bean:message
key="configuration.browser.javascript.event.remove"/>
</html:option>
<html:option value="1">
<bean:message
key="configuration.browser.javascript.event.refactor"/>
</html:option>
- <html:option value="2">
- <bean:message
key="configuration.browser.javascript.event.nothing"/>
- </html:option>
</html:select>
</td>
</tr>
@@ -184,12 +184,12 @@
</td>
<td class="leftlevel2 waInput">
<html:select property="client" size="1">
- <html:option value="0">
- <bean:message key="client.type.htmlunit"/>
- </html:option>
<html:option value="1">
<bean:message key="client.type.httpClient"/>
</html:option>
+ <html:option value="0">
+ <bean:message key="client.type.htmlunit"/>
+ </html:option>
</html:select>
</td>
</tr>
@@ -238,12 +238,12 @@
<td class="leftlevel2 waInput">
<!-- See HTMLDocument class for value-->
<html:select property="htmlDocument" size="1">
- <html:option value="0">
- <bean:message key="htmlDocument.type.dom"/>
- </html:option>
<html:option value="1">
<bean:message key="htmlDocument.type.htmlparser"/>
</html:option>
+ <html:option value="0">
+ <bean:message key="htmlDocument.type.dom"/>
+ </html:option>
</html:select>
</td>
</tr>
@@ -316,6 +316,9 @@
<td class="leftlevel2 waInput">
<!-- See HTMLDocument class for value-->
<html:select property="portletContinualClipping"
size="1">
+ <html:option value="4">
+ <bean:message
key="portlet.config.clipbuilder.popup.passif"/>
+ </html:option>
<html:option value="1">
<bean:message
key="portlet.config.clipbuilder.iframe.actif"/>
</html:option>
@@ -325,9 +328,6 @@
<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>
</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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- descriptionAction.jsp 19 Aug 2005 13:42:53 -0000 1.1
+++ descriptionAction.jsp 11 Oct 2005 17:58:53 -0000 1.2
@@ -24,14 +24,6 @@
<img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
-
- <!-- Help -->
- <td width="10%">
- <a
href="javascript:popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/descriptionHelp.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>
Index: editQueryForm.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/sql/editQueryForm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- editQueryForm.jsp 1 Oct 2005 15:32:24 -0000 1.2
+++ editQueryForm.jsp 11 Oct 2005 17:58:53 -0000 1.3
@@ -85,7 +85,9 @@
<tr>
<td align="center"
bgcolor="#dcdcdc">
<font color="#cc0000">
- <bean:message
key="error.warning"/>
+ <html:messages id="msg"
message="true">
+ <bean:message
key="error.error"/>
+ </html:messages>
</font>
</td>
</tr>
@@ -107,6 +109,7 @@
</logic:messagesPresent>
</td>
</tr>
+
<!-- Properties-->
<tr>
<td>
@@ -301,5 +304,9 @@
</td>
</tr>
</table>
+
+
+
+
</body>
</html:html>
