ktlili 2005/11/21 11:25:33 CET
Modified files:
core/src/conf/java ApplicationResources.properties
ApplicationResources_fr.properties
core/src/java/org/jahia/clipbuilder/html/struts
BrowseAction.java
TestClipperAction.java
core/src/webapp/clippers/sqlpattern
sqlClipperPortletPattern.war
core/src/webapp/jsp/clipbuilder/html/actions
selectPartAction.jsp
core/src/webapp/jsp/clipbuilder/html/help configureHelp.jsp
Log:
- add resources
- activate admin role for sqlclip_portlet
- add error message
Revision Changes Path
1.10 +20 -0 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.9&r2=1.10&f=h
1.7 +27 -9
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.6&r2=1.7&f=h
1.3 +2 -2
jahia/core/src/java/org/jahia/clipbuilder/html/struts/BrowseAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/clipbuilder/html/struts/BrowseAction.java.diff?r1=1.2&r2=1.3&f=h
1.5 +2 -2
jahia/core/src/java/org/jahia/clipbuilder/html/struts/TestClipperAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/clipbuilder/html/struts/TestClipperAction.java.diff?r1=1.4&r2=1.5&f=h
1.6 +36 -38
jahia/core/src/webapp/clippers/sqlpattern/sqlClipperPortletPattern.war
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/clippers/sqlpattern/sqlClipperPortletPattern.war.diff?r1=1.5&r2=1.6&f=h
1.8 +1 -1
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.7&r2=1.8&f=h
1.8 +72 -52
jahia/core/src/webapp/jsp/clipbuilder/html/help/configureHelp.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/help/configureHelp.jsp.diff?r1=1.7&r2=1.8&f=h
Index: ApplicationResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/ApplicationResources.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationResources.properties 7 Nov 2005 15:19:56 -0000 1.9
+++ ApplicationResources.properties 21 Nov 2005 10:25:31 -0000 1.10
@@ -310,6 +310,26 @@
help.configuration.browser.javascript.event.remove = Remove all event
handler attributes (onload, onclick,...)
help.configuration.browser.javascript.event.refactor = Javascript code found
in an event handler attribute is refactored in order to be compible whith
Clipping.
help.configuration.browser.javascript.event.nothing = The html code is not
processed
+help.configuration.httpclient = URL oriented client
+help.configuration.htmlunit = URL oriented client
+help.configuration.checked = checked
+help.configuration.unchecked = uncheked
+help.configuration.emulateJavascript.true = Emulate javascript in webClient
side
+help.configuration.emulateJavascript.false = Doesn't emulate javscript
+help.configuration.certificat.true = Accept automatically all certificates
during browse process. Allow Https connections
+help.configuration.certificat.false = Reject automatically all certificates
+help.configuration.dom = Document based on a dom approch
+help.configuration.htmlparser = Document based on a sax approch
+help.configuration.css.true = All linked Css from are removed the original
document
+help.configuration.css.false = Keep all linked Css.
+help.configuration.certificat.afterClipping.true = Accept automatically all
certificates AFTER clipping
+help.configuration.certificat.afterClipping.false = Reject automatically all
certificates AFTER clipping
+help.configuration.actifIframe = The user can click on any link or button.
The result will be shown in an iframe tha is embedded in the portlet. In
addtion to that, the html is processed by the WebClient.
+help.configuration.passifIframe = The user can click on any link or button.
The result will be shown in an iframe tha is embedded in the portlet. In
addtion to that, the html is NOT processed by the WebClient.
+help.configuration.actifPopup = The user can click on any link or button.
The result will be shown in another window.In addtion to that, the html is
processed by the WebClient
+help.configuration.passifPopup = The user can click on any link or button.
The result will be shown in another window.In addtion to that, the html is NOT
processed by the WebClient
+
+
#sql
manage.button.add.sql = Add sql portlet
Index: ApplicationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/ApplicationResources_fr.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApplicationResources_fr.properties 7 Nov 2005 15:19:56 -0000
1.6
+++ ApplicationResources_fr.properties 21 Nov 2005 10:25:31 -0000
1.7
@@ -81,7 +81,7 @@
configuration.browser.javascript.code.nothing = Ne pas changer
configuration.browser.javascript.code.remove = Supprimer
configuration.browser.javascript.code.refactor = Refactor
-configuration.browser.javascript.event = Evenement Javascript
+configuration.browser.javascript.event = Evènement Javascript
configuration.browser.javascript.event.remove = Supprimer
configuration.browser.javascript.event.refactor = refactor
configuration.browser.javascript.event.nothing = Ne pas changer
@@ -102,10 +102,10 @@
portlet.config.ssl = Activer l'acceptation de certificat
portlet.config.clipbuilder = Continuer à clipping
portlet.config.clipbuilder.false = faux
-portlet.config.clipbuilder.iframe.actif = iframe actife
-portlet.config.clipbuilder.iframe.passif = iframe passife
-portlet.config.clipbuilder.popup.actif = ouvrir une popup actife
-portlet.config.clipbuilder.popup.passif = ouvrir une popup passif
+portlet.config.clipbuilder.iframe.actif = iframe active
+portlet.config.clipbuilder.iframe.passif = iframe passive
+portlet.config.clipbuilder.popup.actif = ouvrir une popup active
+portlet.config.clipbuilder.popup.passif = ouvrir une popup passive
portlet.cacheExpiration = Temps d'expiration de la cache (en millisecondes)
portlet.cacheExpiration.error = Temps d'expiration de la cache n'est pas un
entier.
portlet.cacheContext = Context de la cacheCache
@@ -280,8 +280,8 @@
help.incovenient = Inconvénient
#config
-help.configuration.button.saveDefault = Sauvegder par défaut
-help.configuration.button.saveCurrentClipper = Sauvegarder pour le clipper
courant
+help.configuration.button.saveDefault = Sauvegder la configuration par défaut
+help.configuration.button.saveCurrentClipper = Sauvegarder la configuration
seulement pour le clipper courant
help.configuration.button.reset = Initialiser
help.connection.title = Connection
help.connection.proxy = Chemin du proxy
@@ -290,11 +290,29 @@
help.configuration.browser.javascript.code = Javascript that is embedded in
script tag.
help.configuration.browser.javascript.code.nothing = Le code HTML n'est pas
traité
help.configuration.browser.javascript.code.remove = Tous les tags <script>
se trouvant dans la balise <head> sont supprimées.
-help.configuration.browser.javascript.code.refactor = Javascript code found
in a script tag is refactored in order to be compible whith Clipping.
-help.configuration.browser.javascript.event = Evenement Javascript.
+help.configuration.browser.javascript.code.refactor = Le code javascript est
traité. (ex.: récriture d' urls déclarés relativement).
+help.configuration.browser.javascript.event = Evènement Javascript.
help.configuration.browser.javascript.event.remove = Supprimer tous les
attributs spécifiant un évènement Javascript (onload, onclick,...)
help.configuration.browser.javascript.event.refactor = Javascript code found
in an event handler attribute is refactored in order to be compible whith
Clipping.
help.configuration.browser.javascript.event.nothing = Le code HTML n'est pas
traité
+help.configuration.httpclient = Client Web avec de bonnes performances en
temps de calcul mais ne permet d'accéder à toutes les pages (ex.: pages avec du
javascript important).
+help.configuration.htmlunit = Client Web qui permet d'accéder à la plupart
des pages WEb mais les performances en temps de calul sont affectées
+help.configuration.checked = coché
+help.configuration.unchecked = pas coché
+help.configuration.emulateJavascript.true = Emulation du javascript par le
client Web. Les performances en temps de calcul peuvent être affectés.
+help.configuration.emulateJavascript.false = Ne pas emuler le Javascript.
Certaines pages Web contenant du Javascript ne pourront pas être chargées.
+help.configuration.certificat.true = Accepte automatiquement tous les
certificats. Activer cette option seulementt si c'est nécessaire.
+help.configuration.certificat.false = Rejette automatiquement tous les
certificats.
+help.configuration.dom = Fonctionne correctement avec la plupart des pages
Webs. Cependant, les pages webs mal codées peuvent ne pas être chargées
correctement.
+help.configuration.htmlparser = Charge correctement la plupart des pages
Web. Cependant, le rendu visuel de certaines pages Web mal codées (exemple: tag
<script> non correctement fermé) peut être affecté.
+help.configuration.css.true = Toutes les css liées sont supprimées du
document original.
+help.configuration.css.false = Les css liées ne sont pas supprimées.
+help.configuration.certificat.afterClipping.true = Accepte automatiquement
tous les certificats APRES clipping
+help.configuration.certificat.afterClipping.false = Rejette automatiquement
tous les certificats APRES clipping
+help.configuration.actifIframe = Ouverture de la prochaine page dans la
portlet courante. De plus, la page html est traitée par le client Web (Les
performances en temps de calcule peuvent être considérablement affectées).
+help.configuration.passifIframe = Ouverture de la prochaine page dans la
portlet courante. De plus, la page html n'est pas traitée par le client Web
(Meilleures performances en temps de calcule).
+help.configuration.actifPopup = Ouverture de la prochaine page dans une
nouvelle fenêtre. De plus, la page html est traitée par le client Web (Les
performances en temps de calcule peuvent être considérablement affectées).
+help.configuration.passifPopup = Ouverture de la prochaine page dans une
nouvelle fenêtre De plus, la page html n'est pas traitée par le client Web
(Meilleures performances en temps de calcule).
#sql
manage.button.add.sql = Ajouter une sqlclip_portlet
Index: BrowseAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/clipbuilder/html/struts/BrowseAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BrowseAction.java 25 Aug 2005 09:36:39 -0000 1.2
+++ BrowseAction.java 21 Nov 2005 10:25:32 -0000 1.3
@@ -327,10 +327,10 @@
ex.printStackTrace();
}
- finally {
+ //finally {
saveMessages(httpServletRequest, errors);
return actionMapping.getInputForward();
- }
+ //}
}
Index: TestClipperAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/clipbuilder/html/struts/TestClipperAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestClipperAction.java 7 Nov 2005 15:17:50 -0000 1.4
+++ TestClipperAction.java 21 Nov 2005 10:25:32 -0000 1.5
@@ -127,9 +127,9 @@
catch (Exception ex) {
ex.printStackTrace();
}
- finally {
+ // finally {
return actionMapping.getInputForward();
- }
+ // }
}
Index: sqlClipperPortletPattern.war
===================================================================
<<Binary file>>
Index: selectPartAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/selectPartAction.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- selectPartAction.jsp 14 Nov 2005 07:19:23 -0000 1.7
+++ selectPartAction.jsp 21 Nov 2005 10:25:33 -0000 1.8
@@ -77,7 +77,7 @@
</td>
<!-- Help -->
<td class="boxtitleborder1" width="10%">
- <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/selectPartHelp.jsp")%>')">
+ <a
href="javascript:popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/selectPartHelp.jsp")%>')">
<bean:message key="wizard.help"/>
</a>
</td>
Index: configureHelp.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/help/configureHelp.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configureHelp.jsp 18 Nov 2005 16:34:46 -0000 1.7
+++ configureHelp.jsp 21 Nov 2005 10:25:33 -0000 1.8
@@ -36,7 +36,7 @@
<!-- Proxy -->
<tr>
<td>
- <table width="100%">
+ <table width="100%">
<tr>
<td width="25%" class="topmenugreen bold waBG">
<bean:message key="connection.proxy"/>
@@ -73,10 +73,10 @@
<table rules="cols" border="1" width="100%">
<tr>
<!-- possible values-->
- <td width="33%"class="topmenugreen bold waBG">
+ <td width="33%" class="topmenugreen bold waBG">
<bean:message
key="configuration.browser.javascript.code.remove"/>
</td>
- <td width="33%"class="topmenugreen bold waBG">
+ <td width="33%" class="topmenugreen bold waBG">
<bean:message
key="configuration.browser.javascript.code.refactor"/>
</td>
<td class="topmenugreen bold waBG">
@@ -106,10 +106,10 @@
<td>
<table rules="cols" border="1" width="100%">
<tr>
- <td width="33%"class="topmenugreen bold waBG">
+ <td width="33%" class="topmenugreen bold waBG">
<bean:message
key="configuration.browser.javascript.event.remove"/>
</td>
- <td width="33%"class="topmenugreen bold waBG">
+ <td width="33%" class="topmenugreen bold waBG">
<bean:message
key="configuration.browser.javascript.event.refactor"/>
</td>
<td class="topmenugreen bold waBG">
@@ -153,48 +153,58 @@
<table width="100%">
<!-- Type -->
<tr>
- <td width="25%" class="topmenugreen bold waBG">Type</td>
+ <td width="25%" class="topmenugreen bold waBG">
+ <bean:message key="client.type"/>
+ </td>
<td>
<table rules="cols" border="1" width="100%">
<tr>
- <td class="topmenugreen bold waBG"
width="50%">HttpClient</td>
- <td class="topmenugreen bold waBG"
width="50%">HtmlUnit</td>
+ <td class="topmenugreen bold waBG" width="50%">
+ <bean:message key="client.type.httpClient"/>
+ </td>
+ <td class="topmenugreen bold waBG" width="50%">
+ <bean:message key="client.type.htmlunit"/>
+ </td>
</tr>
<tr>
- <td>URL oriented client</td>
- <td>User oriented client</td>
+ <td><bean:message
key="help.configuration.httpclient"/></td>
+ <td><bean:message
key="help.configuration.htmlunit"/></td>
</tr>
</table>
</td>
</tr>
<!-- javascript -->
<tr>
- <td width="25%" class="topmenugreen bold waBG">Enable
Javascript</td>
+ <td width="25%" class="topmenugreen bold waBG">
+ <bean:message key="client.javascript.enable"/>
+ </td>
<td>
- <table rules="cols"border="1" width="100%">
+ <table rules="cols" border="1" width="100%">
<tr>
- <td class="topmenugreen bold waBG"
width="50%">Checked</td>
- <td class="topmenugreen bold waBG"
width="50%">Unchecked</td>
+ <td class="topmenugreen bold waBG"
width="50%"><bean:message key="help.configuration.checked"/></td>
+ <td class="topmenugreen bold waBG"
width="50%"><bean:message key="help.configuration.unchecked"/></td>
</tr>
<tr>
- <td>Emulate javascript in webClient side</td>
- <td>Doesn't emulate javscript</td>
+ <td><bean:message
key="help.configuration.emulateJavascript.true"/></td>
+ <td><bean:message
key="help.configuration.emulateJavascript.false"/></td>
</tr>
</table>
</td>
</tr>
<!-- SSL -->
<tr>
- <td width="25%" class="topmenugreen bold waBG">Enable
SSL</td>
+ <td width="25%" class="topmenugreen bold waBG">
+ <bean:message key="client.ssl.enable"/>
+ </td>
<td>
- <table rules="cols"border="1" width="100%">
+ <table rules="cols" border="1" width="100%">
<tr>
- <td class="topmenugreen bold waBG"
width="50%">Checked</td>
- <td class="topmenugreen bold waBG"
width="50%">Unchecked</td>
+ <td class="topmenugreen bold waBG"
width="50%"><bean:message key="help.configuration.checked"/></td>
+ <td class="topmenugreen bold waBG"
width="50%"><bean:message key="help.configuration.unchecked"/></td>
</tr>
<tr>
- <td>Accept automatically all certificates during
browse process. Allow Https connections</td>
- <td>Reject automatically all certificates</td>
+ <td><bean:message
key="help.configuration.certificat.true"/></td>
+ <td><bean:message
key="help.configuration.certificat.false"/></td>
</tr>
</table>
</td>
@@ -219,31 +229,39 @@
<td>
<table width="100%">
<tr>
- <td width="25%" class="topmenugreen bold waBG">Type</td>
+ <td width="25%" class="topmenugreen bold waBG">
+ <bean:message key="htmlDocument.type"/>
+ </td>
<td>
- <table rules="cols"border="1" width="100%">
+ <table rules="cols" border="1" width="100%">
<tr>
- <td width="50%"class="topmenugreen bold
waBG">HTMLParserDocument</td>
- <td class="topmenugreen bold waBG">DOMDocument</td>
+ <td width="50%" class="topmenugreen bold waBG">
+ <bean:message key="htmlDocument.type.htmlparser"/>
+ </td>
+ <td class="topmenugreen bold waBG">
+ <bean:message key="htmlDocument.type.dom"/>
+ </td>
</tr>
<tr>
- <td>Document based on a sax approch</td>
- <td>Document based on dom approcche</td>
+ <td><bean:message
key="help.configuration.htmlparser"/></td>
+ <td><bean:message key="help.configuration.dom"/></td>
</tr>
</table>
</td>
</tr>
<tr>
- <td width="25%" class="topmenugreen bold waBG">Enable
Css</td>
+ <td width="25%" class="topmenugreen bold waBG">
+ <bean:message key="htmlDocument.css.enable"/>
+ </td>
<td>
- <table rules="cols" border="1" width="100%">
+ <table rules="cols" border="1" width="100%">
<tr>
- <td class="topmenugreen bold waBG"
width="50%">Checked</td>
- <td class="topmenugreen bold waBG">Unchecked</td>
+ <td class="topmenugreen bold waBG"
width="50%"><bean:message key="help.configuration.checked"/></td>
+ <td class="topmenugreen bold waBG"><bean:message
key="help.configuration.unchecked"/></td>
</tr>
<tr>
- <td>All linked Css from are removed the original
document</td>
- <td>Remove linked Css from the original document. It
will be the Css of the page container that will be applied</td>
+ <td><bean:message
key="help.configuration.css.true"/></td>
+ <td><bean:message
key="help.configuration.css.false"/></td>
</tr>
</table>
</td>
@@ -268,37 +286,39 @@
<td>
<table width="100%">
<tr>
- <td width="25%" class="topmenugreen bold waBG">Enable
SSL</td>
+ <td width="25%" class="topmenugreen bold waBG">
+ <bean:message key="portlet.config.ssl"/>
+ </td>
<td>
<table rules="cols" border="1" width="100%">
<tr>
- <td width="50%"class="topmenugreen bold
waBG">Checked</td>
- <td width="50%"class="topmenugreen bold
waBG">Unchecked</td>
+ <td width="50%" class="topmenugreen bold
waBG"><bean:message key="help.configuration.checked"/></td>
+ <td width="50%" class="topmenugreen bold
waBG"><bean:message key="help.configuration.unchecked"/></td>
</tr>
<tr>
- <td>Accept automatically all certificates AFTER
clipping</td>
- <td>Refuse automatically all certificates AFTER
clipping</td>
+ <td><bean:message
key="help.configuration.certificat.afterClipping.true"/></td>
+ <td><bean:message
key="help.configuration.certificat.afterClipping.false"/></td>
</tr>
</table>
</td>
</tr>
<tr>
- <td width="25%" class="topmenugreen bold waBG">Continual
Clipping</td>
+ <td width="25%" class="topmenugreen bold waBG">
+ <bean:message key="portlet.config.clipbuilder"/>
+ </td>
<td>
- <table border="1"rules="cols">
+ <table border="1" rules="cols">
<tr>
- <td class="topmenugreen bold waBG">false</td>
- <td class="topmenugreen bold waBG">active iframe</td>
- <td class="topmenugreen bold waBG">passif iframe</td>
- <td class="topmenugreen bold waBG">active popup</td>
- <td class="topmenugreen bold waBG">passif popup</td>
+ <td class="topmenugreen bold waBG"><bean:message
key="portlet.config.clipbuilder.iframe.actif"/></td>
+ <td class="topmenugreen bold waBG"><bean:message
key="portlet.config.clipbuilder.iframe.passif"/></td>
+ <td class="topmenugreen bold waBG"><bean:message
key="portlet.config.clipbuilder.popup.actif"/></td>
+ <td class="topmenugreen bold waBG"><bean:message
key="portlet.config.clipbuilder.popup.passif"/></td>
</tr>
<tr>
- <td>Clipping content is static and doesn't allow
user to interact whith it</td>
- <td>Clipping content is not static. The user can
click on any linf or button. The result will be shown in an iframe tha is
embedded in the portlet. In addtion to that, the html is processed by the
WebClient.</td>
- <td>Clipping content is not static. The user can
click on any linf or button. The result will be shown in an iframe tha is
embedded in the portlet. In addtion to that, the html is NOT processed by the
WebClient.</td>
- <td>Clipping content is not static. The user can
click on any linf or button. The result will be shown in another window.In
addtion to that, the html is processed by the WebClient</td>
- <td>Clipping content is not static. The user can
click on any linf or button. The result will be shown in another window.In
addtion to that, the html is NOT processed by the WebClient</td>
+ <td><bean:message
key="help.configuration.actifIframe"/></td>
+ <td><bean:message
key="help.configuration.passifIframe"/></td>
+ <td><bean:message
key="help.configuration.actifPopup"/></td>
+ <td><bean:message
key="help.configuration.passifPopup"/></td>
</tr>
</table>
</td>
@@ -310,6 +330,6 @@
</td>
</tr>
</table>
+
</body>
</html>
-
