Author: sshyrkov Date: Wed Jun 20 14:56:32 2007 New Revision: 17668 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17668&repname= =3Djahia Log: JAHIA-1974: Sp2 FCK-DAV integration: Display of the current filtering optio= n + problem with the "work in progress" in AJAX directory menu =
http://www.jahia.net/jira/browse/JAHIA-1974 Resolved: 1) Resource filter chagned back to an input field 2) Resource filter added to the embedded file manager Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p= roperties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d= e.properties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= n.properties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= s.properties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f= r.properties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i= t.properties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p= t.properties branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana= ger/AjaxFileManager.jsp branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e= mbedded_filemanager.jsp branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke= ditor/fckeditor_htmleditor.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D17668&rep= name=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p= roperties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p= roperties Wed Jun 20 14:56:32 2007 @@ -704,10 +704,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D A= file with that name already exists ! org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Overw= rite org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filters -org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.* -org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D = Images -org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F= iles -org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F= lash +org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D S= earch org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Auto= matically rename org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Do no= thing org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Creat= e New Directory Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_de.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties&rev=3D17668&= repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d= e.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d= e.properties Wed Jun 20 14:56:32 2007 @@ -685,10 +685,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D E= ine Datei mit diesem Namen existiert bereits. org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D \u00D= Cberschreiben org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filter -org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.* -org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D = Bilder -org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D D= ateien -org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F= lash +org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D S= uchen org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Auto= matisch umbenennen org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Nicht= s unternehmen org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Neuen= Ordner erstellen Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_en.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D17668&= repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= n.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= n.properties Wed Jun 20 14:56:32 2007 @@ -704,10 +704,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D A= file with that name already exists ! org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Overw= rite org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filters -org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.* -org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D = Images -org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F= iles -org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F= lash +org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D S= earch org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Auto= matically rename org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Do no= thing org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Creat= e New Directory Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_es.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_es.properties&rev=3D17668&= repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= s.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= s.properties Wed Jun 20 14:56:32 2007 @@ -684,10 +684,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D Y= a existe un archivo con ese nombre org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Sobre= scribir org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtros -org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.* -org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D = Images -org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D A= rchivos -org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F= lash +org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D B= uscar org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Camb= iar nombre autom\u00E1ticamente org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D No ha= cer nada org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Crear= directorio nuevo Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_fr.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D17668&= repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f= r.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f= r.properties Wed Jun 20 14:56:32 2007 @@ -303,10 +303,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.filemanagerError.label = =3D Gestionnaire de fichiers - Une erreur est survenue lors de l'op=C3=A9ra= tion org.jahia.engines.filemanager.Filemanager_Engine.fileview.label =3D Vue du= fichier org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtres -org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.* -org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D = Images -org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F= ichiers -org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F= lash +org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D R= echercher org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label =3D Vous = pouvez donner les acc=C3=A8s en lecture sur ce fichier aux utilisateurs/gro= upes suivants org.jahia.engines.filemanager.Filemanager_Engine.for.label =3D pour org.jahia.engines.filemanager.Filemanager_Engine.forceUnlock.label =3D N= =C3=A9anmoins, vous pouvez d=C3=A9verrouiller le fichier en cochant la case= suivante Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_it.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_it.properties&rev=3D17668&= repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i= t.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i= t.properties Wed Jun 20 14:56:32 2007 @@ -683,10 +683,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D \= u00C8 gi\u00E0 presente un file con lo stesso nome! org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Sovra= scrivi org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtri -org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.* -org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D = Images -org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D F= iles -org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F= lash +org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D C= erca org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Rino= mina automaticamente org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Nessu= na operazione org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Crear= e nuova cartella Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_pt.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_pt.properties&rev=3D17668&= repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p= t.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p= t.properties Wed Jun 20 14:56:32 2007 @@ -683,10 +683,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D J= \u00E1 existe um arquivo com este nome! org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Subst= ituir org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filtros -org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label =3D *.* -org.jahia.engines.filemanager.Filemanager_Engine.filters.images.label =3D = Images -org.jahia.engines.filemanager.Filemanager_Engine.filters.files.label =3D A= rquivos -org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label =3D F= lash +org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D P= esquisar org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Reno= mear automaticamente org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D N\u00= E3o fazer nada org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Criar= Novo Diret\u00F3rio Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi= lemanager/AjaxFileManager.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp&r= ev=3D17668&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana= ger/AjaxFileManager.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana= ger/AjaxFileManager.jsp Wed Jun 20 14:56:32 2007 @@ -44,7 +44,7 @@ request.getSession().setAttribute("TreeFileManager", "true"); = boolean fckEditorTarget =3D "fckeditor".equals(request.getParameter("t= arget")); - final String resourceTypes =3D request.getParameter("resourceTypes") != =3D null ? request.getParameter("resourceTypes") : ""; + final String resourceTypes =3D request.getParameter("resourceTypes") != =3D null ? request.getParameter("resourceTypes") : "*"; %> = <script type=3D"text/javascript"> @@ -275,6 +275,7 @@ code =3D null; = if (code =3D=3D 13) { + delete code; return doReload(); } delete code; @@ -633,12 +634,20 @@ <td> <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.Filemana= ger_Engine.filters.label" />: - <select id=3D"filters" name=3D"filters" onchange=3D"doReload()= "> - <option value=3D"*"><jahia:engineResourceBundle resourceName= =3D"org.jahia.engines.filemanager.Filemanager_Engine.filters.all.label" /><= /option> - <option value=3D"images_Only" <% if ("images_Only".equals(res= ourceTypes)) {%>selected=3D"selected"<%}%>><jahia:engineResourceBundle reso= urceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.filters.images= .label" /></option> - <option value=3D"files_Only" <% if ("files_Only".equals(resou= rceTypes)) {%>selected=3D"selected"<%}%>><jahia:engineResourceBundle resour= ceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.filters.files.la= bel" /></option> - <option value=3D"*.swf" <% if ("*.swf".equals(resourceTypes))= {%>selected=3D"selected"<%}%>><jahia:engineResourceBundle resourceName=3D"= org.jahia.engines.filemanager.Filemanager_Engine.filters.flash.label" /></o= ption> - </select> + <input id=3D"filters" type=3D"text" name=3D"filters" value=3D"= <%=3D resourceTypes %>" onkeypress=3D"return keyDown(event)" /> + </td> + <td> + <a href=3D"#search" onclick=3D"return doReload()"> + <img alt=3D"<jahia:engineResourceBundle + resourceName=3D"org.jahia.engines.filemanager.Filemana= ger_Engine.filtersSearch.label"/>" + title=3D"<jahia:engineResourceBundle + resourceName=3D"org.jahia.engines.filemanager.Filemana= ger_Engine.filtersSearch.label"/>" + onmouseover=3D"this.src =3D '<jahia:serverHttpPath/>/= jsp/jahia/engines/images/icons/search_on.gif'" + onmouseout=3D"this.src =3D '<jahia:serverHttpPath/>/j= sp/jahia/engines/images/icons/search_off.gif'" border=3D"0" + = src=3D"<jahia:serverHttpPath/>/js= p/jahia/engines/images/icons/search_off.gif" + = width=3D"24" + = height=3D"24"/> + </a> </td> </tr> </table> Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh= ared/embedded_filemanager.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp&r= ev=3D17668&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e= mbedded_filemanager.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e= mbedded_filemanager.jsp Wed Jun 20 14:56:32 2007 @@ -52,6 +52,8 @@ final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEditCal= lingEngineName + ".theField"); = final String fieldValue =3D theField.getValue(); + + final String resourceTypes =3D request.getParameter("resourceTypes") != =3D null ? request.getParameter("resourceTypes") : "*"; %> = <script type=3D"text/javascript"> @@ -303,6 +305,26 @@ delete xmlDoc; } = + function doReload() { + var bar =3D document.getElementById("addressBarDisp"); + var encodedString =3D escape(bar.value); + + var jahiaCommand =3D new AsynchCommand(); + GlobalCallback[GlobalCallbackCount] =3D new AjxCallback(null, getT= heFolder); + jahiaCommand.addInvokeListener(GlobalCallback[GlobalCallbackCount]= ); + GlobalCallbackCount++; + + var xmlDoc =3D AjxXmlDoc.createRoot("GetQuotedPrintable"); + xmlDoc.set("value", encodedString); + jahiaCommand.invoke(xmlDoc, "<jahia:serverHttpPath/>/ajaxaction/Ge= tQuotedPrintable?value=3D" + encodedString); + + delete bar; + delete xmlDoc; + delete encodedString; + delete jahiaCommand; + return false; + } + = function keyDown(e) { var code; if (window.event) @@ -313,23 +335,8 @@ code =3D null; = if (code =3D=3D 13) { - var bar =3D document.getElementById("addressBarDisp"); - var encodedString =3D escape(bar.value); - - var jahiaCommand =3D new AsynchCommand(); - GlobalCallback[GlobalCallbackCount] =3D new AjxCallback(null, = getTheFolder); - jahiaCommand.addInvokeListener(GlobalCallback[GlobalCallbackCo= unt]); - GlobalCallbackCount++; - - var xmlDoc =3D AjxXmlDoc.createRoot("GetQuotedPrintable"); - xmlDoc.set("value", encodedString); - jahiaCommand.invoke(xmlDoc, "<jahia:serverHttpPath/>/ajaxactio= n/GetQuotedPrintable?value=3D" + encodedString); - - delete bar; - delete xmlDoc; - delete encodedString; - delete jahiaCommand; - return false; + delete code; + return doReload(); } delete code; return true; @@ -708,10 +715,28 @@ <input type=3D"text" name=3D"selectedFileName" style=3D"width:45%;" va= lue=3D"<%=3DTableEntry.javascriptDecode(filename) %>"/> - <a href=3D"javascript:go('selectFileEmpty')"><jahia:engineResourceB= undle resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.unse= lectFile.label"/></a> </div> -<br/> <input type=3D"hidden" id=3D"addressBar" name=3D"addressBar" /> -<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.= Filemanager_Engine.path.label"/>: <input id=3D"addressBarDisp" type=3D"text= " name=3D"addressBarDisp" style=3D"width:100%;display:inline;" onkeypress= =3D"return keyDown(event)"/> - +<div> + <div style=3D"float: left; width: 70%;"> + <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.file= manager.Filemanager_Engine.path.label"/>:<br/> + <input id=3D"addressBarDisp" type=3D"text" name=3D"addressBarDisp"= style=3D"width: 99%" onkeypress=3D"return keyDown(event)"/> + </div> + <div style=3D"float:right; width: 29%;"> + <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.file= manager.Filemanager_Engine.filters.label" />:<br/> + <input id=3D"filters" type=3D"text" name=3D"filters" value=3D"<%= =3D resourceTypes %>" onkeypress=3D"return keyDown(event)" /> + <a href=3D"#search" onclick=3D"return doReload()"> + <img style=3D"vertical-align: top" + alt=3D"<jahia:engineResourceBundle resourceName=3D"org.ja= hia.engines.filemanager.Filemanager_Engine.filtersSearch.label"/>" + title=3D"<jahia:engineResourceBundle resourceName=3D"org.= jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label"/>" + onmouseover=3D"this.src =3D '<jahia:serverHttpPath/>/jsp/= jahia/engines/images/icons/search_on.gif'" + onmouseout=3D"this.src =3D '<jahia:serverHttpPath/>/jsp/j= ahia/engines/images/icons/search_off.gif'" = + border=3D"0" = + src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/i= cons/search_off.gif" = + width=3D"24" height=3D"24"/> + </a> + </div> +</div> +<br style=3D"clear: both;" /> <% final String title =3D JahiaResourceBundle.getEngineResource("org.jahi= a.engines.filemanager.Filemanager_Engine.path.label", jParams, jParams.getLocale()); Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditor= s/fckeditor/fckeditor_htmleditor.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmledito= r.jsp&rev=3D17668&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke= ditor/fckeditor_htmleditor.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke= ditor/fckeditor_htmleditor.jsp Wed Jun 20 14:56:32 2007 @@ -162,9 +162,9 @@ = //Set image dialog configuration //oFCKeditor.Config.ImageBrowserURL =3D sBasePath + "editor/plugin= s/JahiaImager/dialog.jsp"; - oFCKeditor.Config.ImageBrowserURL =3D "<jahia:serverHttpPath/>/Jahia/eng= ineName/filemanager/op/edit/pid/<%=3D jParams.getPageID() %>?screen=3Dajaxf= ilemanager&target=3Dfckeditor&resourceTypes=3Dimages_Only"; + oFCKeditor.Config.ImageBrowserURL =3D "<jahia:serverHttpPath/>/Jahia/eng= ineName/filemanager/op/edit/pid/<%=3D jParams.getPageID() %>?screen=3Dajaxf= ilemanager&target=3Dfckeditor&resourceTypes=3D*.bmp,*.gif,*.jpe,*.jpeg,*.jp= g,*.png,*.tif,*.tiff"; = - oFCKeditor.Config.FileBrowserURL =3D "<jahia:serverHttpPath/>/Jahia/engi= neName/filemanager/op/edit/pid/<%=3D jParams.getPageID() %>?screen=3Dajaxfi= lemanager&target=3Dfckeditor&resourceTypes=3Dfiles_Only"; + oFCKeditor.Config.FileBrowserURL =3D "<jahia:serverHttpPath/>/Jahia/engi= neName/filemanager/op/edit/pid/<%=3D jParams.getPageID() %>?screen=3Dajaxfi= lemanager&target=3Dfckeditor&resourceTypes=3D*"; = oFCKeditor.Config.FlashBrowserURL =3D "<jahia:serverHttpPath/>/Jahia/eng= ineName/filemanager/op/edit/pid/<%=3D jParams.getPageID() %>?screen=3Dajaxf= ilemanager&target=3Dfckeditor&resourceTypes=3D*.swf"; = _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
