From 94eac09c61011e1d633f91867bca188c97b4892a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 7 May 2020 15:26:12 +0200
Subject: [PATCH] Add share and access to the bottom bar

---
 customize.dist/src/less2/include/toolbar.less |  5 +-
 www/common/onlyoffice/inner.js                | 15 +-----
 www/common/sframe-app-framework.js            | 16 +-----
 www/common/toolbar.js                         | 49 +++++++++++++++----
 www/file/inner.js                             |  2 +-
 www/poll/inner.js                             | 15 +-----
 6 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index b56888e83..228809c86 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -1003,7 +1003,7 @@ color: var(--toolbar-bg-color);
     .cp-toolbar-bottom {
         background-color: @toolbar-bg-color-l8;
         background-color: var(--toolbar-bg-color-l8);
-        color: #FFF; // XXX
+        color: @cryptpad_text_col;
         button:hover, button.cp-toolbar-button-active {
             background-color: @toolbar-bg-color;
             background-color: var(--toolbar-bg-color);
@@ -1028,6 +1028,9 @@ color: var(--toolbar-bg-color);
             margin: 0px;
             border-radius: 0;
             height: 100%;
+            .fa {
+                margin-right: 5px;
+            }
         }
         .cp-dropdown-content {
             margin-top: -1px;
diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 4ebe813c0..9a879544a 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -1483,18 +1483,7 @@ define([
             Title = common.createTitle({});
 
             var configTb = {
-                displayed: [
-                    'chat',
-                    'userlist',
-                    'title',
-                    'useradmin',
-                    'spinner',
-                    'newpad',
-                    'share',
-                    'limit',
-                    'unpinnedWarning',
-                    'notifications'
-                ],
+                displayed: ['pad'],
                 title: Title.getTitleConfig(),
                 metadataMgr: metadataMgr,
                 readOnly: readOnly,
@@ -1561,8 +1550,6 @@ define([
 
             var $properties = common.createButton('properties', true);
             toolbar.$drawer.append($properties);
-            var $access = common.createButton('access', true);
-            toolbar.$drawer.append($access);
         };
 
         config.onReady = function (info) {
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index 8b3f6d4fc..546e3cd37 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -654,19 +654,7 @@ define([
                 getHeadingText: function () { return titleRecommender(); }
             }, onLocal);
             var configTb = {
-                displayed: [
-                    'chat',
-                    'userlist',
-                    'title',
-                    'useradmin',
-                    'spinner',
-                    'newpad',
-                    'share',
-                    'limit',
-                    'request',
-                    'unpinnedWarning',
-                    'notifications'
-                ],
+                displayed: ['pad'],
                 title: title.getTitleConfig(),
                 metadataMgr: cpNfInner.metadataMgr,
                 readOnly: readOnly,
@@ -722,8 +710,6 @@ define([
 
             var $properties = common.createButton('properties', true);
             toolbar.$drawer.append($properties);
-            var $access = common.createButton('access', true);
-            toolbar.$drawer.append($access);
 
             createFilePicker();
 
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index f2edb7c7c..bda25405f 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -473,10 +473,12 @@ MessengerUI, Messages) {
 
         toolbar.chatContent = $content;
 
-        var $container = $('<span>', {id: 'cp-toolbar-chat-drawer-open', title: Messages.chatButton});
+        var $container = $('<span>', {id: 'cp-toolbar-chat-drawer-open'});
 
-        var $button = $('<button>', {'class': 'fa fa-comments'}).appendTo($container);
-        $('<span>',{'class': 'cp-dropdown-button-title'}).appendTo($button);
+        var $button = $(h('button', [
+            h('i.fa.fa-comments'),
+            h('span.cp-button-name', Messages.chatButton)
+        ])).appendTo($container);
 
         toolbar.$bottomR.prepend($container);
 
@@ -531,13 +533,13 @@ MessengerUI, Messages) {
 
     var createShare = function (toolbar, config) {
         if (!config.metadataMgr) {
-            throw new Error("You must provide a `metadataMgr` to display the userlist");
+            throw new Error("You must provide a `metadataMgr` to display the share button");
         }
 
-        var $shareBlock = $('<button>', {
-            'class': 'fa fa-shhare-alt cp-toolbar-share-button',
-            title: Messages.shareButton
-        });
+        var $shareBlock = $(h('button.cp-toolar-share-button', [
+            h('i.fa.fa-shhare-alt'),
+            h('span.cp-button-name', Messages.shareButton)
+        ]));
         Common.getSframeChannel().event('EV_SHARE_OPEN', {
             hidden: true
         });
@@ -550,11 +552,29 @@ MessengerUI, Messages) {
             });
         });
 
-        toolbar.$leftside.append($shareBlock);
+        toolbar.$bottomM.append($shareBlock);
         toolbar.share = $shareBlock;
 
         return "Loading share button";
     };
+    var createAccess = function (toolbar, config) {
+        if (!config.metadataMgr) {
+            throw new Error("You must provide a `metadataMgr` to display the access button");
+        }
+
+        var $accessBlock = $(h('button.cp-toolar-access-button', [
+            h('i.fa.fa-unlock-alt'),
+            h('span.cp-button-name', Messages.accessButton)
+        ]));
+        $accessBlock.click(function () { 
+            Common.getSframeChannel().event('EV_ACCESS_OPEN');
+        });
+
+        toolbar.$bottomM.append($accessBlock);
+        toolbar.access = $accessBlock;
+
+        return "Loading access button";
+    };
 
     var createFileShare = function (toolbar, config) {
         if (!config.metadataMgr) {
@@ -578,7 +598,7 @@ MessengerUI, Messages) {
             });
         });
 
-        toolbar.$leftside.append($shareBlock);
+        toolbar.$bottomM.append($shareBlock);
         return $shareBlock;
     };
 
@@ -1240,6 +1260,7 @@ MessengerUI, Messages) {
         tb['userlist'] = createUserList;
         tb['chat'] = createChat;
         tb['share'] = createShare;
+        tb['access'] = createAccess;
         tb['fileshare'] = createFileShare;
         tb['title'] = createTitle;
         tb['pageTitle'] = createPageTitle;
@@ -1254,6 +1275,14 @@ MessengerUI, Messages) {
         tb['unpinnedWarning'] = createUnpinnedWarning;
         tb['notifications'] = createNotifications;
 
+        tb['pad'] = function () {
+            addElement([
+                'chat', 'userlist', 'title', 'useradmin', 'spinner',
+                'newpad', 'share', 'access', 'limit', 'unpinnedWarning',
+                'notifications'
+            ], {});
+        };
+
         var addElement = toolbar.addElement = function (arr, additionalCfg, init) {
             if (typeof additionalCfg === "object") { $.extend(true, config, additionalCfg); }
             arr.forEach(function (el) {
diff --git a/www/file/inner.js b/www/file/inner.js
index 10eba7e7d..b3e6d47e8 100644
--- a/www/file/inner.js
+++ b/www/file/inner.js
@@ -72,6 +72,7 @@ define([
         var displayed = ['useradmin', 'newpad', 'limit', 'upgrade'];
         if (!uploadMode) {
             displayed.push('fileshare');
+            displayed.push('access');
         }
         var configTb = {
             displayed: displayed,
@@ -132,7 +133,6 @@ define([
                     title: Title.getTitleConfig(),
                 });
                 toolbar.$rightside.append(common.createButton('forget', true));
-                toolbar.$rightside.append(common.createButton('access', true));
                 toolbar.$rightside.append(common.createButton('properties', true));
                 if (common.isLoggedIn()) {
                     toolbar.$rightside.append(common.createButton('hashtag', true));
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 1ca36f1f0..623fc9afe 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -1125,18 +1125,7 @@ define([
         Title = common.createTitle(titleCfg);
 
         var configTb = {
-            displayed: [
-                'chat',
-                'userlist',
-                'title',
-                'useradmin',
-                'spinner',
-                'newpad',
-                'share',
-                'limit',
-                'unpinnedWarning',
-                'notifications'
-            ],
+            displayed: ['pad'],
             title: Title.getTitleConfig(),
             metadataMgr: metadataMgr,
             readOnly: APP.readOnly,
@@ -1169,8 +1158,6 @@ define([
         var $forgetPad = common.createButton('forget', true, {}, forgetCb);
         $rightside.append($forgetPad);
 
-        var $access = common.createButton('access', true);
-        $drawer.append($access);
         var $properties = common.createButton('properties', true);
         $drawer.append($properties);