web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix UI issues with rename and delete actions

Browse Source
This commit is contained in:
yflory
2016-12-12 12:03:54 +01:00
parent 319ce5d8c8
commit fdb5c2ddb5
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.fr.js
View File

@@ -182,7 +182,7 @@ define(function () {
out.fm_originalPath = "Chemin d'origine"; out.fm_originalPath = "Chemin d'origine";
out.fm_emptyTrashDialog = "Êtes-vous sûr de vouloir vider la corbeille ?"; out.fm_emptyTrashDialog = "Êtes-vous sûr de vouloir vider la corbeille ?";
out.fm_removeSeveralPermanentlyDialog = "Êtes-vous sûr de vouloir supprimer ces {0} éléments de manière permanente ?"; out.fm_removeSeveralPermanentlyDialog = "Êtes-vous sûr de vouloir supprimer ces {0} éléments de manière permanente ?";
out.fm_removePermanentlyDialog = "Êtes-vous sûr de vouloir supprimer {0} de la corbeille de manière permanente ?"; out.fm_removePermanentlyDialog = "Êtes-vous sûr de vouloir supprimer {0} de manière permanente ?";
out.fm_restoreDialog = "Êtes-vous sûr de vouloir restaurer {0} à son emplacement précédent ?"; out.fm_restoreDialog = "Êtes-vous sûr de vouloir restaurer {0} à son emplacement précédent ?";
out.fm_removeSeveralDialog = "Êtes-vous sûr de vouloir déplacer ces {0} éléments vers la corbeille ?"; out.fm_removeSeveralDialog = "Êtes-vous sûr de vouloir déplacer ces {0} éléments vers la corbeille ?";
out.fm_removeDialog = "Êtes-vous sûr de vouloir déplacer {0} vers la corbeille ?"; out.fm_removeDialog = "Êtes-vous sûr de vouloir déplacer {0} vers la corbeille ?";

2
customize.dist/translations/messages.js
View File

@@ -185,7 +185,7 @@ define(function () {
out.fm_originalPath = "Original path"; out.fm_originalPath = "Original path";
out.fm_emptyTrashDialog = "Are you sure you want to empty the trash?"; out.fm_emptyTrashDialog = "Are you sure you want to empty the trash?";
out.fm_removeSeveralPermanentlyDialog = "Are you sure you want to remove these {0} elements from the trash permanently?"; out.fm_removeSeveralPermanentlyDialog = "Are you sure you want to remove these {0} elements from the trash permanently?";
out.fm_removePermanentlyDialog = "Are you sure you want to remove {0} from the trash permanently?"; out.fm_removePermanentlyDialog = "Are you sure you want to remove {0} permanently?";
out.fm_removeSeveralDialog = "Are you sure you want to move these {0} elements to the trash?"; out.fm_removeSeveralDialog = "Are you sure you want to move these {0} elements to the trash?";
out.fm_removeDialog = "Are you sure you want to move {0} to the trash?"; out.fm_removeDialog = "Are you sure you want to move {0} to the trash?";
out.fm_restoreDialog = "Are you sure you want to restore {0} to its previous location?"; out.fm_restoreDialog = "Are you sure you want to restore {0} to its previous location?";

4
www/file/file.css
View File

@@ -214,6 +214,10 @@ li {
vertical-align: top; vertical-align: top;
} }
#content .grid li .name {
width: 100%;
}
#content .grid li input { #content .grid li input {
width: 100%; width: 100%;
} }

6
www/file/main.js
View File

@@ -254,7 +254,8 @@ define([
removeInput(); removeInput();
} }
}); });
$element.parent().append($input); //$element.parent().append($input);
$element.after($input);
$input.focus(); $input.focus();
$input.select(); $input.select();
// We don't want to open the file/folder when clicking on the input // We don't want to open the file/folder when clicking on the input
@@ -1304,7 +1305,8 @@ define([
var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [paths.length]); var msg = Messages._getKey("fm_removeSeveralPermanentlyDialog", [paths.length]);
if (paths.length === 1) { if (paths.length === 1) {
var path = paths[0]; var path = paths[0];
var name = filesOp.isInTrashRoot(path) ? path[1] : path[path.length - 1]; var element = filesOp.findElement(files, path);
var name = filesOp.isInTrashRoot(path) ? path[1] : (filesOp.isPathInUnsorted(path) ? filesOp.getTitle(element) : path[path.length - 1]);
msg = Messages._getKey("fm_removePermanentlyDialog", [name]); msg = Messages._getKey("fm_removePermanentlyDialog", [name]);
} }
Cryptpad.confirm(msg, function(res) { Cryptpad.confirm(msg, function(res) {