Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars Translate the backup URL button alert
This commit is contained in:
@@ -155,11 +155,11 @@ define([
|
||||
exp.proxy = rt.proxy;
|
||||
rt.proxy.on('create', function (info) {
|
||||
exp.info = info;
|
||||
var realtime = info.realtime;
|
||||
if (!Cryptpad.getUserHash()) {
|
||||
localStorage.FS_hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
|
||||
}
|
||||
}).on('ready', function () {
|
||||
if (ready) { return; }
|
||||
if (!rt.proxy[Cryptpad.storageKey] || !Cryptpad.isArray(rt.proxy[Cryptpad.storageKey])) {
|
||||
var oldStore = Cryptpad.getStore(true);
|
||||
oldStore.get(Cryptpad.storageKey, function (err, s) {
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
|
||||
font: normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
|
||||
color: #000;
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
z-index: 9001;
|
||||
|
||||
@@ -38,11 +37,9 @@
|
||||
|
||||
.cryptpad-lag {
|
||||
box-sizing: content-box;
|
||||
vertical-align: top;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
display: inline-block;
|
||||
margin: 2px 0px;
|
||||
padding: 5px;
|
||||
div {
|
||||
margin: auto;
|
||||
@@ -62,7 +59,7 @@
|
||||
height: 26px;
|
||||
padding-right: 5px;
|
||||
padding-left: 5px;
|
||||
margin: 2px;
|
||||
margin: 3px 2px;
|
||||
}
|
||||
|
||||
button {
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
user-select: none;
|
||||
font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
|
||||
color: #000;
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
z-index: 9001;
|
||||
}
|
||||
@@ -40,11 +39,9 @@
|
||||
}
|
||||
.cryptpad-toolbar .cryptpad-lag {
|
||||
box-sizing: content-box;
|
||||
vertical-align: top;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
display: inline-block;
|
||||
margin: 2px 0px;
|
||||
padding: 5px;
|
||||
}
|
||||
.cryptpad-toolbar .cryptpad-lag div {
|
||||
@@ -65,7 +62,7 @@
|
||||
height: 26px;
|
||||
padding-right: 5px;
|
||||
padding-left: 5px;
|
||||
margin: 2px;
|
||||
margin: 3px 2px;
|
||||
}
|
||||
.cryptpad-toolbar button {
|
||||
background-color: inherit;
|
||||
|
||||
@@ -174,8 +174,9 @@ define(function () {
|
||||
out.fm_trashName = "Corbeille";
|
||||
out.fm_unsortedName = "Fichiers non triés";
|
||||
out.fm_filesDataName = "Tous les fichiers";
|
||||
out.fm_newButton = "Nouveau";
|
||||
out.fm_newFolder = "Nouveau dossier";
|
||||
out.fm_newFolderButton = "NOUVEAU DOSSIER";
|
||||
out.fm_folder = "Dossier";
|
||||
out.fm_folderName = "Nom du dossier";
|
||||
out.fm_numberOfFolders = "# de dossiers";
|
||||
out.fm_numberOfFiles = "# de fichiers";
|
||||
@@ -199,7 +200,12 @@ define(function () {
|
||||
out.fm_info_unsorted = 'Contient tous les documents que vous avez ouvert et qui ne sont pas triés dans "Documents" ou déplacés vers la "Corbeille".'; // "My Documents" should match with the "out.fm_rootName" key, and "Trash" with "out.fm_trashName"
|
||||
out.fm_info_trash = 'Les fichiers supprimés dans la corbeille sont également enlevés de "Tous les fichiers" et il est impossible de les récupérer depuis l\'explorateur de fichiers.'; // Same here for "All files" and "out.fm_filesDataName"
|
||||
out.fm_info_allFiles = 'Contient tous les fichiers de "Documents", "Fichiers non triés" et "Corbeille". Vous ne pouvez pas supprimer ou déplacer des fichiers d\'ici.'; // Same here
|
||||
// File - Context menu
|
||||
out.fm_alert_backupUrl = "URL de secours pour ce contenu.<br>" +
|
||||
"Il est <strong>fortement recommandé</strong> de garder cette URL pour vous-même.<br>" +
|
||||
"Elle vous servira en cas de perte des données de votre navigateur afin de retrouver vos fichiers.<br>" +
|
||||
"Quiconque se trouve en possession de celle-ci peut modifier ou supprimer tous les fichiers de ce gestionnaire.<br>" +
|
||||
'<input type="text" id="fm_backupUrl" value="{0}"/>';
|
||||
// File - Context menu
|
||||
out.fc_newfolder = "Nouveau dossier";
|
||||
out.fc_rename = "Renommer";
|
||||
out.fc_open = "Ouvrir";
|
||||
|
||||
@@ -176,8 +176,9 @@ define(function () {
|
||||
out.fm_unsortedName = "Unsorted files";
|
||||
out.fm_filesDataName = "All files";
|
||||
out.fm_templateName = "Templates";
|
||||
out.fm_newButton = "New";
|
||||
out.fm_newFolder = "New folder";
|
||||
out.fm_newFolderButton = "NEW FOLDER";
|
||||
out.fm_folder = "Folder";
|
||||
out.fm_folderName = "Folder name";
|
||||
out.fm_numberOfFolders = "# of folders";
|
||||
out.fm_numberOfFiles = "# of files";
|
||||
@@ -201,6 +202,11 @@ define(function () {
|
||||
out.fm_info_unsorted = 'Contains all the files you\'ve visited that are not yet sorted in "Documents" or moved to the "Trash".'; // "My Documents" should match with the "out.fm_rootName" key, and "Trash" with "out.fm_trashName"
|
||||
out.fm_info_trash = 'Files deleted from the trash are also removed from "All files" and it is impossible to recover them from the file manager.'; // Same here for "All files" and "out.fm_filesDataName"
|
||||
out.fm_info_allFiles = 'Contains all the files from "Documents", "Unsorted" and "Trash". You can\'t move or remove files from here.'; // Same here
|
||||
out.fm_alert_backupUrl = "Backup URL for this drive.<br>" +
|
||||
"It is <strong>highly recommended</strong> that you keep ip for yourself only.<br>" +
|
||||
"You can use it to retrieve all your files in case your browser memory got erased.<br>" +
|
||||
"Anybody with that URL can edit or remove all the files in your file manager.<br>" +
|
||||
'<input type="text" id="fm_backupUrl" value="{0}"/>';
|
||||
// File - Context menu
|
||||
out.fc_newfolder = "New folder";
|
||||
out.fc_rename = "Rename";
|
||||
|
||||
Reference in New Issue
Block a user