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

customize.dist/translations/messages.es.js

@@ -410,6 +410,12 @@ define(function () {
     out.upgrade = "Mejorar";
     out.upgradeTitle = "Mejora tu cuenta para obtener más espacio";
     out.MB = "MB";
+    out.GB = "GB";
+    out.KB = "KB";
+    out.formattedMB = "{0} MB";
+    out.formattedGB = "{0} GB";
+    out.formattedKB = "{0} KB";
+
     out.pinLimitReached = "Has llegado al limite de espacio";
     out.pinLimitReachedAlert = "Has llegado al limite de espacio. Nuevos pads no serán movidos a tu CryptDrive.<br>Para resolver este problema, puedes quitar pads de tu CryptDrive (incluso en la papelera) o mejorar tu cuenta para obtener más espacio.";
     out.pinLimitNotPinned = "Has llegado al limite de espacio.<br>Este pad no estará presente en tu CryptDrive.";

customize.dist/translations/messages.fr.js

@@ -61,8 +61,13 @@ define(function () {
     out.upgrade = "Améliorer";
     out.upgradeTitle = "Améliorer votre compte pour augmenter la limite de stockage";
     out.MB = "Mo";
+    out.GB = "Go";
     out.KB = "Ko";
 
+    out.formattedMB = "{0} Mo";
+    out.formattedGB = "{0} Go";
+    out.formattedKB = "{0} Ko";
+
     out.greenLight = "Tout fonctionne bien";
     out.orangeLight = "Votre connexion est lente, ce qui réduit la qualité de l'éditeur";
     out.redLight = "Vous êtes déconnectés de la session";

customize.dist/translations/messages.js

@@ -63,8 +63,13 @@ define(function () {
     out.upgrade = "Upgrade";
     out.upgradeTitle = "Upgrade your account to increase the storage limit";
     out.MB = "MB";
+    out.GB = "GB";
     out.KB = "KB";
 
+    out.formattedMB = "{0} MB";
+    out.formattedGB = "{0} GB";
+    out.formattedKB = "{0} KB";
+
     out.greenLight = "Everything is working fine";
     out.orangeLight = "Your slow connection may impact your experience";
     out.redLight = "You are disconnected from the session";

server.js

@@ -8,6 +8,7 @@ var Fs = require('fs');
 var WebSocketServer = require('ws').Server;
 var NetfluxSrv = require('./node_modules/chainpad-server/NetfluxWebsocketSrv');
 var Package = require('./package.json');
+var Path = require("path");
 
 var config = require('./config');
 var websocketPort = config.websocketPort || config.httpPort;
@@ -82,7 +83,7 @@ var mainPages = config.mainPages || ['index', 'privacy', 'terms', 'about', 'cont
 var mainPagePattern = new RegExp('^\/(' + mainPages.join('|') + ').html$');
 app.get(mainPagePattern, Express.static(__dirname + '/customize.dist'));
 
-app.use("/blob", Express.static(__dirname + '/blob'));
+app.use("/blob", Express.static(Path.join(__dirname, (config.blobPath || './blob'))));
 
 app.use("/customize", Express.static(__dirname + '/customize'));
 app.use("/customize", Express.static(__dirname + '/customize.dist'));

www/code/inner.html

@@ -78,7 +78,7 @@
             overflow: auto;
             display: inline-block;
             height: 100%;
-            border: 1px solid black;
+            border-left: 1px solid black;
             box-sizing: border-box;
             font-family: Calibri,Ubuntu,sans-serif;
         }

www/common/common-util.js

@@ -81,12 +81,25 @@ define([], function () {
             .replace(/_+/g, '_');
     };
 
+    var oneKilobyte = 1024;
+    var oneMegabyte = 1024 * oneKilobyte;
+    var oneGigabyte = 1024 * oneMegabyte;
+
+    Util.bytesToGigabytes = function (bytes) {
+        return Math.ceil(bytes / oneGigabyte * 100) / 100;
+    };
+
     Util.bytesToMegabytes = function (bytes) {
-        return Math.floor((bytes / (1024 * 1024) * 100)) / 100;
+        return Math.ceil(bytes / oneMegabyte * 100) / 100;
     };
 
     Util.bytesToKilobytes = function (bytes) {
-        return Math.floor(bytes / 1024 * 100) / 100;
+        return Math.ceil(bytes / oneKilobyte * 100) / 100;
+    };
+
+    Util.magnitudeOfBytes = function (bytes) {
+        if (bytes >= oneGigabyte) { return 'GB'; }
+        else if (bytes >= oneMegabyte) { return 'MB'; }
     };
 
     Util.fetch = function (src, cb) {

www/common/cryptpad-common.js

@@ -745,8 +745,7 @@ define([
         if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
         rpc.updatePinLimits(function (e, limit, plan) {
             if (e) { return cb(e); }
-            var MB = common.bytesToMegabytes(limit);
+            cb(e, limit, plan);
-            cb(e, MB, plan);
         });
     };
 
@@ -754,8 +753,7 @@ define([
         if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
         rpc.getLimit(function (e, limit, plan) {
             if (e) { return cb(e); }
-            var MB = common.bytesToMegabytes(limit);
+            cb(void 0, limit, plan);
-            cb(void 0, MB, plan);
         });
     };
 
@@ -771,7 +769,7 @@ define([
             return void cb (null, false, data);
         };
         var todo = function (e, used) {
-            usage = common.bytesToMegabytes(used);
+            usage = used; //common.bytesToMegabytes(used);
             if (e) { return void cb(e); }
             common.getPinLimit(andThen);
         };
@@ -802,9 +800,14 @@ define([
                     common.isOverPinLimit(todo);
                 }, LIMIT_REFRESH_RATE);
             }
-            var usage = data.usage;
+
-            var limit = data.limit;
+            var unit = Util.magnitudeOfBytes(data.limit);
-            var unit = Messages.MB;
+
+            var usage = unit === 'GB'? Util.bytesToGigabytes(data.usage):
+                Util.bytesToMegabytes(data.usage);
+            var limit = unit === 'GB'? Util.bytesToGigabytes(data.limit):
+                Util.bytesToMegabytes(data.limit);
+
             var $limit = $('<span>', {'class': 'cryptpad-limit-bar'}).appendTo($container);
             var quota = usage/limit;
             var width = Math.floor(Math.min(quota, 1)*200); // the bar is 200px width
@@ -823,11 +826,22 @@ define([
                 }).text(Messages.upgrade).appendTo($upgradeLink);
             }
 
+            var prettyUsage;
+            var prettyLimit;
+
+            if (unit === 'GB') {
+                prettyUsage = usage; //Messages._getKey('formattedGB', [usage]);
+                prettyLimit = Messages._getKey('formattedGB', [limit]);
+            } else {
+                prettyUsage = usage; //Messages._getKey('formattedMB', [usage]);
+                prettyLimit = Messages._getKey('formattedMB', [limit]);
+            }
+
             if (quota < 0.8) { $usage.addClass('normal'); }
             else if (quota < 1) { $usage.addClass('warning'); }
             else { $usage.addClass('above'); }
             var $text = $('<span>', {'class': 'usageText'});
-            $text.text(usage + ' / ' + limit + ' ' + unit);
+            $text.text(prettyUsage + ' / ' + prettyLimit);
             $limit.append($usage).append($text);
             window.setTimeout(function () {
                 common.isOverPinLimit(todo);

www/file/main.js

@@ -73,13 +73,9 @@ define([
             if (box) {
                 actual += box.length;
                 var progressValue = (actual / estimate * 100);
-                var progress = progressValue + '%';
 
                 return void sendChunk(box, function (e) {
                     if (e) { return console.error(e); }
-                    /*$progress.css({
-                        width: progress,
-                    });*/
                     var $pv = $table.find('tr[id="'+id+'"]').find('.progressValue');
                     $pv.text(Math.round(progressValue*100)/100 + '%');
                     var $pb = $table.find('tr[id="'+id+'"]').find('.progressContainer');
@@ -179,17 +175,17 @@ define([
         var $tr = $('<tr>', {id: id}).appendTo($table);
 
         var $cancel = $('<span>', {'class': 'cancel fa fa-times'}).click(function () {
-            queue.queue = queue.queue.filter(function (el) { return el.id !== id });
+            queue.queue = queue.queue.filter(function (el) { return el.id !== id; });
             $cancel.remove();
             $tr.find('.upCancel').text('-');
             $tr.find('.progressValue').text(Messages.upload_cancelled);
         });
 
-        var $tr = $('<tr>', {id: id}).appendTo($table);
+        var $tr2 = $('<tr>', {id: id}).appendTo($table);
-        $('<td>').text(obj.metadata.name).appendTo($tr);
+        $('<td>').text(obj.metadata.name).appendTo($tr2);
-        $('<td>').text(prettySize(estimate)).appendTo($tr);
+        $('<td>').text(prettySize(estimate)).appendTo($tr2);
-        $('<td>', {'class': 'upProgress'}).append($progressBar).append($progressValue).appendTo($tr);
+        $('<td>', {'class': 'upProgress'}).append($progressBar).append($progressValue).appendTo($tr2);
-        $('<td>', {'class': 'upCancel'}).append($cancel).appendTo($tr);
+        $('<td>', {'class': 'upCancel'}).append($cancel).appendTo($tr2);
 
         queue.next();
     };