- Nuiton-rss-commits - mailman.cloud.codelutin.com

[Lutinweb-commits] r63 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org May 28, 2008

May 28, 2008

Author: tchemit Date: 2008-05-28 23:14:21 +0000 (Wed, 28 May 2008) New Revision: 63 Modified: trunk/lutinrss/pom.xml Log: lutinrss version 2.1 Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-05-19 18:53:50 UTC (rev 62) +++ trunk/lutinrss/pom.xml 2008-05-28 23:14:21 UTC (rev 63) @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">  - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion>   - - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> - </site> - <repository> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> - </repository> + <distributionManagement> + <site> + <id>labs</id> + <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> + </site> + <repository> + <id>labs</id> + <url>scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> + </repository> + </distributionManagement> - </distributionManagement> -  - <groupId>lutinlib</groupId> - <artifactId>lutinrss</artifactId> - <name>LutinRSS</name> + <groupId>lutinlib</groupId> + <artifactId>lutinrss</artifactId> + <name>LutinRSS</name>  - <packaging>war</packaging> + <packaging>war</packaging>  - <version>2.0</version> + <version>2.1</version>  - <description>Servlet pouvant �tre appeler depuis du JS pour r�cup�rer un - flux RSS</description> - <inceptionYear>2008</inceptionYear> + <description>Servlet pouvant etre appeler depuis du JS pour recuperer un + flux RSS + </description> + <inceptionYear>2008</inceptionYear>  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=41</url> - </issueManagement> + <issueManagement> + <url>http://labs.libre-entreprise.org/tracker/?group_id=41</url> + </issueManagement> -  - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.9</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>0.9</version> - <scope>compile</scope> - </dependency> -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - </dependencies> - + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + </dependencies> <build> <plugins> <plugin> @@ -126,7 +118,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> - <execution> + <execution> <goals> <goal>jar</goal> </goals> @@ -144,18 +136,17 @@ </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </build> - <profiles> <profile> - <id>project</id> + <id>project</id> <activation> <activeByDefault>true</activeByDefault> </activation> <properties> - + <maven.test.skip>false</maven.test.skip> <maven.compile.source>1.5</maven.compile.source> <maven.compile.target>1.5</maven.compile.target> </properties> @@ -167,10 +158,8 @@ </pluginRepositories--> </profile> </profiles> - <properties> <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> <netbeans.hint.useExternalMaven>true</netbeans.hint.useExternalMaven> </properties> - </project>

1 0

[Lutinweb-commits] r62 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 19, 2008

May 19, 2008

