Author: xlawrence
Date: Thu Aug 3 13:02:52 2006
New Revision: 14838
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14838&repname=jahia
Log:
Implement http://www.jahia.net/jira/browse/DOC-110
Modified:
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree.js
Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/conf/java/JahiaEnginesResources.properties&rev=14838&repname=jahia
==============================================================================
--- trunk/core/src/conf/java/JahiaEnginesResources.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources.properties Thu Aug 3
13:02:52 2006
@@ -665,6 +665,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.uploadNewFile.label = Upload
file(s)
org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label = A file
with that name already exists !
org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label = Overwrite
+org.jahia.engines.filemanager.Filemanager_Engine.filters.label = Filters
org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =
Automatically rename
org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label = Do nothing
org.jahia.engines.filemanager.Filemanager_Engine.createDir.label = Create New
Directory
Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/conf/java/JahiaEnginesResources_en.properties&rev=14838&repname=jahia
==============================================================================
--- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Thu Aug 3
13:02:52 2006
@@ -374,6 +374,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.uploadNewFile.label = Upload
file(s)
org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label = A file
with that name already exists !
org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label = Overwrite
+org.jahia.engines.filemanager.Filemanager_Engine.filters.label = Filters
org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =
Automatically rename
org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label = Do nothing
org.jahia.engines.filemanager.Filemanager_Engine.createDir.label = Create New
Directory
Modified: trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=14838&repname=jahia
==============================================================================
--- trunk/core/src/conf/java/JahiaEnginesResources_fr.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_fr.properties Thu Aug 3
13:02:52 2006
@@ -258,6 +258,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.uploadNewFile.label = Envoyer
des fichiers
org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label = Un
fichier avec ce nom existe d\u00e9j\u00e0 !
org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label = \u00c9craser
+org.jahia.engines.filemanager.Filemanager_Engine.filters.label = Filtres
org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label = Renommer
automatiquement
org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label = Ne rien
faire
org.jahia.engines.filemanager.Filemanager_Engine.createDir.label = Creer un
nouveau r\u00e9pertoire
Modified:
trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp&rev=14838&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp
(original)
+++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp Thu
Aug 3 13:02:52 2006
@@ -511,6 +511,12 @@
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.imageview.label"/></option>
</select>
</td>
+ <td class="separator"> </td>
+ <td>
+ <jahia:engineResourceBundle
+
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.filters.label"
/>:
+ <input id="filters" type="text" name="filters" value=""
onkeypress="return keyDown(event)" />
+ </td>
</tr>
</table>
Modified:
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree.js
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree.js&rev=14838&repname=jahia
==============================================================================
---
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree.js
(original)
+++
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree.js
Thu Aug 3 13:02:52 2006
@@ -541,13 +541,18 @@
var xmlDoc = AjxXmlDoc.createRoot("GetDirContent");
xmlDoc.set("key", item._key);
var reg = new RegExp("(&display=directories_Only)", "g");
- jahiaCommand.invoke(xmlDoc, this._props.EXPAND_SERVER_URL.replace(reg,
"&display="));
+ var theUrl = this._props.EXPAND_SERVER_URL.replace(reg, "&display=");
+ var filters = document.getElementById("filters").value;
+ if (filters.length > 0) theUrl += filters;
+ jahiaCommand.invoke(xmlDoc, theUrl);
delete reg;
updateMenuBarAfterSelect(item._key);
delete jahiaCommand;
delete callback;
delete xmlDoc;
delete reg;
+ delete theUrl;
+ delete filters;
} else {
var dirs = itemKey.split("/");
@@ -584,12 +589,17 @@
xmlDoc.set("key", item._key);
var reg = new RegExp("(&display=directories_Only)", "g");
- jahiaCommand.invoke(xmlDoc, this._props.EXPAND_SERVER_URL.replace(reg,
"&display="));
+ var theUrl = this._props.EXPAND_SERVER_URL.replace(reg, "&display=");
+ var filters = document.getElementById("filters").value;
+ if (filters.length > 0) theUrl += filters;
+ jahiaCommand.invoke(xmlDoc, theUrl);
updateMenuBarAfterSelect(item._key);
delete jahiaCommand;
delete callback;
delete xmlDoc;
delete reg;
+ delete theUrl;
+ delete filters;
}
/**
