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"> <!-- - if (!!FCKConfig.RssCanEditFeed) { - var editWidget = document.getElementById('editFeed'); + var editWidget = document.getElementById('editFeed'); + var addWidget = document.getElementById('addFeed'); + + if (!FCKConfig.RssCanEditFeed) { + editWidget.style.display='none'; + } else { editWidget.href='#'; /** lors de la sortie, on fixe l'url du lien edit pour ce qui est selectionné */ - editWidget .onclick = function changeEdit() { + editWidget.onclick = function changeEdit() { var input = document.getElementById("txtFeedName"); - document.getElementById('editFeed').href = FCKConfig.RssEditURL+ escape(input.value); + editWidget.href = FCKConfig.RssEditURL+ escape(input.value); }; } - if (!!FCKConfig.RssCanAddFeed) document.getElementById('addFeed').href = FCKConfig.RssAddURL; + if (!FCKConfig.RssCanAddFeed) { + addWidget.style.display='none'; + } else { + addWidget.href = FCKConfig.RssAddURL; + } --> </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); }