Author: sshyrkov Date: Mon Jun 11 13:48:23 2007 New Revision: 17544 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17544&repname= =3Djahia Log: JAHIA-1984: SP2: AJAX FM: Selection Buttons also available at the top right =
http://www.jahia.net/jira/browse/JAHIA-1984 Resolved: 1) Button group also added to the top-right corner of the dialog 2) In FCKeditor the 'OK 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_f= r.properties branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/styl= es.css branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana= ger/AjaxFileManager.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=3D17544&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 Mon Jun 11 13:48:23 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: 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=3D17544&= 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 Mon Jun 11 13:48:23 2007 @@ -740,6 +740,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: 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=3D17544&= 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 Mon Jun 11 13:48:23 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: 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=3D17544&= 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 Mon Jun 11 13:48:23 2007 @@ -331,6 +331,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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/cs= s/styles.css URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/css/styles.css&rev=3D17544&repnam= e=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/css/styl= es.css (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/styl= es.css Mon Jun 11 13:48:23 2007 @@ -100,7 +100,7 @@ *height: 30px; } = -#buttons { +#buttons, div.buttons { display: block; float: right; padding-top: 12px; 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=3D17544&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 Mon Jun 11 13:48:23 2007 @@ -449,10 +449,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() + "/webdav/site/"= + jParams.getSiteKey() %>" + 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"> @@ -629,30 +674,17 @@ <script type=3D"text/javascript"> ComplexTreeProperties.webdavPath =3D "<%=3Dnew StringBuffer().append(r= equest.getScheme()).append("://").append(request.getServerName()).append(re= quest.getServerPort()!=3D80?":" + request.getServerPort():"").append(reques= t.getContextPath()).append("/webdav/site/").append(jParams.getSiteKey()).to= String()%>"; ComplexTreeProperties.RELOAD_ON_COLLAPSE =3D true; -<% if (fckEditorTarget) {%> -function doSelectResource() { - for (var i =3D 0; i < ComplexTreeProperties.COUNTER; i++) { - var elem =3D document.getElementById("checkbox_" + i); - if (elem && elem.checked) { - try { - window.opener.SetUrl("<%=3D request.getContextPath() + "/webdav/site/"= + jParams.getSiteKey() %>" + elem.name.replace(/\|/g, "%")); - break; - } catch (e) {}; - } - } - window.close(); -} -<% } %> </script> - <div id=3D"buttons"> + <% if (fckEditorTarget) {%> <div class=3D"button"> - <% if (fckEditorTarget) {%> <a href=3D"javascript:doSelectResource();" - title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.= ok.button"/>"> - <jahia:engineResourceBundle resourceName=3D"org.jahia.ok.butto= n"/> + 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"/> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
