Author: sshyrkov Date: Thu Jun 28 12:07:24 2007 New Revision: 17816 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17816&repname= =3Djahia Log: JAHIA-1966: Integrate File Manager (Ajax-based) into FCKeditor http://www.jahia.net/jira/browse/JAHIA-1966 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 JAHIA-1984: SP2: AJAX FM: Selection Buttons also available at the top right =
http://www.jahia.net/jira/browse/JAHIA-1984 Resolved: applied changes from Jahia 5.0 SP2 Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties trunk/core/src/conf/java/JahiaEnginesResources_de.properties trunk/core/src/conf/java/JahiaEnginesResources_en.properties trunk/core/src/conf/java/JahiaEnginesResources_es.properties trunk/core/src/conf/java/JahiaEnginesResources_fr.properties trunk/core/src/conf/java/JahiaEnginesResources_it.properties trunk/core/src/conf/java/JahiaEnginesResources_pt.properties trunk/core/src/webapp/jsp/jahia/engines/css/styles.css trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _flash.html trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _image.html trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _image/fck_image.js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _link.html trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _link/fck_link.js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/de.js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-au= .js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-ca= .js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-uk= .js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en.js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/fr.js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckconfig.js trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmledi= tor.jsp Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources.properties&rev=3D17816&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 --- trunk/core/src/conf/java/JahiaEnginesResources.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources.properties Thu Jun 28 12= :07:24 2007 @@ -759,6 +759,8 @@ org.jahia.engines.filemanager.Filemanager_Engine.openIEfolder.label =3D Op= en in IE folder org.jahia.engines.filemanager.Filemanager_Engine.notEnoughRights.label =3D= Warning : You do not have enough access rights to access or modify previou= sly selected file or folder org.jahia.engines.filemanager.Filemanager_Engine.notFound.label =3D Warnin= g : Previously selected file cannot be found +org.jahia.engines.filemanager.Filemanager_Engine.notSelected.label =3D Ple= ase select a file +org.jahia.engines.filemanager.Filemanager_Engine.multipleNotAllowed.label = =3D Warning: Your have selected multiple files. Please select a single file org.jahia.engines.filemanager.Filemanager_Engine.unknownError.label =3D Wa= rning : Cannot get object org.jahia.engines.filemanager.Filemanager_Engine.warnRights.label =3D Warn= ing : some users should be able to read this field, but cannot acces the se= lected file. org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label =3D You c= an fix this by granting the selected users/groups read access on the file Modified: trunk/core/src/conf/java/JahiaEnginesResources_de.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_de.properties&rev=3D17816&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 --- trunk/core/src/conf/java/JahiaEnginesResources_de.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_de.properties Thu Jun 28= 12:07:24 2007 @@ -207,6 +207,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.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 @@ -258,6 +259,8 @@ org.jahia.engines.filemanager.Filemanager_Engine.openIEfolder.label =3D In= IE-Ordner \u00F6ffnen org.jahia.engines.filemanager.Filemanager_Engine.notEnoughRights.label =3D= Warnung: Ihre Zugangsrechte sind nicht ausreichend, um die ausgew\u00E4hlt= e Datei bzw. den ausgew\u00E4hlten Ordner anzuzeigen oder zu \u00E4ndern. org.jahia.engines.filemanager.Filemanager_Engine.notFound.label =3D Warnun= g: Die ausgew\u00E4hlte Datei ist nicht auffindbar. +org.jahia.engines.filemanager.Filemanager_Engine.notSelected.label =3D W\u= 00E4hlen Sie bitte eine Datei aus +org.jahia.engines.filemanager.Filemanager_Engine.multipleNotAllowed.label = =3D Warnung: Sie haben mehrere Dateien ausgew\u00E4hlt. W\u00E4hlen Sie bit= te nur eine Datei aus org.jahia.engines.filemanager.Filemanager_Engine.unknownError.label =3D Wa= rnung: Das Objekt kann nicht geladen werden. org.jahia.engines.filemanager.Filemanager_Engine.warnRights.label =3D Warn= ung: Einige Benutzer k\u00F6nnen dieses Feld zwar anzeigen, aber nicht lese= n. org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label =3D Um di= eses Problem zu beheben, k\u00F6nnen Sie den betreffenden Benutzern/Gruppen= einen Lesezugriff auf die Datei gew\u00E4hren. Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_en.properties&rev=3D17816&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 --- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Thu Jun 28= 12:07:24 2007 @@ -701,6 +701,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.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 @@ -754,6 +755,8 @@ org.jahia.engines.filemanager.Filemanager_Engine.openIEfolder.label =3D Op= en in IE folder org.jahia.engines.filemanager.Filemanager_Engine.notEnoughRights.label =3D= Warning : You do not have enough access rights to access or modify previou= sly selected file or folder org.jahia.engines.filemanager.Filemanager_Engine.notFound.label =3D Warnin= g : Previously selected file cannot be found +org.jahia.engines.filemanager.Filemanager_Engine.notSelected.label =3D Ple= ase select a file +org.jahia.engines.filemanager.Filemanager_Engine.multipleNotAllowed.label = =3D Warning: Your have selected multiple files. Please select a single file org.jahia.engines.filemanager.Filemanager_Engine.unknownError.label =3D Wa= rning : Cannot get object org.jahia.engines.filemanager.Filemanager_Engine.warnRights.label =3D Warn= ing : some users should be able to read this field, but cannot acces the se= lected file. org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label =3D You c= an fix this by granting the selected users/groups read access on the file Modified: trunk/core/src/conf/java/JahiaEnginesResources_es.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_es.properties&rev=3D17816&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 --- trunk/core/src/conf/java/JahiaEnginesResources_es.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_es.properties Thu Jun 28= 12:07:24 2007 @@ -206,6 +206,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.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: trunk/core/src/conf/java/JahiaEnginesResources_fr.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_fr.properties&rev=3D17816&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 --- trunk/core/src/conf/java/JahiaEnginesResources_fr.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_fr.properties Thu Jun 28= 12:07:24 2007 @@ -303,6 +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.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 @@ -329,6 +330,7 @@ org.jahia.engines.filemanager.Filemanager_Engine.newName.label =3D Nouveau= nom org.jahia.engines.filemanager.Filemanager_Engine.notEnoughRights.label =3D= Attention : vous ne disposez pas des droits requis pour voir ou modifier l= e fichier ou le dossier pr=C3=A9c=C3=A9demment s=C3=A9lectionn=C3=A9 org.jahia.engines.filemanager.Filemanager_Engine.notFound.label =3D Attent= ion : impossible de trouver le fichier pr=C3=A9c=C3=A9demment s=C3=A9lectio= nn=C3=A9 +org.jahia.engines.filemanager.Filemanager_Engine.notSelected.label =3D Veu= illez s=C3=A9lectionner un fichier org.jahia.engines.filemanager.Filemanager_Engine.nousage.label =3D Ce fich= ier n'est pas actuellement utilis=C3=A9. org.jahia.engines.filemanager.Filemanager_Engine.openIEfolder.label =3D Ou= vrir dans un dossier IE org.jahia.engines.filemanager.Filemanager_Engine.operations.label =3D Op= =C3=A9rations Modified: trunk/core/src/conf/java/JahiaEnginesResources_it.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_it.properties&rev=3D17816&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 --- trunk/core/src/conf/java/JahiaEnginesResources_it.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_it.properties Thu Jun 28= 12:07:24 2007 @@ -207,6 +207,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.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: trunk/core/src/conf/java/JahiaEnginesResources_pt.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j= ava/JahiaEnginesResources_pt.properties&rev=3D17816&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 --- trunk/core/src/conf/java/JahiaEnginesResources_pt.properties (original) +++ trunk/core/src/conf/java/JahiaEnginesResources_pt.properties Thu Jun 28= 12:07:24 2007 @@ -204,6 +204,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.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: trunk/core/src/webapp/jsp/jahia/engines/css/styles.css URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/engines/css/styles.css&rev=3D17816&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 --- trunk/core/src/webapp/jsp/jahia/engines/css/styles.css (original) +++ trunk/core/src/webapp/jsp/jahia/engines/css/styles.css Thu Jun 28 12:07= :24 2007 @@ -100,7 +100,7 @@ *height: 30px; } = -#buttons { +#buttons, div.buttons { display: block; float: right; padding-top: 12px; Modified: trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManag= er.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/engines/filemanager/AjaxFileManager.jsp&rev=3D17816&repname=3Dja= hia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp= (original) +++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp= Thu Jun 28 12:07:24 2007 @@ -43,6 +43,9 @@ path =3D mountPoint; } 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") : ""; %> = <script type=3D"text/javascript"> @@ -244,6 +247,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, getThe= Folder); + jahiaCommand.addInvokeListener(GlobalCallback[GlobalCallbackCount]); + GlobalCallbackCount++; + + var xmlDoc =3D AjxXmlDoc.createRoot("GetQuotedPrintable"); + xmlDoc.set("value", encodedString); + jahiaCommand.invoke(xmlDoc, "<jahia:serverHttpPath/>/ajaxaction/GetQ= uotedPrintable?value=3D" + encodedString); + + delete bar; + delete xmlDoc; + delete encodedString; + delete jahiaCommand; + return false; + } + = function keyDown(e) { var code; if (window.event) @@ -254,23 +277,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; @@ -444,10 +452,55 @@ delete child; delete obj; } +<% if (fckEditorTarget) {%> + function doSelectResource() { + var found =3D false; + var multipleFound =3D false; + var selectedResource =3D null; + for (var i =3D 0; i < ComplexTreeProperties.COUNTER; i++) { + var elem =3D document.getElementById("checkbox_" + i); + if (elem && elem.checked) { + if (found) { + multipleFound =3D true; + break; + } else { + found =3D true; + selectedResource =3D elem.name; + } + } + } + if (!found) { + alert('<jahia:engineResourceBundle resourceName=3D"org.jahia.engines= .filemanager.Filemanager_Engine.notSelected.label"/>'); + } else if (multipleFound) { + alert('<jahia:engineResourceBundle resourceName=3D"org.jahia.engines= .filemanager.Filemanager_Engine.multipleNotAllowed.label"/>'); + } else { + try { + window.opener.SetUrl("<%=3D request.getContextPath()%>/repository/defa= ult" + selectedResource.replace(/\|/g, "%")); + } catch (e) {}; + window.close(); + } + } +<% } %> //--> </script> = <h3 class=3D"filemanagerIcon"><jahia:engineResourceBundle resourceName=3D"= org.jahia.engines.filemanager.Filemanager_Engine.name.label"/></h3> +<div class=3D"buttons"> + <% if (fckEditorTarget) {%> + <div class=3D"button"> + <a href=3D"javascript:doSelectResource();" + title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.= engines.filemanager.Filemanager_Engine.selectFile.label"/>"> + <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.= filemanager.Filemanager_Engine.selectFile.label"/> + </a> + </div> + <% } %> + <div class=3D"button"> + <a href=3D"javascript:window.close();" + title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.= close.button"/>"> + <jahia:engineResourceBundle resourceName=3D"org.jahia.close.bu= tton"/> + </a> + </div> +</div> = <br/> <table cellpadding=3D"0" cellspacing=3D"0" border=3D"0"> @@ -583,7 +636,20 @@ <td> <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.Filemana= ger_Engine.filters.label" />: - <input id=3D"filters" type=3D"text" name=3D"filters" value=3D"= " onkeypress=3D"return keyDown(event)" /> + <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> @@ -621,6 +687,14 @@ </script> = <div id=3D"buttons"> + <% if (fckEditorTarget) {%> + <div class=3D"button"> + <a href=3D"javascript:doSelectResource();" + title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.= engines.filemanager.Filemanager_Engine.selectFile.label"/>"> + <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.= filemanager.Filemanager_Engine.selectFile.label"/> + </a> + </div> + <% } %> <div class=3D"button"> <a href=3D"javascript:window.close();" title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.= close.button"/>"> Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanag= er.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/engines/shared/embedded_filemanager.jsp&rev=3D17816&repname=3Dja= hia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp= (original) +++ trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp= Thu Jun 28 12:07:24 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; @@ -701,10 +708,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: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dial= og/fck_flash.html URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/dialog/fck_flash.html&rev=3D17816&r= epname=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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _flash.html (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _flash.html Thu Jun 28 12:07:24 2007 @@ -39,7 +39,7 @@ <tr> <td width=3D"100%"><span fckLang=3D"DlgImgURL">URL</span> </td> - <td id=3D"tdBrowse" style=3D"DISPLAY: none" noWrap rowSpan=3D"2">&= nbsp; <input id=3D"btnBrowse" onclick=3D"BrowseServer();" type=3D"button" v= alue=3D"Browse Server" fckLang=3D"DlgBtnBrowseServer"> + <td id=3D"tdBrowse" style=3D"DISPLAY: none" noWrap rowSpan=3D"2" v= align=3D"bottom"> <input id=3D"btnBrowse" onclick=3D"BrowseServer();"= type=3D"button" value=3D"Browse Server" fckLang=3D"DlgBtnBrowseServer"> </td> </tr> <tr> Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dial= og/fck_image.html URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/dialog/fck_image.html&rev=3D17816&r= epname=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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _image.html (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _image.html Thu Jun 28 12:07:24 2007 @@ -40,7 +40,7 @@ <td width=3D"100%"> <span fcklang=3D"DlgImgURL">URL</span> </td> - <td id=3D"tdBrowse" style=3D"display: none" nowrap=3D"nowrap" rowsp= an=3D"2"> + <td id=3D"tdBrowse" style=3D"display: none" nowrap=3D"nowrap" rowsp= an=3D"2" valign=3D"bottom"> <input id=3D"btnBrowse" onclick=3D"BrowseServer();" type=3D"button= " value=3D"Browse Server" fcklang=3D"DlgBtnBrowseServer" /> @@ -172,7 +172,8 @@ <input id=3D"txtLnkUrl" style=3D"width: 100%" type=3D"text" onblur= =3D"UpdatePreview();" /> </div> <div id=3D"divLnkBrowseServer" align=3D"right"> - <input type=3D"button" value=3D"Browse Server" fcklang=3D"DlgBtnBrow= seServer" onclick=3D"LnkBrowseServer();" /> + <input type=3D"button" value=3D"Link to Portal Pag= e" fcklang=3D"DlgBtnLinkPortalPage" onclick=3D"LnkBrowseServer();" /> = + <input type=3D"button" value=3D"Link to File on Se= rver" fcklang=3D"DlgBtnLinkFile" onclick=3D"LnkBrowseServerForFiles();" /> </div> <div> <span fcklang=3D"DlgLnkTarget">Target</span><br /> Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dial= og/fck_image/fck_image.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/dialog/fck_image/fck_image.js&rev= =3D17816&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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _image/fck_image.js (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _image/fck_image.js Thu Jun 28 12:07:24 2007 @@ -399,6 +399,15 @@ FCKConfig.LinkBrowserWindowHeight ) ; } = +function LnkBrowseServerForFiles() +{ + OpenServerBrowser( + 'Link', + FCKConfig.FileBrowserURL, + FCKConfig.FileBrowserWindowWidth, + FCKConfig.FileBrowserWindowHeight ) ; +} + function OpenServerBrowser( type, url, width, height ) { sActualBrowser =3D type ; Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dial= og/fck_link.html URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/dialog/fck_link.html&rev=3D17816&re= pname=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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _link.html (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _link.html Thu Jun 28 12:07:24 2007 @@ -61,7 +61,8 @@ </table> <br /> <div id=3D"divBrowseServer"> - <input type=3D"button" value=3D"Browse Server" fckLang=3D"DlgBtnBrowse= Server" onclick=3D"BrowseServer();" /> + <input type=3D"button" value=3D"Link to Portal Page" fckLang=3D"DlgBtn= LinkPortalPage" onclick=3D"BrowseServer();" /> + <input type=3D"button" value=3D"Link to File on Server" fckLang=3D"Dlg= BtnLinkFile" onclick=3D"BrowseServerForFiles();" /> </div> </div> <div id=3D"divLinkTypeAnchor" style=3D"DISPLAY: none" align=3D"center"> Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dial= og/fck_link/fck_link.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/dialog/fck_link/fck_link.js&rev=3D1= 7816&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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _link/fck_link.js (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/dialog/fck= _link/fck_link.js Thu Jun 28 12:07:24 2007 @@ -602,6 +602,11 @@ OpenFileBrowser( FCKConfig.LinkBrowserURL, FCKConfig.LinkBrowserWindowWid= th, FCKConfig.LinkBrowserWindowHeight ) ; } = +function BrowseServerForFiles() +{ + OpenFileBrowser( FCKConfig.FileBrowserURL, FCKConfig.FileBrowserWindowWid= th, FCKConfig.FileBrowserWindowHeight ) ; +} + function SetUrl( url ) { document.getElementById('txtUrl').value =3D url ; Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang= /de.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/lang/de.js&rev=3D17816&repname=3Dja= hia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/de.js= (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/de.js= Thu Jun 28 12:07:24 2007 @@ -154,6 +154,8 @@ DlgBtnCancel : "Abbrechen", DlgBtnClose : "Schlie=C3=83=C2=9Fen", DlgBtnBrowseServer : "Server durchsuchen", +DlgBtnLinkPortalPage: "Link zu Portal-Seite", +DlgBtnLinkFile : "Link zu Datei am Server", DlgAdvancedTag : "Erweitert", DlgOpOther : "<andere>", DlgInfoTab : "Info", Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang= /en-au.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/lang/en-au.js&rev=3D17816&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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-au= .js (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-au= .js Thu Jun 28 12:07:24 2007 @@ -154,6 +154,8 @@ DlgBtnCancel : "Cancel", DlgBtnClose : "Close", DlgBtnBrowseServer : "Browse Server", +DlgBtnLinkPortalPage: "Link to Portal Page", +DlgBtnLinkFile : "Link to File on Server", DlgAdvancedTag : "Advanced", DlgOpOther : "<Other>", DlgInfoTab : "Info", Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang= /en-ca.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/lang/en-ca.js&rev=3D17816&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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-ca= .js (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-ca= .js Thu Jun 28 12:07:24 2007 @@ -154,6 +154,8 @@ DlgBtnCancel : "Cancel", DlgBtnClose : "Close", DlgBtnBrowseServer : "Browse Server", +DlgBtnLinkPortalPage: "Link to Portal Page", +DlgBtnLinkFile : "Link to File on Server", DlgAdvancedTag : "Advanced", DlgOpOther : "<Other>", DlgInfoTab : "Info", Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang= /en-uk.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/lang/en-uk.js&rev=3D17816&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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-uk= .js (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en-uk= .js Thu Jun 28 12:07:24 2007 @@ -154,6 +154,8 @@ DlgBtnCancel : "Cancel", DlgBtnClose : "Close", DlgBtnBrowseServer : "Browse Server", +DlgBtnLinkPortalPage: "Link to Portal Page", +DlgBtnLinkFile : "Link to File on Server", DlgAdvancedTag : "Advanced", DlgOpOther : "<Other>", DlgInfoTab : "Info", Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang= /en.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/lang/en.js&rev=3D17816&repname=3Dja= hia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en.js= (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/en.js= Thu Jun 28 12:07:24 2007 @@ -154,6 +154,8 @@ DlgBtnCancel : "Cancel", DlgBtnClose : "Close", DlgBtnBrowseServer : "Browse Server", +DlgBtnLinkPortalPage: "Link to Portal Page", +DlgBtnLinkFile : "Link to File on Server", DlgAdvancedTag : "Advanced", DlgOpOther : "<Other>", DlgInfoTab : "Info", Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang= /fr.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/editor/lang/fr.js&rev=3D17816&repname=3Dja= hia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/fr.js= (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/lang/fr.js= Thu Jun 28 12:07:24 2007 @@ -154,6 +154,8 @@ DlgBtnCancel : "Annuler", DlgBtnClose : "Fermer", DlgBtnBrowseServer : "Parcourir le serveur", +DlgBtnLinkPortalPage: "Lien vers la page", +DlgBtnLinkFile : "Lien vers le fichier", DlgAdvancedTag : "Avanc=C3=83=C2=A9", DlgOpOther : "<Autre>", DlgInfoTab : "Info", Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckconfig.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/fckconfig.js&rev=3D17816&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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckconfig.js (ori= ginal) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckconfig.js Thu = Jun 28 12:07:24 2007 @@ -199,16 +199,20 @@ FCKConfig.LinkBrowserWindowWidth =3D FCKConfig.ScreenWidth * 0.7 ; // 70% FCKConfig.LinkBrowserWindowHeight =3D FCKConfig.ScreenHeight * 0.7 ; // 70% = +FCKConfig.FileBrowser =3D true ; +FCKConfig.FileBrowserWindowWidth =3D FCKConfig.ScreenWidth * 0.9 ; // 90% +FCKConfig.FileBrowserWindowHeight =3D FCKConfig.ScreenHeight * 0.8 ; // 80% + FCKConfig.ImageBrowser =3D true ; //FCKConfig.ImageBrowserURL =3D FCKConfig.BasePath + 'filemanager/browser/= default/browser.html?Type=3DImage&Connector=3Dconnectors/' + _FileBrowserLa= nguage + '/connector.' + _FileBrowserExtension ; -FCKConfig.ImageBrowserWindowWidth =3D FCKConfig.ScreenWidth * 0.7 ; // 70= % ; -FCKConfig.ImageBrowserWindowHeight =3D FCKConfig.ScreenHeight * 0.7 ; // 7= 0% ; -/* -FCKConfig.FlashBrowser =3D true ; -FCKConfig.FlashBrowserURL =3D FCKConfig.BasePath + 'filemanager/browser/de= fault/browser.html?Type=3DFlash&Connector=3Dconnectors/' + _FileBrowserLang= uage + '/connector.' + _FileBrowserExtension ; -FCKConfig.FlashBrowserWindowWidth =3D FCKConfig.ScreenWidth * 0.7 ; //70%= ; -FCKConfig.FlashBrowserWindowHeight =3D FCKConfig.ScreenHeight * 0.7 ; //70= % ; +FCKConfig.ImageBrowserWindowWidth =3D FCKConfig.ScreenWidth * 0.9 ; // 90= % ; +FCKConfig.ImageBrowserWindowHeight =3D FCKConfig.ScreenHeight * 0.8 ; // 8= 0% ; = +FCKConfig.FlashBrowser =3D true ; +//FCKConfig.FlashBrowserURL =3D FCKConfig.BasePath + 'filemanager/browser/= default/browser.html?Type=3DFlash&Connector=3Dconnectors/' + _FileBrowserLa= nguage + '/connector.' + _FileBrowserExtension ; +FCKConfig.FlashBrowserWindowWidth =3D FCKConfig.ScreenWidth * 0.9 ; //90%= ; +FCKConfig.FlashBrowserWindowHeight =3D FCKConfig.ScreenHeight * 0.8 ; //80= % ; +/* FCKConfig.LinkUpload =3D true ; FCKConfig.LinkUploadURL =3D FCKConfig.BasePath + 'filemanager/upload/' + _= QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ; FCKConfig.LinkUploadAllowedExtensions =3D "" ; // empty for all Modified: trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_h= tmleditor.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/htmleditors/fckeditor/fckeditor_htmleditor.jsp&rev=3D17816&repna= me=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 --- trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmledi= tor.jsp (original) +++ trunk/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmledi= tor.jsp Thu Jun 28 12:07:24 2007 @@ -161,7 +161,12 @@ <% } %> = //Set image dialog configuration - oFCKeditor.Config.ImageBrowserURL =3D sBasePath + "editor/plugins/= JahiaImager/dialog.jsp"; + //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=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=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"; = //Set link dialog configuration oFCKeditor.Config.LinkBrowserURL =3D sBasePath + "editor/plugins/J= ahiaLinker/dialog.jsp"; _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
