Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

bower.json

@@ -37,7 +37,6 @@
     "file-saver": "^1.3.1",
     "diff-dom": "^2.1.1",
     "alertifyjs": "^1.0.11",
-    "spin.js": "^2.3.2",
     "scrypt-async": "^1.2.0",
     "bootstrap": "#v4.0.0-alpha.6"
   }

customize.dist/translations/messages.fr.js

@@ -364,13 +364,23 @@ define(function () {
         '</small>',
         '</p>',
     ].join('');
+    out.initialState = [
+        '<span style="font-size:18px;"><p>',
+        'Voici <strong>CryptPad</strong>, l\'éditeur collaboratif en temps-réel Zero Knowledge. Tout est sauvegardé dés que vous le tapez.',
+        '<br>',
+        'Partagez le lien vers ce pad avec des amis ou utilisez le bouton <span style="background-color:#449d44;color:#ffffff;">&nbsp;Partager&nbsp;</span> pour obtenir le <em>lien de lecture-seule</em>, qui permet la lecture mais non la modification.',
+        '</p>',
+        '<p><span style="color:#808080; font-size: 18px;">',
+        '<em>',
+        'Lancez-vous, commencez à taper...',
+        '</em></span></p></span>'
+    ].join('');
 
     out.codeInitialState = [
         '/*\n',
-        '   Voici CryptPad, l\'éditeur collaboratif en temps-réel Zero Knowledge.\n',
+        '   Voici l\'éditeur de code collaboratif et Zero Knowledge de CryptPad.\n',
         '   Ce que vous tapez ici est chiffré de manière que seules les personnes avec le lien peuvent y accéder.\n',
-        '   Même le serveur est incapable de voir ce que vous tapez.\n',
+        '   Vous pouvez choisir le langage de programmation pour la coloration syntaxique, ainsi que le thème de couleurs, dans le coin supérieur droit.\n',
-        '   Ce que vous voyez ici, ce que vous entendez, quand vous partez, ça reste ici.\n',
         '*/'
     ].join('');
 

customize.dist/translations/messages.js

@@ -261,8 +261,8 @@ define(function () {
 
     out.settings_importTitle = "Import this browser's recent pads in my CryptDrive";
     out.settings_import = "Import";
-    out.settings_confirm = "Are you sure you want to import recent pads from this browser to your user account's CryptDrive?";
+    out.settings_importConfirm = "Are you sure you want to import recent pads from this browser to your user account's CryptDrive?";
-    out.settings_done = "Import completed";
+    out.settings_importDone = "Import completed";
 
     out.settings_userFeedbackHint1 = "CryptPad provides some very basic feedback to the server, to let us know how to improve your experience.";
     out.settings_userFeedbackHint2 = "Your pad's content will never be shared with the server.";

www/common/cryptpad-common.js

@@ -4,12 +4,11 @@ define([
     '/common/fsStore.js',
     '/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
     '/bower_components/alertifyjs/dist/js/alertify.js',
-    '/bower_components/spin.js/spin.min.js',
     '/common/clipboard.js',
     '/customize/application_config.js',
 
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Config, Messages, Store, Crypto, Alertify, Spinner, Clipboard, AppConfig) {
+], function (Config, Messages, Store, Crypto, Alertify, Clipboard, AppConfig) {
 /*  This file exposes functionality which is specific to Cryptpad, but not to
     any particular pad type. This includes functions for committing metadata
     about pads to your local storage for future use and improved usability.
@@ -891,11 +890,11 @@ define([
             }
             $container = $loading.find('.loadingContainer');
         } else {
-            var $loading = $('<div>', {id: LOADING});
+            $loading = $('<div>', {id: LOADING});
             $container = $('<div>', {'class': 'loadingContainer'});
             $container.append('<img class="cryptofist" src="/customize/cryptofist_small.png" />');
             var $spinner = $('<div>', {'class': 'spinnerContainer'});
-            var loadingSpinner = common.spinner($spinner).show();
+            common.spinner($spinner).show();
             var $text = $('<p>').text(loadingText || Messages.loading);
             $container.append($spinner).append($text);
             $loading.append($container);
@@ -1535,37 +1534,12 @@ define([
      *  spinner
      */
     common.spinner = function (parent) {
-        var $target = $('<div>', {
+        var $target = $('<span>', {
-            //
+            'class': 'fa fa-spinner fa-pulse fa-4x fa-fw'
         }).hide();
 
         $(parent).append($target);
 
-        var opts = {
-            lines: 20, // The number of lines to draw
-            length: 5, // The length of each line
-            width: 2, // The line thickness
-            radius: 15, // The radius of the inner circle
-            scale: 2, // Scales overall size of the spinner
-            corners: 1, // Corner roundness (0..1)
-            color: '#ddd', // #rgb or #rrggbb or array of colors
-            opacity: 0.3, // Opacity of the lines
-            rotate: 31, // The rotation offset
-            direction: 1, // 1: clockwise, -1: counterclockwise
-            speed: 1, // Rounds per second
-            trail: 49, // Afterglow percentage
-            fps: 20, // Frames per second when using setTimeout() as a fallback for CSS
-            zIndex: 2e9, // The z-index (defaults to 2000000000)
-            className: 'spinner', // The CSS class to assign to the spinner
-            top: '50%', // Top position relative to parent
-            left: '50%', // Left position relative to parent
-            shadow: false, // Whether to render a shadow
-            hwaccel: false, // Whether to use hardware acceleration
-            position: 'relative', // Element positioning
-            height: '100px'
-        };
-        var spinner = new Spinner(opts).spin($target[0]);
-
         return {
             show: function () {
                 $target.show();
@@ -1576,7 +1550,7 @@ define([
                 return this;
             },
             get: function () {
-                return spinner;
+                return $target;
             },
         };
     };

www/settings/main.js

@@ -224,7 +224,6 @@ define([
         var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide().appendTo($div);
         var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide().appendTo($div);
 
-
         $button.click(function () {
             Cryptpad.confirm(Messages.settings_importConfirm, function (yes) {
                 if (!yes) { return; }

www/slide/main.js

@@ -454,8 +454,7 @@ define([
 
                 var fixCSS = function (css) {
                     var append = '.cp #print ';
-                css = css.replace(/(\n*)([^\n]+)\s*\{/g, '$1' + append + '$2 {')
+                    return css.replace(/(\n*)([^\n]+)\s*\{/g, '$1' + append + '$2 {');
-                    return css;
                 };
 
                 var todo = function () {