From bf8c9a2c4be480de4dafa8b68573a781ffee0cac Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Tue, 20 Sep 2016 11:35:57 +0200 Subject: [PATCH] Add a button to get the read only URL --- customize.dist/translations/messages.fr.js | 16 ++++++++----- customize.dist/translations/messages.js | 17 ++++++++------ www/code/main.js | 27 ++++++++++++++++++++-- www/pad/main.js | 26 +++++++++++++++++++-- 4 files changed, 69 insertions(+), 17 deletions(-) diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 813620dfb..9fd72124a 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -3,6 +3,11 @@ define(function () { out.main_title = "Cryptpad: Editeur collaboratif en temps réel, zero knowledge"; + out.type = {}; + out.type.pad = 'Pad'; + out.type.code = 'Code'; + out.type.poll = 'Sondage'; + out.type.slide = 'Présentation'; out.errorBox_errorType_disconnected = 'Connexion perdue'; out.errorBox_errorExplanation_disconnected = [ @@ -60,6 +65,11 @@ define(function () { out.commitButton = 'VALIDER'; + out.linksButton = 'LIENS'; + out.linksButtonTitle = 'Obtenir les liens disponibles pour accéder à ce document'; + out.readonlyUrl = 'Lien de lecture seule'; + out.editUrl = "Lien d'édition"; + out.disconnectAlert = 'Perte de la connexion au réseau !'; out.tryIt = 'Essayez-le !'; @@ -71,12 +81,6 @@ define(function () { out.loginText = '

Votre nom d\'utilisateur et votre mot de passe sont utilisés pour générer une clé unique qui reste inconnue de notre serveur.

\n' + '

Faites attention de ne pas oublier vos identifiants puisqu\'ils seront impossible à récupérer.

'; - out.type = {}; - out.type.pad = 'Pad'; - out.type.code = 'Code'; - out.type.poll = 'Sondage'; - out.type.slide = 'Présentation'; - out.forget = "Oublier"; // Polls diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index e4dec777e..eda389589 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -3,6 +3,11 @@ define(function () { out.main_title = "Cryptpad: Zero Knowledge, Collaborative Real Time Editing"; + out.type = {}; + out.type.pad = 'Pad'; + out.type.code = 'Code'; + out.type.poll = 'Poll'; + out.type.slide = 'Presentation'; out.errorBox_errorType_disconnected = 'Connection Lost'; out.errorBox_errorExplanation_disconnected = [ @@ -59,6 +64,11 @@ define(function () { out.presentSuccess = 'Hit ESC to exit presentation mode'; out.commitButton = 'COMMIT'; + + out.linksButton = 'LINKS'; + out.linksButtonTitle = 'Get the available links for this document'; + out.readonlyUrl = 'Read only URL'; + out.editUrl = 'Edit URL'; out.disconnectAlert = 'Network connection lost!'; @@ -71,13 +81,6 @@ define(function () { out.loginText = '

Your username and password are used to generate a unique key which is never known by our server.

\n' + '

Be careful not to forget your credentials, as they are impossible to recover

'; - // TODO : move at the beginning - out.type = {}; - out.type.pad = 'Pad'; - out.type.code = 'Code'; - out.type.poll = 'Poll'; - out.type.slide = 'Presentation'; - out.forget = "Forget"; // Polls diff --git a/www/code/main.js b/www/code/main.js index db84ec3ec..491de8e43 100644 --- a/www/code/main.js +++ b/www/code/main.js @@ -286,6 +286,13 @@ define([ var $rightside = $bar.find('.' + Toolbar.constants.rightside); + var editHash; + var viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys); + + if (!readOnly) { + editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys); + } + /* add an export button */ var $export = $('