Author: tchemit Date: 2008-05-19 18:53:50 +0000 (Mon, 19 May 2008) New Revision: 62 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html Log: style Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2008-05-19 18:52:49 UTC (rev 61) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2008-05-19 18:53:50 UTC (rev 62) @@ -27,10 +27,10 @@ <script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script> <script src="fck_rssinclude.js" type="text/javascript"></script> <link href="../../dialog/common/fck_dialog_common.css" rel="stylesheet" type="text/css" /> + <style type="text/css">div.rssinclude { background-color: #ffff00; }</style> <script type="text/javascript">  </script> </head> @@ -43,7 +43,7 @@ <tr> <td valign="top" width="100%"> <span fckLang="DlgRssincludeFeedName">name or URL</span><br> - <div id="divFeedName"> + <div id="divFeedName" style="margin-top:2"> <input style="width: 100%" type="text" id="txtFeedName" onblur="updatePreview();"> </div> <a id="editFeed" href='#' fckLang="DlgRssincludeFeedNameEdit" target="_editFeed">Edit</a>

1 0

[Lutinweb-commits] r61 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 19, 2008

May 19, 2008

Author: tchemit Date: 2008-05-19 18:52:49 +0000 (Mon, 19 May 2008) New Revision: 61 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js Log: suppress fixme :) Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-19 18:29:29 UTC (rev 60) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-19 18:52:49 UTC (rev 61) @@ -66,10 +66,6 @@ */ function LoadSelection() { if (! oRss) return; - //FIXEME Attention, les attributs sont case sensitive et - // la generation des attribute dans updateRss les transformes en minuscule... - // cela ne fonctionne pas bien sous ie - //TODO utiliser des attributs tout en minuscule pour eviter ce probleme GetE('txtFeedName').value = GetAttribute( oRss, 'feedname', '' ); GetE('txtNbItem').value = GetAttribute( oRss, 'nbitem', '' ); GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedrepr', '' );

1 0

[Lutinweb-commits] r60 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 19, 2008

May 19, 2008

Author: tchemit Date: 2008-05-19 18:29:29 +0000 (Mon, 19 May 2008) New Revision: 60 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt Log: use external configuration file fckconfig.js in order to not touch fckconfig.js... add feedrepr in feeds.txt (use lowercase attributes...) Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt 2008-05-19 18:28:12 UTC (rev 59) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt 2008-05-19 18:29:29 UTC (rev 60) @@ -2,38 +2,14 @@ Installation Instructions 1. Copy rssinclude directory into "editor/plugins/" -2. In fckconfig.js make the following additions : - * add the following line after where "FCKConfig.PluginsPath" is defined - FCKConfig.Plugins.Add("rssinclude", "en,fr"); +2. Copy myfckconfig.js in fckeditor root path and customize it (or merge the + content in your already customized config...) - * add 'rssinclude' to your toolsbarset in fckconfig.js. E.G., +3. To create an editor use this code - FCKConfig.ToolbarSets["Default"] = [ - ['rssinclude', 'Bold', 'Italic'] - ] ; +var oFCKeditor = new FCKeditor( 'editorName' ) ; +oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; +oFCKeditor.Create() ; - * add variables : - - // to authorize user to add a new feed - FCKConfig.RssCanAddFeed = false; - - // url to create a new feed - FCKConfig.RssAddURL = '/website-workshop-lmfr/srvwebsiteworkshop?action=doRss&rssAction=edit'; - - // to authorize user to edit a known feed - FCKConfig.RssCanEditFeed = false; - - // url to edit a known feed - FCKConfig.RssEditURL = '/website-workshop-lmfr/srvwebsiteworkshop?action=doRss&rssAction=edit&rss_name=' ; - - // url to render a feed - FCKConfig.RssRenderURL = '/website-workshop-lmfr/srvrsspublication?action=feed&feedName=' ; - - // url to obtain known feeds as a list of html options - FCKConfig.RssKnownFeedsURL = '/website-workshop-lmfr/srvrsspublication?action=feedList' ; - - // url to obtain rssinclude script - FCKConfig.RssScriptURL = '/website-workshop-lmfr/srvrsspublication?action=js' ; - Please let me know if you experience any issues.

1 0

[Lutinweb-commits] r59 - in trunk/lutinrss/src/main: resources/fckeditor webapp
by tchemit＠users.labs.libre-entreprise.org May 19, 2008

May 19, 2008

Author: tchemit Date: 2008-05-19 18:28:12 +0000 (Mon, 19 May 2008) New Revision: 59 Added: trunk/lutinrss/src/main/resources/fckeditor/myfckconfig.js Modified: trunk/lutinrss/src/main/webapp/fckTest.html trunk/lutinrss/src/main/webapp/feeds.txt Log: use external configuration file fckconfig.js in order to not touch fckconfig.js... add feedrepr in feeds.txt (use lowercase attributes...) Added: trunk/lutinrss/src/main/resources/fckeditor/myfckconfig.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/myfckconfig.js (rev 0) +++ trunk/lutinrss/src/main/resources/fckeditor/myfckconfig.js 2008-05-19 18:28:12 UTC (rev 59) @@ -0,0 +1,65 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Editor configuration settings. + * + * Follow this link for more information: + * http://wiki.fckeditor.net/Developer%27s_Guide/Configuration/Configurations_… + */ + +FCKConfig.Plugins.Add("rssinclude", "en,fr"); + +FCKConfig.ToolbarSets["Default"] = [ + ['Source','DocProps','-','Save','NewPage','Preview','-','Templates'], + ['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'], + ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], + ['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'], + ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], + ['Link','Unlink','Anchor'], + ['rssinclude', 'Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak'], + '/', + ['Style','FontFormat','FontName','FontSize'], + ['TextColor','BGColor'], + ['FitWindow','ShowBlocks','-','About'] // No comma for the last row. +] ; + +// to authorize user to add a new feed +FCKConfig.RssCanAddFeed = false; + +// to authorize user to edit a known feed +FCKConfig.RssCanEditFeed = false; + +// url to render a feed +FCKConfig.RssRenderURL = '/lutinrss-2.1/RSSServlet&feedName=' ; + +// url to obtain rssinclude script +FCKConfig.RssScriptURL = '/lutinrss-2.1/RSSServlet' ; + +// url to obtain known feeds as a list of html options +FCKConfig.RssKnownFeedsURL = '/lutinrss-2.1/feeds.txt' ; + +// url to create a new feed +FCKConfig.RssAddURL = ''; + +// url to edit a known feed +FCKConfig.RssEditURL = '' ; Modified: trunk/lutinrss/src/main/webapp/fckTest.html =================================================================== --- trunk/lutinrss/src/main/webapp/fckTest.html 2008-05-19 18:26:13 UTC (rev 58) +++ trunk/lutinrss/src/main/webapp/fckTest.html 2008-05-19 18:28:12 UTC (rev 59) @@ -5,55 +5,44 @@ --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> - <head> - <title>Page de test plugin FCKEditor rss</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <link href="feed.css" rel="stylesheet" type="text/css" /> -  - <script type="text/javascript" src="/fckeditor/fckeditor.js"></script> - </head> - <body> - <h1>Test plugin FCKEditor RSS (*)</h1> - <form name="EditPostView" action="#" method="GET"> - <script type="text/javascript"> -  - </script> - <hr/> - <input type="submit" value="envoyer"> - </form> - <p>(*) required a FCKEditor 2.6 available on / apache path (means /fckeditor points to fckeditor root directory)</p> - <p>with rssinclude plugin configured like this : - <pre> - // to authorize user to add a new feed - FCKConfig.RssCanAddFeed = false; - - // to authorize user to edit a known feed - FCKConfig.RssCanEditFeed = false; - - // url to render a feed - FCKConfig.RssRenderURL = '/lutinrss-2.1/RSSServlet&feedName='; - - // url to obtain rssinclude script - FCKConfig.RssScriptURL = '/lutinrss-2.1/RSSServlet'; - - // url to obtain known feeds as a list of html options - FCKConfig.RssKnownFeedsURL = '/lutinrss-2.1/feeds.txt'; - </pre> - </p> +<head> + <title>Page de test plugin FCKEditor rss</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +  + <script type="text/javascript" src="/fckeditor/fckeditor.js"></script> + <style type="text/css">div.rssinclude { background-color: #ffff00; }</style> +</head> +<body> +<h1>Test plugin FCKEditor RSS (*)</h1> +<form name="EditPostView" action="#" method="GET"> + <script type="text/javascript"> +  + </script> + <hr/> + <input type="submit" value="envoyer"> +</form> +<p>(*) required a FCKEditor 2.6 available on / apache path (means /fckeditor points to fckeditor root directory)</p> +<p>add custom config like this code : + <pre> +var oFCKeditor = new FCKeditor( 'rssTest' ) ; +oFCKeditor.Config["CustomConfigurationsPath"] = oFCKeditor.BasePath+"/myfckconfig.js"; +oFCKeditor.Create() ; + </pre> +</p> + + +</body> </html> Modified: trunk/lutinrss/src/main/webapp/feeds.txt =================================================================== --- trunk/lutinrss/src/main/webapp/feeds.txt 2008-05-19 18:26:13 UTC (rev 58) +++ trunk/lutinrss/src/main/webapp/feeds.txt 2008-05-19 18:28:12 UTC (rev 59) @@ -1,7 +1,7 @@ -<option id="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" value="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbItem="1">le monde informatique</option> -<option id="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" value="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbItem="2">le monde</option> -<option id="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" value="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbItem="3">developpez.com</option> -<option id="http://formats-ouverts.org/rss.php" value="http://formats-ouverts.org/rss.php" nbItem="4">formats ouverts</option> -<option id="http://www.h2database.com/html/newsfeed-rss.xml" value="http://www.h2database.com/html/newsfeed-rss.xml" nbItem="5">h2</option> -<option id="http://www.opensi.org/news.rss" value="http://www.opensi.org/news.rss" nbItem="6">opensi</option> +<option value="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbitem="1" feedrepr="indat-natd">le monde informatique</option> +<option value="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbitem="2" feedrepr="indat-natd">le monde</option> +<option value="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbitem="3" feedrepr="indat-natd">developpez.com</option> +<option value="http://formats-ouverts.org/rss.php" nbitem="4" feedrepr="indat-natd">formats ouverts</option> +<option value="http://www.h2database.com/html/newsfeed-rss.xml" nbitem="5" feedrepr="indat-natd">h2</option> +<option value="http://www.opensi.org/news.rss" nbitem="6" feedrepr="indat-natd">opensi</option>

1 0

[Lutinweb-commits] r58 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 19, 2008

May 19, 2008

Author: tchemit Date: 2008-05-19 18:26:13 +0000 (Mon, 19 May 2008) New Revision: 58 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js Log: add only once the rssinclude script when adding rss Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-19 07:08:25 UTC (rev 57) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-19 18:26:13 UTC (rev 58) @@ -20,7 +20,7 @@ // Translate the dialog box texts. oEditor.FCKLanguageManager.TranslatePage(document); - // chargement de la comba avec les feeds configures + // chargement de la combo avec les feeds configures LoadCombo(); // Load the selected element information (if any). @@ -94,10 +94,11 @@ if ( !oRss ) { oRss = FCK.InsertElement( 'DIV' ) ; - //TODO Il faut detecter si le script est deja present, - // car ajouter n script va provoquer n chargements... - oScript = FCK.InsertElement('SCRIPT'); - SetAttribute( oScript, 'src', FCKConfig.RssScriptURL); + if (!detectScript()) { + // add script to editor only once + oScript = FCK.InsertElement('SCRIPT'); + SetAttribute( oScript, 'src', FCKConfig.RssScriptURL); + } } updateRss( oRss ); @@ -106,6 +107,14 @@ } /** + * Detection de la presence ou non du script rssinclude dans l'edition + */ +function detectScript() { + var scripts = FCK.GetXHTML(); + return (scripts.indexOf("src=\""+FCKConfig.RssScriptURL+"\"")!=-1); +} + +/** * Mise a jour d'un div avec les informations trouvees dans l'interface */ function updateRss(e){

1 0

[Lutinweb-commits] r57 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 19, 2008

May 19, 2008

Author: tchemit Date: 2008-05-19 07:08:25 +0000 (Mon, 19 May 2008) New Revision: 57 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js Log: ajout dans la list des feeds de la configuration enregistr?\195?\169e (nbItem et feedRepr) suppression style en dur sur les div (todo voir comment ajouter css a l'?\195?\169diteur) Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2008-05-18 21:52:11 UTC (rev 56) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2008-05-19 07:08:25 UTC (rev 57) @@ -46,21 +46,29 @@ <div id="divFeedName"> <input style="width: 100%" type="text" id="txtFeedName" onblur="updatePreview();"> </div> - <a id="editFeed" fckLang="DlgRssincludeFeedNameEdit" target="_editFeed">Edit</a> - <a id="addFeed" fckLang="DlgRssincludeFeedNameAdd" target="_addFeed">Add</a> + <a id="editFeed" href='#' fckLang="DlgRssincludeFeedNameEdit" target="_editFeed">Edit</a> + <a id="addFeed" href='#' fckLang="DlgRssincludeFeedNameAdd" target="_addFeed">Add</a> <script type="text/javascript">  </script> </td> Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-18 21:52:11 UTC (rev 56) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-19 07:08:25 UTC (rev 57) @@ -48,12 +48,12 @@ xhr.onreadystatechange = function() { if(xhr.readyState == 4 && xhr.status == 200) /* 200 : code HTTP pour OK */ { - var content = '<select style="WIDTH: 100%" id="txtFeedName" onblur="updatePreview();">'+ + var content = '<select style="WIDTH: 100%" id="txtFeedName" onblur="updatePreview(this);">'+ xhr.responseText + '</select>'; document.getElementById("divFeedName").innerHTML = content; if (oRss) { // on selectionne l'ancienne valeur - GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); + GetE('txtFeedName').value = GetAttribute( oRss, 'feedname', '' ); } } } @@ -70,9 +70,9 @@ // la generation des attribute dans updateRss les transformes en minuscule... // cela ne fonctionne pas bien sous ie //TODO utiliser des attributs tout en minuscule pour eviter ce probleme - GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); - GetE('txtNbItem').value = GetAttribute( oRss, 'nbItem', '' ); - GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedRepr', '' ); + GetE('txtFeedName').value = GetAttribute( oRss, 'feedname', '' ); + GetE('txtNbItem').value = GetAttribute( oRss, 'nbitem', '' ); + GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedrepr', '' ); updatePreview(); } @@ -112,14 +112,13 @@ e.contentEditable = false; SetAttribute( e, 'class', 'rssinclude'); + SetAttribute( e, 'contentEditable', 'false'); SetAttribute( e, 'name', 'rssinclude'); - SetAttribute( e, 'feedName', GetE('txtFeedName').value ); - SetAttribute( e, 'nbItem', GetE('txtNbItem').value ); - SetAttribute( e, 'feedRepr', GetE('txtFeedRepr').value ); + SetAttribute( e, 'feedname', GetE('txtFeedName').value ); + SetAttribute( e, 'nbitem', GetE('txtNbItem').value ); + SetAttribute( e, 'feedrepr', GetE('txtFeedRepr').value ); //SetAttribute( e, 'forceReload', 'true' ); e.innerHTML = 'RSS ' + GetE('txtFeedName').value + ' (items:'+GetE('txtNbItem').value+')'; - //TODO Il faudrait utiliser une class css, afin de ne pas poluer le contenu final - e.style.backgroundColor = '#ffff00' ; } // L'element servant a la preview @@ -127,8 +126,9 @@ /** * Mise a jour du flux dans la preview + * @param combo la combo utilisee (undefined si uniquement un input) */ -function updatePreview(){ +function updatePreview(combo){ if ( !ePreview ) { ePreview = GetE('rssincludePreview'); @@ -141,6 +141,13 @@ if ( GetE('txtFeedName').value.length == 0 ) { ePreview.innerHTML = 'Invalid RSS'; } else { + if (!!combo) { + // mise à jour des champs à partir de l'option selectionne + var index = combo.options.selectedIndex; + var option = combo.options[index]; + GetE('txtNbItem').value = GetAttribute( option, 'nbitem', '' ) + GetE('txtFeedRepr').value = GetAttribute( option, 'feedrepr', '' ) + } updateRss(ePreview); rssincludeUpdateDiv(ePreview, true); }

1 0

[Lutinweb-commits] r56 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 18, 2008

May 18, 2008

Author: tchemit Date: 2008-05-18 21:52:11 +0000 (Sun, 18 May 2008) New Revision: 56 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js Log: ajout FIXME : les attributs sont transformes en minuscules dans updateRss et ie ne s'y retrouve pas... TODO a faire :) Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-18 21:12:42 UTC (rev 55) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-18 21:52:11 UTC (rev 56) @@ -66,7 +66,10 @@ */ function LoadSelection() { if (! oRss) return; - + //FIXEME Attention, les attributs sont case sensitive et + // la generation des attribute dans updateRss les transformes en minuscule... + // cela ne fonctionne pas bien sous ie + //TODO utiliser des attributs tout en minuscule pour eviter ce probleme GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); GetE('txtNbItem').value = GetAttribute( oRss, 'nbItem', '' ); GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedRepr', '' ); @@ -106,7 +109,7 @@ * Mise a jour d'un div avec les informations trouvees dans l'interface */ function updateRss(e){ - e.contentEditable = false; + e.contentEditable = false; SetAttribute( e, 'class', 'rssinclude'); SetAttribute( e, 'name', 'rssinclude');

1 0

[Lutinweb-commits] r55 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 18, 2008

May 18, 2008

Author: tchemit Date: 2008-05-18 21:12:42 +0000 (Sun, 18 May 2008) New Revision: 55 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html Log: lien add et edit uniquement accessibles si dans la configuration Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2008-05-18 21:11:18 UTC (rev 54) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2008-05-18 21:12:42 UTC (rev 55) @@ -30,10 +30,9 @@ <script type="text/javascript">  </script> - <script src="http://rssinclude/lutinrss-1.0/rssinclude_1.js" type="text/javascript"></script> </head> <body scroll="no"> <div id="divInfo"> @@ -45,23 +44,25 @@ <td valign="top" width="100%"> <span fckLang="DlgRssincludeFeedName">name or URL</span><br> <div id="divFeedName"> - <input style="WIDTH: 100%" type="text" id="txtFeedName" onblur="updatePreview();"> + <input style="width: 100%" type="text" id="txtFeedName" onblur="updatePreview();"> </div> - <script type="text/javascript"> + <a id="editFeed" fckLang="DlgRssincludeFeedNameEdit" target="_editFeed">Edit</a> + <a id="addFeed" fckLang="DlgRssincludeFeedNameAdd" target="_addFeed">Add</a> + <script type="text/javascript">  + if (!!FCKConfig.RssCanAddFeed) document.getElementById('addFeed').href = FCKConfig.RssAddURL; + --> </script> - <a id="editFeed" href='#' fckLang="DlgRssincludeFeedNameEdit" target="_editFeed" onclick='changeEdit();'>Edit</a> - <a id="addFeed" href='#' fckLang="DlgRssincludeFeedNameAdd" target="_addFeed">Add</a> - <script type="text/javascript"> - if (FCKConfig.RssCanEditFeed) document.getElementById('editFeed').href = FCKConfig.RssEditURL; - if (FCKConfig.RssCanAddFeed) document.getElementById('addFeed').href = FCKConfig.RssAddURL; - </script> </td> </tr> </table>

1 0

[Lutinweb-commits] r54 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 18, 2008

May 18, 2008

Author: tchemit Date: 2008-05-18 21:11:18 +0000 (Sun, 18 May 2008) New Revision: 54 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js Log: chargement dynamique du script d'update rss ajout de TODO reformat Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-18 21:07:58 UTC (rev 53) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-18 21:11:18 UTC (rev 54) @@ -8,6 +8,9 @@ // Set the language direction. window.document.dir = oEditor.FCKLang.Dir; +// load rssinclude script +document.writeln("<script type=\"text/javascript\" src=\""+FCKConfig.RssScriptURL+"\"></script>"); + // Recuperation du feed selectionne var oRss = dialog.Selection.GetSelectedElement(); @@ -16,7 +19,7 @@ { // Translate the dialog box texts. oEditor.FCKLanguageManager.TranslatePage(document); - + // chargement de la comba avec les feeds configures LoadCombo(); @@ -78,38 +81,41 @@ { if ( GetE('txtFeedName').value.length == 0 ) { - GetE('txtFeedName').focus() ; + GetE('txtFeedName').focus(); - alert( oEditor.FCKLang.DlgRssincludeAlertFeedName ) ; + alert( oEditor.FCKLang.DlgRssincludeAlertFeedName ); return false ; } - - oEditor.FCKUndo.SaveUndoStep() ; + + oEditor.FCKUndo.SaveUndoStep(); if ( !oRss ) { oRss = FCK.InsertElement( 'DIV' ) ; + //TODO Il faut detecter si le script est deja present, + // car ajouter n script va provoquer n chargements... oScript = FCK.InsertElement('SCRIPT'); SetAttribute( oScript, 'src', FCKConfig.RssScriptURL); } - updateRss( oRss ) ; - - rssincludeUpdateDiv(oRss, false); - return true ; + updateRss( oRss ); + + // rssincludeUpdateDiv(oRss, false); + return true; } /** * Mise a jour d'un div avec les informations trouvees dans l'interface */ function updateRss(e){ - e.contentEditable = false ; - + e.contentEditable = false; + SetAttribute( e, 'class', 'rssinclude'); SetAttribute( e, 'name', 'rssinclude'); SetAttribute( e, 'feedName', GetE('txtFeedName').value ); SetAttribute( e, 'nbItem', GetE('txtNbItem').value ); SetAttribute( e, 'feedRepr', GetE('txtFeedRepr').value ); - SetAttribute( e, 'forceReload', 'true' ); - e.innerHTML = 'RSS ' + GetE('txtFeedName').value; + //SetAttribute( e, 'forceReload', 'true' ); + e.innerHTML = 'RSS ' + GetE('txtFeedName').value + ' (items:'+GetE('txtNbItem').value+')'; + //TODO Il faudrait utiliser une class css, afin de ne pas poluer le contenu final e.style.backgroundColor = '#ffff00' ; } @@ -122,7 +128,7 @@ function updatePreview(){ if ( !ePreview ) { - ePreview = GetE('rssincludePreview') ; + ePreview = GetE('rssincludePreview'); } if ( ! ePreview) { @@ -130,7 +136,7 @@ } if ( GetE('txtFeedName').value.length == 0 ) { - ePreview.innerHTML = 'Invalid RSS' ; + ePreview.innerHTML = 'Invalid RSS'; } else { updateRss(ePreview); rssincludeUpdateDiv(ePreview, true);

1 0