From dc6402c41a243005af63332e19ab1e3fc29689bb Mon Sep 17 00:00:00 2001
From: Julia Svinareva <julia.svinaryova@onlyoffice.com>
Date: Wed, 22 May 2019 15:36:43 +0300
Subject: [PATCH] [DE mobile] Add Collaboration icon into toolbar, fix less

---
 .../mobile/resources/less/ios/_collaboration.less      |  7 ++++++-
 .../mobile/resources/less/material/_collaboration.less |  7 ++++++-
 .../mobile/app/controller/Collaboration.js             |  6 +++---
 .../mobile/app/template/Collaboration.template         |  2 +-
 .../mobile/app/template/Settings.template              |  2 ++
 .../mobile/app/template/Toolbar.template               |  5 +++++
 apps/documenteditor/mobile/app/view/Toolbar.js         | 10 ++++++++--
 apps/documenteditor/mobile/resources/css/app-ios.css   |  5 ++++-
 .../mobile/resources/css/app-material.css              |  5 ++++-
 9 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/apps/common/mobile/resources/less/ios/_collaboration.less b/apps/common/mobile/resources/less/ios/_collaboration.less
index 442a8a4d1..5ccf0840d 100644
--- a/apps/common/mobile/resources/less/ios/_collaboration.less
+++ b/apps/common/mobile/resources/less/ios/_collaboration.less
@@ -50,5 +50,10 @@
 .navbar .center-collaboration {
   display: flex;
   justify-content: space-around;
-  margin-left: 45px;
+}
+.container-collaboration {
+  .navbar .right.close-collaboration {
+    position: absolute;
+    right: 10px;
+  }
 }
