Merge branch 'staging' into newCk
This commit is contained in:
yflory
@@ -117,7 +117,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
|
||||
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -10,7 +10,19 @@ CKEDITOR.editorConfig = function( config ) {
|
||||
// document itself and causes problems when it's sent across the wire and reflected back
|
||||
config.removePlugins= 'resize';
|
||||
config.extraPlugins= 'autolink,colorbutton,colordialog,font,indentblock,justify';
|
||||
config.toolbarGroups= [{"name":"clipboard","groups":["clipboard","undo"]},{"name":"editing","groups":["find","selection"]},{"name":"links"},{"name":"insert"},{"name":"forms"},{"name":"tools"},{"name":"document","groups":["mode","document","doctools"]},{"name":"others"},{"name":"basicstyles","groups":["basicstyles","cleanup"]},{"name":"paragraph","groups":["list","indent","blocks","align","bidi"]},{"name":"styles"},{"name":"colors"}];
|
||||
config.toolbarGroups= [
|
||||
// {"name":"clipboard","groups":["clipboard","undo"]},
|
||||
//{"name":"editing","groups":["find","selection"]},
|
||||
{"name":"links"},
|
||||
{"name":"insert"},
|
||||
{"name":"forms"},
|
||||
{"name":"tools"},
|
||||
{"name":"document","groups":["mode","document","doctools"]},
|
||||
{"name":"others"},
|
||||
{"name":"basicstyles","groups":["basicstyles","cleanup"]},
|
||||
{"name":"paragraph","groups":["list","indent","blocks","align","bidi"]},
|
||||
{"name":"styles"},
|
||||
{"name":"colors"}];
|
||||
|
||||
config.font_defaultLabel = 'Arial';
|
||||
config.fontSize_defaultLabel = '16';
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
|
||||
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
|
||||
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -1164,6 +1164,57 @@ html.cp,
|
||||
.limit-container .upgrade {
|
||||
margin-left: 10px;
|
||||
}
|
||||
/* Upload status table */
|
||||
#uploadStatusContainer {
|
||||
position: absolute;
|
||||
left: 10vw;
|
||||
right: 10vw;
|
||||
bottom: 100px;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
color: white;
|
||||
opacity: 0.7;
|
||||
font-family: Ubuntu,Georgia,Cambria,serif;
|
||||
box-sizing: border-box;
|
||||
z-index: 10;
|
||||
display: none;
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus {
|
||||
width: 80vw;
|
||||
border: 1px solid black;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus tr:nth-child(1) {
|
||||
background-color: #888;
|
||||
border: 1px solid #999;
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus tr:nth-child(1) td {
|
||||
text-align: center;
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus td {
|
||||
border-left: 1px solid #BBB;
|
||||
border-right: 1px solid #BBB;
|
||||
padding: 0 10px;
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus .upProgress {
|
||||
width: 200px;
|
||||
position: relative;
|
||||
text-align: center;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus .progressContainer {
|
||||
position: absolute;
|
||||
width: 0px;
|
||||
left: 5px;
|
||||
top: 1px;
|
||||
bottom: 1px;
|
||||
background-color: rgba(0, 0, 255, 0.3);
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus .upCancel {
|
||||
text-align: center;
|
||||
}
|
||||
#uploadStatusContainer #uploadStatus .fa.cancel {
|
||||
color: #ff0073;
|
||||
}
|
||||
#cors-store {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
|
||||
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -39,5 +39,5 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
|
||||
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
|
||||
</footer>
|
||||
|
||||
@@ -600,6 +600,52 @@ noscript {
|
||||
}
|
||||
}
|
||||
|
||||
/* Upload status table */
|
||||
#uploadStatusContainer {
|
||||
position: absolute;
|
||||
left: 10vw; right: 10vw;
|
||||
bottom: 100px;
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
color: white;
|
||||
opacity: 0.7;
|
||||
font-family: Ubuntu,Georgia,Cambria,serif;
|
||||
box-sizing: border-box;
|
||||
z-index:10;
|
||||
display: none;
|
||||
#uploadStatus {
|
||||
width: 80vw;
|
||||
border: 1px solid black;
|
||||
border-collapse: collapse;
|
||||
tr:nth-child(1) {
|
||||
background-color: #888;
|
||||
border: 1px solid #999;
|
||||
td { text-align: center; }
|
||||
}
|
||||
td {
|
||||
border-left: 1px solid #BBB;
|
||||
border-right: 1px solid #BBB;
|
||||
padding: 0 10px;
|
||||
}
|
||||
.upProgress {
|
||||
width: 200px;
|
||||
position: relative;
|
||||
text-align: center;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.progressContainer {
|
||||
position: absolute;
|
||||
width: 0px;
|
||||
left: 5px;
|
||||
top: 1px; bottom: 1px;
|
||||
background-color: rgba(0,0,255,0.3);
|
||||
}
|
||||
.upCancel { text-align: center; }
|
||||
.fa.cancel {
|
||||
color: rgb(255, 0, 115);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// hack for our cross-origin iframe
|
||||
#cors-store {
|
||||
display: none;
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
|
||||
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
|
||||
</footer>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -235,7 +235,7 @@ define(function () {
|
||||
out.login_invalPass = "Contraseña requirida";
|
||||
out.login_unhandledError = "Un error inesperado se produjo :(";
|
||||
out.register_importRecent = "Importar historial (recomendado)";
|
||||
out.register_acceptTerms = "Accepto los <a href='/terms.html'>términos de servicio</a>";
|
||||
out.register_acceptTerms = "Accepto los <a href='/terms.html' tabindex='-1'>términos de servicio</a>";
|
||||
out.register_passwordsDontMatch = "Las contraseñas no corresponden";
|
||||
out.register_mustAcceptTerms = "Tienes que acceptar los términos de servicio";
|
||||
out.register_mustRememberPass = "No podemos reiniciar tu contraseña si la olvidas. ¡Es muy importante que la recuerdes! Marca la casilla para confirmarlo.";
|
||||
@@ -351,6 +351,7 @@ define(function () {
|
||||
out.tips.title = "Puedes cambiar el título de tus pads en la parte superior de la pantalla.";
|
||||
out.tips.store = "Cada vez que visitas un pad con una sesión iniciada se guardará a tu CryptDrive.";
|
||||
out.tips.marker = "Puedes resaltar texto en un pad utilizando el \"marcador\" en el menú de estílo.";
|
||||
out.tips.driveUpload = "Usuarios registrados pueden subir archivos cifrados arrastrandolos hacia CryptDrive.";
|
||||
|
||||
out.feedback_about = "Si estas leyendo esto, quizas estés curioso de saber porqué CryptPad solicita esta página cuando haces algunas acciones";
|
||||
out.feedback_privacy = "Nos importa tu privacidad, y al mismo tiempo queremos que CryptPad sea muy fácil de usar. Utilizamos esta página para conocer las funcionalidades que importan a nuestros usuarios, pidiendolo con un parametro que nos dice que accion fue realizada.";
|
||||
@@ -452,6 +453,9 @@ define(function () {
|
||||
out.poll_locked = "Cerrado";
|
||||
out.poll_unlocked = "Abierto";
|
||||
|
||||
out.poll_show_help_button = "Mostrar ayuda";
|
||||
out.poll_hide_help_button = "Esconder ayuda";
|
||||
|
||||
// 1.8.0 - Idopogo
|
||||
|
||||
out.common_connectionLost = "<b>Connexión perdida</b><br>El documento está ahora en modo solo lectura hasta que la conexión vuelva.";
|
||||
@@ -467,5 +471,19 @@ define(function () {
|
||||
out.login_notRegistered = "¿No estás registrado?";
|
||||
out.upload_mustLogin = "Tienes que estar conectado para subir archivos";
|
||||
|
||||
out.uploadButton = "Subir";
|
||||
out.uploadButtonTitle = "Subir un archivo a la carpeta";
|
||||
out.filePickerButton = "Incrustar un archivo";
|
||||
out.filePicker_close = "Cerrar";
|
||||
out.filePicker_description = "Elige un archivo de tu CryptDrive para incrustarlo o sube uno nuevo";
|
||||
out.filePicker_filter = "Filtrar por nombre";
|
||||
out.or = "o";
|
||||
out.languageButton = "Lenguaje";
|
||||
out.languageButtonTitle = "Elige el lenguaje para resaltado de sintaxis";
|
||||
out.themeButton = "Tema";
|
||||
out.themeButtonTitle = "Selecciona el tema de color para los editores de código y presentación";
|
||||
out.canvas_opacityLabel = "Opacidad: {0}";
|
||||
out.canvas_widthLabel = "Talla: {0}";
|
||||
|
||||
return out;
|
||||
});
|
||||
|
||||
@@ -108,6 +108,8 @@ define(function () {
|
||||
|
||||
out.newButton = 'Nouveau';
|
||||
out.newButtonTitle = 'Créer un nouveau pad';
|
||||
out.uploadButton = 'Upload';
|
||||
out.uploadButtonTitle = 'Uploader un nouveau fichier dans le dossier actuel';
|
||||
|
||||
out.saveTemplateButton = "Sauver en tant que modèle";
|
||||
out.saveTemplatePrompt = "Choisir un titre pour ce modèle";
|
||||
@@ -131,6 +133,12 @@ define(function () {
|
||||
out.printCSS = "Personnaliser l'apparence (CSS):";
|
||||
out.printTransition = "Activer les animations de transition";
|
||||
|
||||
out.filePickerButton = "Intégrer un fichier";
|
||||
out.filePicker_close = "Fermer";
|
||||
out.filePicker_description = "Choisissez un fichier de votre CryptDrive pour l'intégrer ou uploadez-en un nouveau";
|
||||
out.filePicker_filter = "Filtrez les fichiers par leur nom";
|
||||
out.or = 'ou';
|
||||
|
||||
out.slideOptionsTitle = "Personnaliser la présentation";
|
||||
out.slideOptionsButton = "Enregistrer (Entrée)";
|
||||
|
||||
@@ -211,6 +219,9 @@ define(function () {
|
||||
out.poll_locked = "Verrouillé";
|
||||
out.poll_unlocked = "Déverrouillé";
|
||||
|
||||
out.poll_show_help_button = "Afficher l'aide";
|
||||
out.poll_hide_help_button = "Cacher l'aide";
|
||||
|
||||
// Canvas
|
||||
out.canvas_clear = "Nettoyer";
|
||||
out.canvas_delete = "Supprimer la sélection";
|
||||
@@ -218,6 +229,8 @@ define(function () {
|
||||
out.canvas_enable = "Activer le dessin";
|
||||
out.canvas_width = "Épaisseur";
|
||||
out.canvas_opacity = "Opacité";
|
||||
out.canvas_opacityLabel = "opacité: {0}";
|
||||
out.canvas_widthLabel = "taille: {0}";
|
||||
|
||||
// File manager
|
||||
|
||||
@@ -322,7 +335,7 @@ define(function () {
|
||||
out.login_notRegistered = 'Pas encore inscrit ?';
|
||||
|
||||
out.register_importRecent = "Importer l'historique (Recommendé)";
|
||||
out.register_acceptTerms = "J'accepte <a href='/terms.html'>les conditions d'utilisation</a>";
|
||||
out.register_acceptTerms = "J'accepte <a href='/terms.html' tabindex='-1'>les conditions d'utilisation</a>";
|
||||
out.register_passwordsDontMatch = "Les mots de passe doivent être identiques!";
|
||||
out.register_mustAcceptTerms = "Vous devez accepter les conditions d'utilisation.";
|
||||
out.register_mustRememberPass = "Nous ne pouvons pas réinitialiser votre mot de passe si vous l'oubliez. C'est important que vous vous en souveniez! Veuillez cocher la case pour confirmer.";
|
||||
@@ -545,6 +558,7 @@ define(function () {
|
||||
out.tips.title = "Vous pouvez changer le titre de votre pad en cliquant au centre en haut de la page.";
|
||||
out.tips.store = "Dés que vous ouvrez un nouveau pad, il est automatiquement stocké dans votre CryptDrive si vous êtes connectés.";
|
||||
out.tips.marker = "Vous pouvez surligner du texte dans un pad en utilisant l'option \"marker\" dans le menu déroulant des styles.";
|
||||
out.tips.driveUpload = "Les utilisateurs enregistrés peuvent importer des fichiers en les faisant glisser et en les déposant dans leur CryptDrive.";
|
||||
|
||||
out.feedback_about = "Si vous lisez ceci, vous vous demandez probablement pourquoi CryptPad envoie des requêtes vers des pages web quand vous realisez certaines actions.";
|
||||
out.feedback_privacy = "Nous prenons au sérieux le respect de votre vie privée, et en même temps nous souhaitons rendre CryptPad très simple à utiliser. Nous utilisons cette page pour comprendre quelles fonctionnalités dans l'interface comptent le plus pour les utilisateurs, en l'appelant avec un paramètre spécifiant quelle action a été réalisée.";
|
||||
|
||||
@@ -110,6 +110,8 @@ define(function () {
|
||||
|
||||
out.newButton = 'New';
|
||||
out.newButtonTitle = 'Create a new pad';
|
||||
out.uploadButton = 'Upload';
|
||||
out.uploadButtonTitle = 'Upload a new file to the current folder';
|
||||
|
||||
out.saveTemplateButton = "Save as template";
|
||||
out.saveTemplatePrompt = "Choose a title for the template";
|
||||
@@ -133,6 +135,12 @@ define(function () {
|
||||
out.printCSS = "Custom style rules (CSS):";
|
||||
out.printTransition = "Enable transition animations";
|
||||
|
||||
out.filePickerButton = "Embed a file";
|
||||
out.filePicker_close = "Close";
|
||||
out.filePicker_description = "Choose a file from your CryptDrive to embed it or upload a new one";
|
||||
out.filePicker_filter = "Filter files by name";
|
||||
out.or = 'or';
|
||||
|
||||
out.slideOptionsTitle = "Customize your slides";
|
||||
out.slideOptionsButton = "Save (enter)";
|
||||
|
||||
@@ -213,6 +221,9 @@ define(function () {
|
||||
out.poll_locked = "Locked";
|
||||
out.poll_unlocked = "Unlocked";
|
||||
|
||||
out.poll_show_help_button = "Show help";
|
||||
out.poll_hide_help_button = "Hide help";
|
||||
|
||||
// Canvas
|
||||
out.canvas_clear = "Clear";
|
||||
out.canvas_delete = "Delete selection";
|
||||
@@ -220,6 +231,9 @@ define(function () {
|
||||
out.canvas_enable = "Enable draw";
|
||||
out.canvas_width = "Width";
|
||||
out.canvas_opacity = "Opacity";
|
||||
out.canvas_opacityLabel = "opacity: {0}";
|
||||
out.canvas_widthLabel = "Width: {0}";
|
||||
|
||||
|
||||
// File manager
|
||||
|
||||
@@ -324,7 +338,7 @@ define(function () {
|
||||
out.login_notRegistered = 'Not registered?';
|
||||
|
||||
out.register_importRecent = "Import pad history (Recommended)";
|
||||
out.register_acceptTerms = "I accept <a href='/terms.html'>the terms of service</a>";
|
||||
out.register_acceptTerms = "I accept <a href='/terms.html' tabindex='-1'>the terms of service</a>";
|
||||
out.register_passwordsDontMatch = "Passwords do not match!";
|
||||
out.register_mustAcceptTerms = "You must accept the terms of service.";
|
||||
out.register_mustRememberPass = "We cannot reset your password if you forget it. It's very important that you remember it! Please check the checkbox to confirm.";
|
||||
@@ -556,6 +570,7 @@ define(function () {
|
||||
out.tips.title = "You can set the title of your pad by clicking the top center.";
|
||||
out.tips.store = "Every time you visit a pad, if you're logged in it will be saved to your CryptDrive.";
|
||||
out.tips.marker = "You can highlight text in a pad using the \"marker\" item in the styles dropdown menu.";
|
||||
out.tips.driveUpload = "Registered users can upload encrypted files by dragging and dropping them into their CryptDrive.";
|
||||
|
||||
out.feedback_about = "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions";
|
||||
out.feedback_privacy = "We care about your privacy, and at the same time we want CryptPad to be very easy to use. We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.";
|
||||
|
||||
Reference in New Issue
Block a user