Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE mobile] Add Collaboration icon into toolbar, fix less

Browse source
This commit is contained in:
Julia Svinareva 2019-05-22 15:36:43 +03:00
parent ee7f41196b
commit dc6402c41a
9 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/mobile/resources/less/ios/_collaboration.less
View file

@ -50,5 +50,10 @@
.navbar .center-collaboration { .navbar .center-collaboration {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
margin-left: 45px; }
.container-collaboration {
.navbar .right.close-collaboration {
position: absolute;
right: 10px;
}
} }

7
apps/common/mobile/resources/less/material/_collaboration.less
View file

@ -50,5 +50,10 @@
} }
.navbar .center-collaboration { .navbar .center-collaboration {
text-align: center; text-align: center;
margin-left: 54px; }
.container-collaboration {
.navbar .right.close-collaboration {
position: absolute;
right: 5px;
}
} }

6
apps/documenteditor/mobile/app/controller/Collaboration.js
View file

@ -100,7 +100,7 @@ define([
if (Common.SharedSettings.get('phone')) { if (Common.SharedSettings.get('phone')) {
modalView = $$(uiApp.pickerModal( 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">' + '<div class="view collaboration-root-view navbar-through">' +
this.getView('Collaboration').rootLayout() + this.getView('Collaboration').rootLayout() +
'</div>' + '</div>' +
@ -119,7 +119,7 @@ define([
mainView.hideNavbar(); mainView.hideNavbar();
} else { } else {
modalView = uiApp.popover( modalView = uiApp.popover(
'<div class="popover settings container-edit">' + '<div class="popover settings container-collaboration">' +
'<div class="popover-angle"></div>' + '<div class="popover-angle"></div>' +
'<div class="popover-inner">' + '<div class="popover-inner">' +
'<div class="content-block">' + '<div class="content-block">' +
@ -129,7 +129,7 @@ define([
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>', '</div>',
$$('#toolbar-settings') $$('#toolbar-collaboration')
); );
} }

2
apps/documenteditor/mobile/app/template/Collaboration.template
View file

@ -3,7 +3,7 @@
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="center sliding categories center-collaboration"><%= scope.textCollaboration %></div> <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> </div>
<div class="pages"> <div class="pages">

2
apps/documenteditor/mobile/app/template/Settings.template
View file

@ -55,6 +55,7 @@
</a> </a>
</li> </li>
<% } %> <% } %>
<% if(phone) {%>
<li> <li>
<div id="settings-collaboration" class="item-content"> <div id="settings-collaboration" class="item-content">
<div class="item-media"> <div class="item-media">
@ -65,6 +66,7 @@
</div> </div>
</div> </div>
</li> </li>
<% } %>
<li> <li>
<a id="settings-document" class="item-link" data-page="#settings-document-view"> <a id="settings-document" class="item-link" data-page="#settings-document-view">
<div class="item-content"> <div class="item-content">

5
apps/documenteditor/mobile/app/template/Toolbar.template
View file

@ -20,6 +20,11 @@
<div class="center" id="toolbar-title"></div> <div class="center" id="toolbar-title"></div>
<% } %> <% } %>
<div class="right"> <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) { %> <% if (android) { %>
<a href="#" id="toolbar-undo" class="link icon-only disabled" style="display: none;"> <a href="#" id="toolbar-undo" class="link icon-only disabled" style="display: none;">
<i class="icon icon-undo"></i> <i class="icon icon-undo"></i>

10
apps/documenteditor/mobile/app/view/Toolbar.js
View file

@ -63,7 +63,8 @@ define([
"click #toolbar-edit" : "showEdition", "click #toolbar-edit" : "showEdition",
"click #toolbar-add" : "showInserts", "click #toolbar-add" : "showInserts",
"click #toolbar-settings" : "showSettings", "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 // Set innerHTML and get the references to the DOM elements
@ -100,7 +101,7 @@ define([
setMode: function (mode) { setMode: function (mode) {
if (mode.isEdit) { 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){ } else if (mode.canEdit && mode.canRequestEditRights){
$('#toolbar-edit-document').show(); $('#toolbar-edit-document').show();
} }
@ -150,6 +151,11 @@ define([
DE.getController('Settings').showModal(); DE.getController('Settings').showModal();
}, },
//Collaboration
showCollaboration: function () {
DE.getController('Collaboration').showModal();
},
editDocument: function () { editDocument: function () {
Common.Gateway.requestEditRights(); Common.Gateway.requestEditRights();
}, },

5
apps/documenteditor/mobile/resources/css/app-ios.css
View file

@ -6313,7 +6313,10 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.navbar .center-collaboration { .navbar .center-collaboration {
display: flex; display: flex;
justify-content: space-around; 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 { .tablet .searchbar.document.replace .center .searchbar:first-child {
margin-right: 10px; margin-right: 10px;

5
apps/documenteditor/mobile/resources/css/app-material.css
View file

@ -5911,7 +5911,10 @@ html.phone .document-menu .list-block .item-link {
} }
.navbar .center-collaboration { .navbar .center-collaboration {
text-align: center; text-align: center;
margin-left: 54px; }
.container-collaboration .navbar .right.close-collaboration {
position: absolute;
right: 5px;
} }
.tablet .searchbar.document.replace .center > .replace { .tablet .searchbar.document.replace .center > .replace {
display: flex; display: flex;