\ No newline at end of file
diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less
index 1652b4ec4..3b3132690 100644
--- a/apps/common/mobile/resources/less/material/_collaboration.less
+++ b/apps/common/mobile/resources/less/material/_collaboration.less
@@ -50,5 +50,10 @@
 }
 .navbar .center-collaboration {
   text-align: center;
-  margin-left: 54px;
+}
+.container-collaboration {
+  .navbar .right.close-collaboration {
+    position: absolute;
+    right: 5px;
+  }
 }
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/app/controller/Collaboration.js b/apps/documenteditor/mobile/app/controller/Collaboration.js
index bccdf31c6..c5ce3c2bb 100644
--- a/apps/documenteditor/mobile/app/controller/Collaboration.js
+++ b/apps/documenteditor/mobile/app/controller/Collaboration.js
@@ -100,7 +100,7 @@ define([
 
                 if (Common.SharedSettings.get('phone')) {
                     modalView = $$(uiApp.pickerModal(
-                        '<div class="picker-modal settings container-edit">' +
+                        '<div class="picker-modal settings container-collaboration">' +
                         '<div class="view collaboration-root-view navbar-through">' +
                         this.getView('Collaboration').rootLayout() +
                         '</div>' +
@@ -119,7 +119,7 @@ define([
                     mainView.hideNavbar();
                 } else {
                     modalView = uiApp.popover(
-                        '<div class="popover settings container-edit">' +
+                        '<div class="popover settings container-collaboration">' +
                         '<div class="popover-angle"></div>' +
                         '<div class="popover-inner">' +
                         '<div class="content-block">' +
@@ -129,7 +129,7 @@ define([
                         '</div>' +
                         '</div>' +
                         '</div>',
-                        $$('#toolbar-settings')
+                        $$('#toolbar-collaboration')
                     );
                 }
 
diff --git a/apps/documenteditor/mobile/app/template/Collaboration.template b/apps/documenteditor/mobile/app/template/Collaboration.template
index ad199f58f..532c869b4 100644
--- a/apps/documenteditor/mobile/app/template/Collaboration.template
+++ b/apps/documenteditor/mobile/app/template/Collaboration.template
@@ -3,7 +3,7 @@
     <div class="navbar">
         <div class="navbar-inner">
             <div class="center sliding categories center-collaboration"><%= scope.textCollaboration %></div>
-            <div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
+            <div class="right sliding close-collaboration"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
         </div>
     </div>
     <div class="pages">
diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template
index 41deaec18..004ca88ff 100644
--- a/apps/documenteditor/mobile/app/template/Settings.template
+++ b/apps/documenteditor/mobile/app/template/Settings.template
@@ -55,6 +55,7 @@
                             </a>
                         </li>
                         <% } %>
+                        <% if(phone) {%>
                         <li>
                             <div id="settings-collaboration" class="item-content">
                                 <div class="item-media">
@@ -65,6 +66,7 @@
                                 </div>
                             </div>
                         </li>
+                        <% } %>
                         <li>
                             <a id="settings-document" class="item-link" data-page="#settings-document-view">
                                 <div class="item-content">
diff --git a/apps/documenteditor/mobile/app/template/Toolbar.template b/apps/documenteditor/mobile/app/template/Toolbar.template
index 92137c8a0..dcb188e8c 100644
--- a/apps/documenteditor/mobile/app/template/Toolbar.template
+++ b/apps/documenteditor/mobile/app/template/Toolbar.template
@@ -20,6 +20,11 @@
         <div class="center" id="toolbar-title"></div>
         <% } %>
         <div class="right">
+            <% if (!phone) { %>
+                <a href="#" id="toolbar-collaboration" class="link icon-only" style="display: none;">
+                    <i class="icon icon-review"></i>
+                </a>
+            <% } %>
             <% if (android) { %>
             <a href="#" id="toolbar-undo" class="link icon-only disabled" style="display: none;">
                 <i class="icon icon-undo"></i>
diff --git a/apps/documenteditor/mobile/app/view/Toolbar.js b/apps/documenteditor/mobile/app/view/Toolbar.js
index 135641431..02772ee30 100644
--- a/apps/documenteditor/mobile/app/view/Toolbar.js
+++ b/apps/documenteditor/mobile/app/view/Toolbar.js
@@ -63,7 +63,8 @@ define([
                 "click #toolbar-edit"       : "showEdition",
                 "click #toolbar-add"        : "showInserts",
                 "click #toolbar-settings"   : "showSettings",
-                "click #toolbar-edit-document": "editDocument"
+                "click #toolbar-edit-document": "editDocument",
+                "click #toolbar-collaboration" : "showCollaboration"
             },
 
             // Set innerHTML and get the references to the DOM elements
@@ -100,7 +101,7 @@ define([
 
             setMode: function (mode) {
                 if (mode.isEdit) {
-                    $('#toolbar-edit, #toolbar-add, #toolbar-undo, #toolbar-redo').show();
+                    $('#toolbar-edit, #toolbar-add, #toolbar-undo, #toolbar-redo, #toolbar-collaboration').show();
                 } else if (mode.canEdit && mode.canRequestEditRights){
                     $('#toolbar-edit-document').show();
                 }
@@ -150,6 +151,11 @@ define([
                 DE.getController('Settings').showModal();
             },
 
+            //Collaboration
+            showCollaboration: function () {
+                DE.getController('Collaboration').showModal();
+            },
+
             editDocument: function () {
                 Common.Gateway.requestEditRights();
             },
diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css
index b600fd1d2..7a285d328 100644
--- a/apps/documenteditor/mobile/resources/css/app-ios.css
+++ b/apps/documenteditor/mobile/resources/css/app-ios.css
@@ -6313,7 +6313,10 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
 .navbar .center-collaboration {
   display: flex;
   justify-content: space-around;
-  margin-left: 45px;
+}
+.container-collaboration .navbar .right.close-collaboration {
+  position: absolute;
+  right: 10px;
 }
 .tablet .searchbar.document.replace .center .searchbar:first-child {
   margin-right: 10px;
diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css
index ce43babc0..f90b9a5ed 100644
--- a/apps/documenteditor/mobile/resources/css/app-material.css
+++ b/apps/documenteditor/mobile/resources/css/app-material.css
@@ -5911,7 +5911,10 @@ html.phone .document-menu .list-block .item-link {
 }
 .navbar .center-collaboration {
   text-align: center;
-  margin-left: 54px;
+}
+.container-collaboration .navbar .right.close-collaboration {
+  position: absolute;
+  right: 5px;
 }
 .tablet .searchbar.document.replace .center > .replace {
   display: flex;