Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging

www/common/common-file.js

@@ -56,12 +56,13 @@ define([
             $row.find('.upCancel').html('-');
             var $pv = $row.find('.progressValue');
             var $pb = $row.find('.progressContainer');
+            var $pc = $row.find('.upProgress');
             var $link = $row.find('.upLink');
 
             var updateProgress = function (progressValue) {
                 $pv.text(Math.round(progressValue*100)/100 + '%');
                 $pb.css({
-                    width: (progressValue/100)*188+'px'
+                    width: (progressValue/100)*$pc.width()+'px'
                 });
             };
 

www/common/common-interface.js

@@ -313,6 +313,7 @@ define([
                 position: 'bottom',
                 distance: 0,
                 performance: true,
+                dynamicTitle: true,
                 delay: [delay, 0]
             });
         };

www/common/file-dialog.less

@@ -44,6 +44,7 @@
             border: 0;
             padding: 8px 12px;
             margin: 1em;
+            width: 300px;
         }
 
         .close {
@@ -60,6 +61,7 @@
         .fileContainer {
             display: flex;
             flex-wrap: wrap;
+            justify-content: center;
             overflow-y: auto;
         }
 

www/common/toolbar2.js

@@ -308,7 +308,7 @@ define([
 
         toolbar.userlistContent = $content;
 
-        var $container = $('<span>', {id: 'userButtons'});
+        var $container = $('<span>', {id: 'userButtons', title: Messages.userListButton});
 
         var $button = $('<button>').appendTo($container);
         $('<span>',{'class': 'buttonTitle'}).appendTo($button);
@@ -446,6 +446,7 @@ define([
             //$shareBlock.find('button').attr('id', 'shareButton');
             $shareBlock.find('.dropdown-bar-content').addClass(SHARE_CLS).addClass(EDITSHARE_CLS).addClass(VIEWSHARE_CLS);
             $shareBlock.addClass('shareButton');
+            $shareBlock.find('button').attr('title', Messages.shareButton);
 
             if (hashes.editHash) {
                 $shareBlock.find('a.editShare').click(function () {
@@ -774,6 +775,7 @@ define([
             userMenuCfg.displayChangeName = 1;
         }
         Cryptpad.createUserAdminMenu(userMenuCfg);
+        $userAdmin.find('button').attr('title', Messages.userAccountButton);
 
         var $userButton = toolbar.$userNameButton = $userAdmin.find('a.' + USERBUTTON_CLS);
         $userButton.click(function (e) {