Merge branch 'newpoll' into fileManagerMerge

www/common/cryptpad-common.js

@@ -798,7 +798,6 @@ define([
             case 'editshare':
                 button = $('<button>', {
                     title: Messages.editShareTitle,
-                    'class': "button action"
                 }).text(Messages.editShare);
                 if (data && data.editHash) {
                     var editHash = data.editHash;
@@ -817,7 +816,6 @@ define([
             case 'viewshare':
                 button = $('<button>', {
                     title: Messages.viewShareTitle,
-                    'class': "button action"
                 }).text(Messages.viewShare);
                 if (data && data.viewHash) {
                     button.click(function () {
@@ -835,7 +833,6 @@ define([
             case 'viewopen':
                 button = $('<button>', {
                     title: Messages.viewOpenTitle,
-                    'class': "button action"
                 }).text(Messages.viewOpen);
                 if (data && data.viewHash) {
                     button.click(function () {

www/common/toolbar.js

@@ -202,14 +202,14 @@ define([
     var updateUserList = function (myUserName, userlistElement, userList, userData, readOnly, $stateElement, $userAdminElement) {
         var meIdx = userList.indexOf(myUserName);
         if (meIdx === -1) {
+            console.log('nok');
             $stateElement.text(Messages.synchronizing);
             return;
         }
         $stateElement.text('');
-
         // Make sure the elements are displayed
         var $userButtons = $(userlistElement).find("#userButtons");
-        $userButtons.show();
+        $userButtons.attr('display', 'inline');
 
         var numberOfUsers = userList.length;
 
@@ -271,7 +271,7 @@ define([
         if (readOnly === 1) {
             $userElement.html('<span class="' + READONLY_CLS + '">' + Messages.readonly + '</span>');
         }
-        else  {
+        else {
             var name = userData[myUserName] && userData[myUserName].name;
             var icon = '<span class="fa fa-user" style="font-family:FontAwesome;"></span>';
             if (!name) {