Merge branch 'newhash' into newhashNoConflict

customize.dist/main.js

@@ -106,9 +106,17 @@ define([
                 });
             });
 
+            var readOnly = false;
+            if (pad.href.indexOf('#') !== -1) {
+                var modeArray = pad.href.split('#')[1].split('/');
+                if (modeArray.length >= 3 && modeArray[2] === 'view') {
+                    readOnly =  true;
+                }
+            }
+            var readOnlyText = readOnly ? '(' + Messages.readonly + ') ' : '';
             $row
                 .append($('<td>').text(name))
-                .append($('<td>').append($('<a>', {
+                .append($('<td>').append(readOnlyText).append($('<a>', {
                     href: pad.href,
                     title: pad.title,
                 }).text(shortTitle)))
@@ -134,6 +142,9 @@ define([
 
             if (hasRecent) {
                 $('table').attr('style', '');
+                // Race condition here, this is triggered before the localization in HTML
+                // so we have to remove the data-localization attr
+                $tryit.removeAttr('data-localization');
                 $tryit.text(Messages.recentPads);
             }
         });

customize.dist/toolbar.css

@@ -83,3 +83,8 @@
 .cryptpad-spinner {
   float: left;
 }
+.cryptpad-readonly {
+  margin-right: 20px;
+  font-weight: bold;
+  text-transform: uppercase;
+}

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 = [
@@ -20,6 +25,12 @@ define(function () {
     out.synchronizing = 'Synchronisation';
     out.reconnecting = 'Reconnexion...';
     out.lag = 'Latence';
+    out.readonly = 'Lecture seule';
+    out.nobodyIsEditing = "Personne n'édite le document";
+    out.onePersonIsEditing = 'Une personne édite le document';
+    out.peopleAreEditing = '{0} personnes éditent le document';
+    out.oneViewer = '1 lecteur';
+    out.viewers = '{0} lecteurs';
 
     out.importButton = 'IMPORTER';
     out.importButtonTitle = 'Importer un document depuis un fichier local';
@@ -54,6 +65,10 @@ define(function () {
 
     out.commitButton = 'VALIDER';
 
+    out.getViewButton = 'LECTURE SEULE';
+    out.getViewButtonTitle = "Obtenir l'adresse d'accès à ce document en lecture seule";
+    out.readonlyUrl = 'URL de lecture seule';
+
     out.disconnectAlert = 'Perte de la connexion au réseau !';
 
     out.tryIt = 'Essayez-le !';
@@ -65,12 +80,6 @@ define(function () {
     out.loginText = '<p>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.</p>\n' +
                     '<p>Faites attention de ne pas oublier vos identifiants puisqu\'ils seront impossible à récupérer.</p>';
 
-    out.type = {};
-    out.type.pad = 'Pad';
-    out.type.code = 'Code';
-    out.type.poll = 'Sondage';
-    out.type.slide = 'Présentation';
-
     out.forget = "Oublier";
 
     // Polls

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 = [
@@ -20,6 +25,12 @@ define(function () {
     out.synchronizing = 'Synchronizing';
     out.reconnecting = 'Reconnecting...';
     out.lag = 'Lag';
+    out.readonly = 'Read only';
+    out.nobodyIsEditing = 'Nobody is editing';
+    out.onePersonIsEditing = 'One person is editing';
+    out.peopleAreEditing = '{0} people are editing';
+    out.oneViewer = '1 viewer';
+    out.viewers = '{0} viewers';
 
     out.importButton = 'IMPORT';
     out.importButtonTitle = 'Import a document from a local file';
@@ -54,6 +65,10 @@ define(function () {
 
     out.commitButton = 'COMMIT';
 
+    out.getViewButton = 'READ-ONLY URL';
+    out.getViewButtonTitle = 'Get the read-only URL for this document';
+    out.readonlyUrl = 'Read only URL';
+
     out.disconnectAlert = 'Network connection lost!';
 
     out.tryIt = 'Try it out!';
@@ -65,13 +80,6 @@ define(function () {
     out.loginText = '<p>Your username and password are used to generate a unique key which is never known by our server.</p>\n' +
                     '<p>Be careful not to forget your credentials, as they are impossible to recover</p>';
 
-    // 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