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

customize.dist/src/less/toolbar.less

@@ -166,6 +166,9 @@ body {
                 background: darken(@bgcolor, 10%);
                 color: @color;
             }
+            .dropdown-bar-content.left a {
+                color: black;
+            }
             /*.dropdown-bar-content {
                 background: darken(@bgcolor, 5%);
                 border: 1px solid @color;
@@ -699,6 +702,9 @@ body {
         display: inline-block;
 
         color: white;
+        a {
+            color: white;
+        }
         transition: all 0.15s;
     }
     .cryptpad-new {
@@ -755,7 +761,9 @@ body {
             height: auto;
             padding: 0px 5px;
             text-decoration: none;
-            color: inherit;
+
+            // hack because of whiteboard and poll
+            color: white !important;
         }
     }
     .cryptpad-user {

www/common/common-file.js

@@ -242,6 +242,10 @@ define([
         };
 
         var onFileDrop = File.onFileDrop = function (file, e) {
+            if (!common.isLoggedIn()) {
+                return common.alert(common.Messages.upload_mustLogin);
+            }
+
             Array.prototype.slice.call(file).forEach(function (d) {
                 handleFile(d, e);
             });
@@ -273,6 +277,7 @@ define([
             })
             .on('drop', function (e) {
                 e.stopPropagation();
+
                 var dropped = e.originalEvent.dataTransfer.files;
                 counter = 0;
                 $hoverArea.removeClass('hovering');

www/common/common-interface.js

@@ -203,7 +203,7 @@ define([
             var $loadingTip = $('<div>', {'id': 'loadingTip'});
             $('<span>', {'class': 'tips'}).text(getRandomTip()).appendTo($loadingTip);
             $loadingTip.css({
-                'top': $('body').height()/2 + $container.height()/2 + 20 + 'px'
+                'bottom': $('body').height()/2 - $container.height()/2 + 20 + 'px'
             });
             $('body').append($loadingTip);
         }

www/common/toolbar2.js

@@ -383,7 +383,7 @@ define([
             var dropdownConfigShare = {
                 text: $('<div>').append($shareIcon).html(),
                 options: options,
-                feedback: 'SHARE',
+                feedback: 'SHARE_MENU',
             };
             var $shareBlock = Cryptpad.createDropdown(dropdownConfigShare);
             //$shareBlock.find('button').attr('id', 'shareButton');