tdraier 2005/03/17 17:26:09 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java JahiaEnginesResources.properties
JahiaEnginesResources_de.properties
JahiaEnginesResources_en.properties
JahiaEnginesResources_fr.properties
JahiaEnginesResources_it.properties
JahiaEnginesResources_nl.properties
src/views/jsp/jahia/engines/shared
embedded_flat_filemanager.jsp
Log:
basic bug fixes :
- removed move/rename on readonly file/dirs
- syntaxic correction in french
- added dirPermissions key
Revision Changes Path
1.58.2.5.2.3 +1 -0 jahia/src/java/JahiaEnginesResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources.properties.diff?r1=1.58.2.5.2.2&r2=1.58.2.5.2.3&f=h
1.1.2.2.2.3 +1 -0 jahia/src/java/JahiaEnginesResources_de.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_de.properties.diff?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&f=h
1.26.2.5.2.3 +1 -0 jahia/src/java/JahiaEnginesResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_en.properties.diff?r1=1.26.2.5.2.2&r2=1.26.2.5.2.3&f=h
1.35.2.9.2.3 +12 -11 jahia/src/java/JahiaEnginesResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_fr.properties.diff?r1=1.35.2.9.2.2&r2=1.35.2.9.2.3&f=h
1.1.2.2.2.2 +1 -0 jahia/src/java/JahiaEnginesResources_it.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_it.properties.diff?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&f=h
1.1.2.2.2.2 +1 -0 jahia/src/java/JahiaEnginesResources_nl.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_nl.properties.diff?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&f=h
1.16.2.3.2.3 +8 -8
jahia/src/views/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp.diff?r1=1.16.2.3.2.2&r2=1.16.2.3.2.3&f=h
Index: JahiaEnginesResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources.properties,v
retrieving revision 1.58.2.5.2.2
retrieving revision 1.58.2.5.2.3
diff -u -r1.58.2.5.2.2 -r1.58.2.5.2.3
--- JahiaEnginesResources.properties 3 Mar 2005 14:11:08 -0000
1.58.2.5.2.2
+++ JahiaEnginesResources.properties 17 Mar 2005 16:26:07 -0000
1.58.2.5.2.3
@@ -596,6 +596,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label
= Select target directory
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label
= Preview
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label
= File permissions
+org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label
= Directory permissions
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label
= Are you sure you want to delete this file ?
org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label
= This file is being used in active or waiting
content, therefore it cannot be deleted.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label
= View file usages
Index: JahiaEnginesResources_de.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_de.properties,v
retrieving revision 1.1.2.2.2.2
retrieving revision 1.1.2.2.2.3
diff -u -r1.1.2.2.2.2 -r1.1.2.2.2.3
--- JahiaEnginesResources_de.properties 3 Mar 2005 14:11:08 -0000
1.1.2.2.2.2
+++ JahiaEnginesResources_de.properties 17 Mar 2005 16:26:07 -0000
1.1.2.2.2.3
@@ -630,6 +630,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.operations.label
= Operationen
org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label
= Überschreiben
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label
= Datei Erlaubnis
+org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label
=
Verzeichnis Erlaubnis
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label
= Vorschau
org.jahia.engines.filemanager.Filemanager_Engine.renameFile.label
= Unbenennnen
org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label
= Wählen sie das Ziel Vertzeichnis aus
Index: JahiaEnginesResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_en.properties,v
retrieving revision 1.26.2.5.2.2
retrieving revision 1.26.2.5.2.3
diff -u -r1.26.2.5.2.2 -r1.26.2.5.2.3
--- JahiaEnginesResources_en.properties 3 Mar 2005 14:11:08 -0000
1.26.2.5.2.2
+++ JahiaEnginesResources_en.properties 17 Mar 2005 16:26:07 -0000
1.26.2.5.2.3
@@ -596,6 +596,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label
= Select target directory
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label
= Preview
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label
= File permissions
+org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label
= Directory permissions
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label
= Are you sure you want to delete this file ?
org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label
= This file is being used in active or waiting
content, therefore it cannot be deleted.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label
= View file usages
Index: JahiaEnginesResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_fr.properties,v
retrieving revision 1.35.2.9.2.2
retrieving revision 1.35.2.9.2.3
diff -u -r1.35.2.9.2.2 -r1.35.2.9.2.3
--- JahiaEnginesResources_fr.properties 3 Mar 2005 14:11:08 -0000
1.35.2.9.2.2
+++ JahiaEnginesResources_fr.properties 17 Mar 2005 16:26:07 -0000
1.35.2.9.2.3
@@ -267,30 +267,31 @@
org.jahia.engines.EngineToolBox.send.label
= Envoyer
org.jahia.engines.EngineToolBox.windowTitle.label
= testTest
org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label
= Supprimer le fichier
-org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label
= Supprimer le repertoire
+org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label
= Supprimer le répertoire
org.jahia.engines.filemanager.Filemanager_Engine.fileList.label
= Liste des fichiers
org.jahia.engines.filemanager.Filemanager_Engine.fileLocation.label
= Emplacement du fichier
org.jahia.engines.filemanager.Filemanager_Engine.filemanagerError.label
= Gestionnaire de fichiers - Erreur
org.jahia.engines.filemanager.Filemanager_Engine.fileName.label
= Nom du fichier
-org.jahia.engines.filemanager.Filemanager_Engine.dirName.label
= Nom du repertoire
+org.jahia.engines.filemanager.Filemanager_Engine.dirName.label
= Nom du répertoire
org.jahia.engines.filemanager.Filemanager_Engine.newName.label
= Nouveau nom
org.jahia.engines.filemanager.Filemanager_Engine.isPublic.label
= Est public
org.jahia.engines.filemanager.Filemanager_Engine.uploadFile.label
= Envoyer un fichier
org.jahia.engines.filemanager.Filemanager_Engine.uploadNewFile.label
= Envoyer un nouveau fichier
-org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label
= Un fichier avec ce nom existe deja !
-org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label
= Ecraser
+org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label
= Un fichier avec ce nom existe
déjà !
+org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label
= Écraser
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 repertoire
+org.jahia.engines.filemanager.Filemanager_Engine.createDir.label
= Creer un nouveau répertoire
org.jahia.engines.filemanager.Filemanager_Engine.renameFile.label
= Renommer
-org.jahia.engines.filemanager.Filemanager_Engine.moveFile.label
= Deplacer
+org.jahia.engines.filemanager.Filemanager_Engine.moveFile.label
= Déplacer
org.jahia.engines.filemanager.Filemanager_Engine.copyFile.label
= Copier
-org.jahia.engines.filemanager.Filemanager_Engine.editFile.label
= Editer les proprietes
-org.jahia.engines.filemanager.Filemanager_Engine.selectFile.label
= Selectionner
-org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label
= Selectionner le repertoire cible
-org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label
= Previsualiser
+org.jahia.engines.filemanager.Filemanager_Engine.editFile.label
= Éditer les propriétés
+org.jahia.engines.filemanager.Filemanager_Engine.selectFile.label
= Sélectionner
+org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label
= Sélectionner le répertoire
cible
+org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label
= Prévisualiser
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label
= Permissions du fichier
-org.jahia.engines.filemanager.Filemanager_Engine.confirm.label
= Etes vous sur de vouloir effacer ce fichier ?
+org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label
= Permissions du répertoire
+org.jahia.engines.filemanager.Filemanager_Engine.confirm.label
= Êtes vous sur de vouloir effacer ce
fichier ?
org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label
= Ce fichier est utilisé dans du
contenu publié ou en attente de publication, il ne peut pas être
supprimé.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label
= Voir utilisation
org.jahia.engines.filemanager.Filemanager_Engine.usage.label
= Ce fichier est utilisé dans les pages
suivantes :
Index: JahiaEnginesResources_it.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_it.properties,v
retrieving revision 1.1.2.2.2.1
retrieving revision 1.1.2.2.2.2
diff -u -r1.1.2.2.2.1 -r1.1.2.2.2.2
--- JahiaEnginesResources_it.properties 3 Mar 2005 14:11:09 -0000
1.1.2.2.2.1
+++ JahiaEnginesResources_it.properties 17 Mar 2005 16:26:07 -0000
1.1.2.2.2.2
@@ -357,6 +357,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.openIEfolder.label=Apri la
cartella in Internet Explorer
org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label=Sovrascrivere
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label=Protezione
File
+org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label=Protezione
gruppi
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label=Preview
org.jahia.engines.filemanager.Filemanager_Engine.renameFile.label=Rinominare
org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label=Selezionare
la cartella di destinazione
Index: JahiaEnginesResources_nl.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_nl.properties,v
retrieving revision 1.1.2.2.2.1
retrieving revision 1.1.2.2.2.2
diff -u -r1.1.2.2.2.1 -r1.1.2.2.2.2
--- JahiaEnginesResources_nl.properties 3 Mar 2005 14:11:09 -0000
1.1.2.2.2.1
+++ JahiaEnginesResources_nl.properties 17 Mar 2005 16:26:07 -0000
1.1.2.2.2.2
@@ -626,6 +626,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label
= Selecteer de uitgekozen map
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label
= Voorbeeld
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label
= Bestandspermissies
+org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label
= Mapspermissies
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label
= Weet u zeker dat u dit bestand wilt
verwijderen?
org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label
= Dit bestand is in gebruik en kan daardoor
niet verwijderd worden.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label
= Bekijk bestanden gebruik
Index: embedded_flat_filemanager.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/shared/Attic/embedded_flat_filemanager.jsp,v
retrieving revision 1.16.2.3.2.2
retrieving revision 1.16.2.3.2.3
diff -u -r1.16.2.3.2.2 -r1.16.2.3.2.3
--- embedded_flat_filemanager.jsp 3 Mar 2005 14:11:09 -0000
1.16.2.3.2.2
+++ embedded_flat_filemanager.jsp 17 Mar 2005 16:26:08 -0000
1.16.2.3.2.3
@@ -721,18 +721,18 @@
if (tableEntry.isCanAdmin()) {
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','rightsMgmt')"
-><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.permissions.label"/></a><%
+><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label"/></a><%
}
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','view&act=copy')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.copyFile.label"/></a><%
- if (tableEntry.isCanWriteParent()) {
+ if (tableEntry.isCanWriteParent() && tableEntry.isCanWrite()) {
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','view&act=move')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.moveFile.label"/></a><%
}
- if (tableEntry.isCanWriteParent()) { %><a class="menuItem"
+ if (tableEntry.isCanWriteParent() && tableEntry.isCanWrite()) { %><a
class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','fileRename')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.renameFile.label"/></a><%
}
@@ -870,18 +870,18 @@
if (tableEntry.isCanAdmin()) {
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','rightsMgmt')"
-><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.permissions.label"/></a><%
+><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label"/></a><%
}
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','view&act=copy')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.copyFile.label"/></a><%
- if (tableEntry.isCanWriteParent()) {
+ if (tableEntry.isCanWriteParent() &&
tableEntry.isCanWrite()) {
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','view&act=move')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.moveFile.label"/></a><%
}
- if (tableEntry.isCanWriteParent()) {
+ if (tableEntry.isCanWriteParent() &&
tableEntry.isCanWrite()) {
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','fileRename')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.renameFile.label"/></a><%
@@ -946,12 +946,12 @@
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','view&act=copy')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.copyFile.label"/></a><%
- if (tableEntry.isCanWriteParent()) {
+ if (tableEntry.isCanWriteParent() &&
tableEntry.isCanWrite()) {
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','view&act=move')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.moveFile.label"/></a><%
}
- if (tableEntry.isCanWriteParent()) {
+ if (tableEntry.isCanWriteParent() &&
tableEntry.isCanWrite()) {
%><a class="menuItem"
href="javascript:openManager('<%= tableEntry.getEncodedName()
%>','fileRename')"
><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.renameFile.label"/></a><%
