Merge branch 'feature/mobile-settings' into develop
This commit is contained in:
Julia Radzhabova
commit
34950ab65c
|
|
@ -4,6 +4,8 @@
|
|||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
margin: 0;
|
||||
max-width: 100%;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
#user-name {
|
||||
font-size: 17px;
|
||||
|
|
@ -21,11 +23,11 @@
|
|||
#text-change {
|
||||
color: #000000;
|
||||
font-size: 15px;
|
||||
line-height: 18px;
|
||||
line-height: 20px;
|
||||
margin: 0;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.block-btn {
|
||||
.block-btn, .content-block.block-btn:first-child {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
|
|
@ -34,16 +36,14 @@
|
|||
#btn-next-change, #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
#btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.right-buttons {
|
||||
display: flex;
|
||||
}
|
||||
.link {
|
||||
height: 48px;
|
||||
width: 48px;
|
||||
display: inline-block;
|
||||
.icon {
|
||||
background-position: center;
|
||||
height: 48px;
|
||||
width: 48px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -56,4 +56,7 @@
|
|||
position: absolute;
|
||||
right: 10px;
|
||||
}
|
||||
.page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
// Container
|
||||
.phone.ios {
|
||||
.container-edit {
|
||||
.container-edit,
|
||||
.container-collaboration {
|
||||
.navbar {
|
||||
.hairline(top, @toolbarBorderColor);
|
||||
}
|
||||
|
|
@ -15,7 +16,8 @@
|
|||
|
||||
.container-edit,
|
||||
.container-add,
|
||||
.container-settings {
|
||||
.container-settings,
|
||||
.container-collaboration {
|
||||
&.popover {
|
||||
width: 360px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
margin: 0;
|
||||
max-width: 100%;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
#user-name {
|
||||
font-size: 17px;
|
||||
|
|
@ -21,7 +23,7 @@
|
|||
#text-change {
|
||||
color: #000000;
|
||||
font-size: 15px;
|
||||
line-height: 18px;
|
||||
line-height: 20px;
|
||||
margin: 0;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
|
@ -36,24 +38,23 @@
|
|||
#btn-next-change, #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
#btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.right-buttons {
|
||||
display: flex;
|
||||
}
|
||||
.link {
|
||||
display: inline-block;
|
||||
|
||||
.icon {
|
||||
background-position: center;
|
||||
height: 48px;
|
||||
width: 48px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.navbar .center-collaboration {
|
||||
text-align: center;
|
||||
}
|
||||
.container-collaboration {
|
||||
.navbar .right.close-collaboration {
|
||||
position: absolute;
|
||||
right: 5px;
|
||||
}
|
||||
.page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
// Container
|
||||
|
||||
.phone.android {
|
||||
.container-edit {
|
||||
.container-edit,
|
||||
.container-collaboration {
|
||||
|
||||
.page-content {
|
||||
.list-block:first-child {
|
||||
|
|
@ -13,7 +14,8 @@
|
|||
|
||||
.container-edit,
|
||||
.container-add,
|
||||
.container-settings {
|
||||
.container-settings,
|
||||
.container-collaboration {
|
||||
&.popover {
|
||||
width: 360px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,9 @@ define([
|
|||
displayMode = "Markup",
|
||||
arrChangeReview = [],
|
||||
dateChange = [],
|
||||
_fileKey;
|
||||
_fileKey,
|
||||
_userId,
|
||||
editUsers = [];
|
||||
|
||||
return {
|
||||
models: [],
|
||||
|
|
@ -77,6 +79,8 @@ define([
|
|||
setApi: function(api) {
|
||||
this.api = api;
|
||||
this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.changeReview, this));
|
||||
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onChangeEditUsers, this));
|
||||
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onChangeEditUsers, this));
|
||||
},
|
||||
|
||||
onLaunch: function () {
|
||||
|
|
@ -86,6 +90,7 @@ define([
|
|||
setMode: function(mode) {
|
||||
this.appConfig = mode;
|
||||
_fileKey = mode.fileKey;
|
||||
_userId = mode.user.id;
|
||||
return this;
|
||||
},
|
||||
|
||||
|
|
@ -165,6 +170,9 @@ define([
|
|||
} else if('#change-view' == pageId) {
|
||||
me.initChange();
|
||||
Common.Utils.addScrollIfNeed('.page[data-page=change-view]', '.page[data-page=change-view] .page-content');
|
||||
} else if('#edit-users-view' == pageId) {
|
||||
me.initEditUsers();
|
||||
Common.Utils.addScrollIfNeed('.page[data-page=edit-users-view]', '.page[data-page=edit-users-view] .page-content');
|
||||
} else {
|
||||
if(!this.appConfig.canReview) {
|
||||
$('#reviewing-settings').hide();
|
||||
|
|
@ -251,6 +259,7 @@ define([
|
|||
|
||||
|
||||
initChange: function() {
|
||||
var goto = false;
|
||||
if(arrChangeReview.length == 0) {
|
||||
this.api.asc_GetNextRevisionsChange();
|
||||
}
|
||||
|
|
@ -260,16 +269,26 @@ define([
|
|||
$('#current-change #date-change').html(arrChangeReview[0].date);
|
||||
$('#current-change #user-name').html(arrChangeReview[0].user);
|
||||
$('#current-change #text-change').html(arrChangeReview[0].changetext);
|
||||
goto = arrChangeReview[0].goto;
|
||||
}
|
||||
if (goto) {
|
||||
$('#btn-goto-change').show();
|
||||
} else {
|
||||
$('#btn-goto-change').hide();
|
||||
}
|
||||
$('#btn-prev-change').single('click', _.bind(this.onPrevChange, this));
|
||||
$('#btn-next-change').single('click', _.bind(this.onNextChange, this));
|
||||
$('#btn-accept-change').single('click', _.bind(this.onAcceptCurrentChange, this));
|
||||
$('#btn-reject-change').single('click', _.bind(this.onRejectCurrentChange, this));
|
||||
$('#btn-goto-change').single('click', _.bind(this.onGotoNextChange, this));
|
||||
|
||||
if(this.appConfig.isReviewOnly) {
|
||||
$('#btn-accept-change').remove();
|
||||
$('#btn-reject-change').remove();
|
||||
$('.accept-reject').html('<div id="btn-delete-change"><i class="icon icon-review"></i></div>');
|
||||
$('#btn-delete-change').single('click', _.bind(this.onDeleteChange, this));
|
||||
if(arrChangeReview.length != 0 && arrChangeReview[0].editable) {
|
||||
$('.accept-reject').html('<div id="btn-delete-change"><i class="icon icon-delete-change"></i></div>');
|
||||
$('#btn-delete-change').single('click', _.bind(this.onDeleteChange, this));
|
||||
}
|
||||
}
|
||||
if(displayMode == "Final" || displayMode == "Original") {
|
||||
$('#btn-accept-change').addClass('disabled');
|
||||
|
|
@ -277,7 +296,6 @@ define([
|
|||
$('#btn-prev-change').addClass('disabled');
|
||||
$('#btn-next-change').addClass('disabled');
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
onPrevChange: function() {
|
||||
|
|
@ -289,17 +307,23 @@ define([
|
|||
},
|
||||
|
||||
onAcceptCurrentChange: function() {
|
||||
var me = this;
|
||||
if (this.api) {
|
||||
this.api.asc_AcceptChanges(dateChange[0]);
|
||||
setTimeout(function () {
|
||||
me.api.asc_GetNextRevisionsChange();
|
||||
}, 10);
|
||||
}
|
||||
this.api.asc_GetNextRevisionsChange();
|
||||
},
|
||||
|
||||
onRejectCurrentChange: function() {
|
||||
var me = this;
|
||||
if (this.api) {
|
||||
this.api.asc_RejectChanges(dateChange[0]);
|
||||
setTimeout(function () {
|
||||
me.api.asc_GetNextRevisionsChange();
|
||||
}, 10);
|
||||
}
|
||||
this.api.asc_GetNextRevisionsChange();
|
||||
},
|
||||
|
||||
updateInfoChange: function() {
|
||||
|
|
@ -308,9 +332,11 @@ define([
|
|||
$('#current-change #date-change').empty();
|
||||
$('#current-change #user-name').empty();
|
||||
$('#current-change #text-change').empty();
|
||||
$('#current-change').css('display', 'none');
|
||||
$('#current-change').hide();
|
||||
$('#btn-goto-change').hide();
|
||||
$('#btn-delete-change').hide();
|
||||
} else {
|
||||
$('#current-change').css('display', 'block');
|
||||
$('#current-change').show();
|
||||
this.initChange();
|
||||
}
|
||||
}
|
||||
|
|
@ -322,10 +348,11 @@ define([
|
|||
_.each(data, function (item) {
|
||||
var changetext = '', proptext = '',
|
||||
value = item.get_Value(),
|
||||
movetype = item.get_MoveType(),
|
||||
settings = false;
|
||||
switch (item.get_Type()) {
|
||||
case Asc.c_oAscRevisionsChangeType.TextAdd:
|
||||
changetext = me.textInserted;
|
||||
changetext = (movetype==Asc.c_oAscRevisionsMove.NoMove) ? me.textInserted : me.textParaMoveTo;
|
||||
if (typeof value == 'object') {
|
||||
_.each(value, function (obj) {
|
||||
if (typeof obj === 'string')
|
||||
|
|
@ -352,7 +379,7 @@ define([
|
|||
}
|
||||
break;
|
||||
case Asc.c_oAscRevisionsChangeType.TextRem:
|
||||
changetext = me.textDeleted;
|
||||
changetext = (movetype==Asc.c_oAscRevisionsMove.NoMove) ? me.textDeleted : (item.is_MovedDown() ? me.textParaMoveFromDown : me.textParaMoveFromUp);
|
||||
if (typeof value == 'object') {
|
||||
_.each(value, function (obj) {
|
||||
if (typeof obj === 'string')
|
||||
|
|
@ -490,14 +517,25 @@ define([
|
|||
changetext += '</b>';
|
||||
changetext += proptext;
|
||||
break;
|
||||
case Asc.c_oAscRevisionsChangeType.TablePr:
|
||||
changetext = me.textTableChanged;
|
||||
break;
|
||||
case Asc.c_oAscRevisionsChangeType.RowsAdd:
|
||||
changetext = me.textTableRowsAdd;
|
||||
break;
|
||||
case Asc.c_oAscRevisionsChangeType.RowsRem:
|
||||
changetext = me.textTableRowsDel;
|
||||
break;
|
||||
|
||||
}
|
||||
var date = (item.get_DateTime() == '') ? new Date() : new Date(item.get_DateTime()),
|
||||
user = item.get_UserName();
|
||||
user = item.get_UserName(),
|
||||
goto = (item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveTo || item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveFrom);
|
||||
date = me.dateToLocaleTimeString(date);
|
||||
var editable = (item.get_UserId() == _userId);
|
||||
|
||||
|
||||
arr.push({date: date, user: user, changetext: changetext});
|
||||
arr.push({date: date, user: user, changetext: changetext, goto: goto, editable: editable});
|
||||
});
|
||||
arrChangeReview = arr;
|
||||
dateChange = data;
|
||||
|
|
@ -533,6 +571,61 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
onGotoNextChange: function() {
|
||||
if (this.api) {
|
||||
this.api.asc_FollowRevisionMove(dateChange[0]);
|
||||
}
|
||||
},
|
||||
|
||||
onChangeEditUsers: function(users) {
|
||||
editUsers = users;
|
||||
},
|
||||
|
||||
initEditUsers: function() {
|
||||
var usersArray = [];
|
||||
_.each(editUsers, function(item){
|
||||
var fio = item.asc_getUserName().split(' ');
|
||||
var initials = fio[0].substring(0, 1).toUpperCase();
|
||||
if (fio.length > 1) {
|
||||
initials += fio[fio.length - 1].substring(0, 1).toUpperCase();
|
||||
}
|
||||
if(!item.asc_getView()) {
|
||||
var userAttr = {
|
||||
color: item.asc_getColor(),
|
||||
id: item.asc_getId(),
|
||||
idOriginal: item.asc_getIdOriginal(),
|
||||
name: item.asc_getUserName(),
|
||||
view: item.asc_getView(),
|
||||
initial: initials
|
||||
};
|
||||
if(item.asc_getIdOriginal() == _userId) {
|
||||
usersArray.unshift(userAttr);
|
||||
} else {
|
||||
usersArray.push(userAttr);
|
||||
}
|
||||
}
|
||||
});
|
||||
var userSort = _.chain(usersArray).groupBy('idOriginal').value();
|
||||
var templateUserItem = _.template([
|
||||
'<% _.each(users, function (user) { %>',
|
||||
'<li id="<%= user[0].id %>" class="<% if (user[0].view) {%> viewmode <% } %> item-content">' +
|
||||
'<div class="user-name item-inner">' +
|
||||
'<div class="color" style="background-color: <%= user[0].color %>;"><%= user[0].initial %></div>'+
|
||||
'<label><%= user[0].name %></label>' +
|
||||
'<% if (user.length>1) { %><label class="length"> (<%= user.length %>)</label><% } %>' +
|
||||
'</div>'+
|
||||
'</li>',
|
||||
'<% }); %>'].join(''));
|
||||
var templateUserList = _.template(
|
||||
'<div class="item-content"><div class="item-inner">' +
|
||||
this.textEditUser +
|
||||
'</div></div>' +
|
||||
'<ul>' +
|
||||
templateUserItem({users: userSort}) +
|
||||
'</ul>');
|
||||
$('#user-list').html(templateUserList());
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -587,7 +680,14 @@ define([
|
|||
textEquation: 'Equation',
|
||||
textImage: 'Image',
|
||||
textChart: 'Chart',
|
||||
textShape: 'Shape'
|
||||
textShape: 'Shape',
|
||||
textTableChanged: '<b>Table Settings Changed</b>',
|
||||
textTableRowsAdd: '<b>Table Rows Added<b/>',
|
||||
textTableRowsDel: '<b>Table Rows Deleted<b/>',
|
||||
textParaMoveTo: '<b>Moved:</b>',
|
||||
textParaMoveFromUp: '<b>Moved Up:</b>',
|
||||
textParaMoveFromDown: '<b>Moved Down:</b>',
|
||||
textEditUser: 'Document is currently being edited by several users.'
|
||||
|
||||
}
|
||||
})(), DE.Controllers.Collaboration || {}))
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ define([
|
|||
_fastCoAuthTips = [],
|
||||
_actionSheets = [],
|
||||
_isEdit = false,
|
||||
_canAcceptChanges = false,
|
||||
_canReview = false,
|
||||
_inRevisionChange = false,
|
||||
_menuPos = [],
|
||||
_timer = 0;
|
||||
|
|
@ -100,7 +100,7 @@ define([
|
|||
|
||||
setMode: function (mode) {
|
||||
_isEdit = mode.isEdit;
|
||||
_canAcceptChanges = mode.canReview && !mode.isReviewOnly;
|
||||
_canReview = mode.canReview;
|
||||
},
|
||||
|
||||
// When our application is ready, lets get started
|
||||
|
|
@ -152,6 +152,11 @@ define([
|
|||
var getCollaboration = DE.getController('Collaboration');
|
||||
getCollaboration.showModal();
|
||||
getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false);
|
||||
} else if('reviewchange' == eventName) {
|
||||
var getCollaboration = DE.getController('Collaboration');
|
||||
getCollaboration.showModal();
|
||||
getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false);
|
||||
getCollaboration.getView('Collaboration').showPage('#change-view', false);
|
||||
} else if ('showActionSheet' == eventName && _actionSheets.length > 0) {
|
||||
_.delay(function () {
|
||||
_.each(_actionSheets, function (action) {
|
||||
|
|
@ -491,11 +496,18 @@ define([
|
|||
});
|
||||
}
|
||||
|
||||
if (_canAcceptChanges && _inRevisionChange) {
|
||||
menuItems.push({
|
||||
caption: me.menuReview,
|
||||
event: 'review'
|
||||
});
|
||||
if (_canReview) {
|
||||
if (_inRevisionChange) {
|
||||
menuItems.push({
|
||||
caption: me.menuReviewChange,
|
||||
event: 'reviewchange'
|
||||
});
|
||||
} else {
|
||||
menuItems.push({
|
||||
caption: me.menuReview,
|
||||
event: 'review'
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -540,7 +552,8 @@ define([
|
|||
menuReview: 'Review',
|
||||
menuMerge: 'Merge Cells',
|
||||
menuSplit: 'Split Cell',
|
||||
menuDeleteTable: 'Delete Table'
|
||||
menuDeleteTable: 'Delete Table',
|
||||
menuReviewChange: 'Review Change'
|
||||
}
|
||||
})(), DE.Controllers.DocumentHolder || {}))
|
||||
});
|
||||
|
|
@ -761,6 +761,8 @@ define([
|
|||
if (me.api) {
|
||||
me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(me.onSendThemeColors, me));
|
||||
me.api.asc_registerCallback('asc_onDownloadUrl', _.bind(me.onDownloadUrl, me));
|
||||
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -778,8 +780,6 @@ define([
|
|||
/** coauthoring begin **/
|
||||
me.api.asc_registerCallback('asc_onCollaborativeChanges', _.bind(me.onCollaborativeChanges, me));
|
||||
me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
|
||||
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
/** coauthoring end **/
|
||||
|
||||
if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
|
||||
|
|
@ -795,6 +795,10 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
returnUserCount: function() {
|
||||
return this._state.usersCount;
|
||||
},
|
||||
|
||||
onExternalMessage: function(msg) {
|
||||
if (msg && msg.msg) {
|
||||
msg.msg = (msg.msg).toString();
|
||||
|
|
|
|||
|
|
@ -253,8 +253,9 @@ define([
|
|||
if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
|
||||
$('#settings-document').addClass('disabled');
|
||||
}
|
||||
if(!_canReview) {
|
||||
$('#settings-collaboration').hide();
|
||||
var _userCount = DE.getController('Main').returnUserCount();
|
||||
if (_userCount > 0) {
|
||||
$('#settings-collaboration').show();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ define([
|
|||
this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo'));
|
||||
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this));
|
||||
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this));
|
||||
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this))
|
||||
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this));
|
||||
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
|
||||
},
|
||||
|
||||
|
|
@ -171,11 +173,11 @@ define([
|
|||
},
|
||||
|
||||
activateControls: function() {
|
||||
$('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').removeClass('disabled');
|
||||
$('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document, #toolbar-collaboration').removeClass('disabled');
|
||||
},
|
||||
|
||||
activateViewControls: function() {
|
||||
$('#toolbar-search, #document-back').removeClass('disabled');
|
||||
$('#toolbar-search, #document-back, #toolbar-collaboration').removeClass('disabled');
|
||||
},
|
||||
|
||||
deactivateEditControls: function() {
|
||||
|
|
@ -192,6 +194,21 @@ define([
|
|||
DE.getController('Settings').hideModal();
|
||||
},
|
||||
|
||||
displayCollaboration: function(users) {
|
||||
if(users !== undefined) {
|
||||
var length = 0;
|
||||
_.each(users, function (item) {
|
||||
if (!item.asc_getView())
|
||||
length++;
|
||||
});
|
||||
if (length > 0) {
|
||||
$('#toolbar-collaboration').show();
|
||||
} else {
|
||||
$('#toolbar-collaboration').hide();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
dlgLeaveTitleText : 'You leave the application',
|
||||
dlgLeaveMsgText : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
|
||||
leaveButtonText : 'Leave this Page',
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div id="collaboration-root-view">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="center sliding categories center-collaboration"><%= scope.textCollaboration %></div>
|
||||
<div class="center sliding"><%= scope.textCollaboration %></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>
|
||||
|
|
@ -11,12 +11,18 @@
|
|||
<div class="page-content">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<a id="list-edit-users" class="item-link" data-page="#edit-users-view">
|
||||
<div class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textEditUsers %></div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="reviewing-settings" class="item-link" data-page="#reviewing-settings-view">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-doc-setup"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textReviewing %></div>
|
||||
</div>
|
||||
|
|
@ -46,9 +52,6 @@
|
|||
<ul>
|
||||
<li>
|
||||
<div id="settings-review" class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-review"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textReview %></div>
|
||||
<div class="item-after">
|
||||
|
|
@ -63,9 +66,6 @@
|
|||
<li>
|
||||
<a id="display-mode-settings" class="item-link" data-page="#display-mode-view">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-doc-setup"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textDisplayMode %></div>
|
||||
</div>
|
||||
|
|
@ -75,9 +75,6 @@
|
|||
<li>
|
||||
<a id="change-settings" class="item-link" data-page="#change-view">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-doc-setup"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textChange %></div>
|
||||
</div>
|
||||
|
|
@ -86,9 +83,6 @@
|
|||
</li>
|
||||
<li>
|
||||
<div id="settings-accept-all" class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-review"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textAcceptAllChanges %></div>
|
||||
</div>
|
||||
|
|
@ -96,9 +90,6 @@
|
|||
</li>
|
||||
<li>
|
||||
<div id="settings-reject-all" class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-review"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textRejectAllChanges %></div>
|
||||
</div>
|
||||
|
|
@ -176,12 +167,15 @@
|
|||
<div class="page-content">
|
||||
<div class="content-block block-btn">
|
||||
<span class="next-prev">
|
||||
<a href="#" id="btn-prev-change" class="link icon-only"><i class="icon icon-review"></i></a>
|
||||
<a href="#" id="btn-next-change" class="link icon-only"><i class="icon icon-review"></i></a>
|
||||
<a href="#" id="btn-prev-change" class="link icon-only"><i class="icon icon-prev-change"></i></a>
|
||||
<a href="#" id="btn-next-change" class="link icon-only"><i class="icon icon-next-change"></i></a>
|
||||
</span>
|
||||
<span class="right-buttons">
|
||||
<a href="#" id="btn-goto-change" class="link icon-only" style="display: none;"><i class="icon icon-goto"></i></a>
|
||||
<span class="accept-reject">
|
||||
<a href="#" id="btn-accept-change" class="link icon-only"><i class="icon icon-review"></i></a>
|
||||
<a href="#" id="btn-reject-change" class="link icon-only"><i class="icon icon-review"></i></a>
|
||||
<a href="#" id="btn-accept-change" class="link icon-only"><i class="icon icon-accept"></i></a>
|
||||
<a href="#" id="btn-reject-change" class="link icon-only"><i class="icon icon-reject"></i></a>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
<div id="current-change" class="content-block block-description">
|
||||
|
|
@ -192,4 +186,23 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Editable Users view -->
|
||||
<div id="edit-users-view">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
|
||||
<div class="center sliding"><%= scope.textEditUsers %></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>
|
||||
</div>
|
||||
<div class="pages">
|
||||
<div class="page page-change" data-page="edit-users-view">
|
||||
<div class="page-content">
|
||||
<div id="user-list" class="list-block">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -57,9 +57,9 @@
|
|||
<% } %>
|
||||
<% if(phone) {%>
|
||||
<li>
|
||||
<div id="settings-collaboration" class="item-content">
|
||||
<div id="settings-collaboration" class="item-content" style="display: none;">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-review"></i>
|
||||
<i class="icon icon-collaboration"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textCollaboration %></div>
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
<a id="settings-advanced" class="item-link" data-page="#settings-advanced-view">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-doc-setup"></i>
|
||||
<i class="icon icon-settings"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textAdvancedSettings %></div>
|
||||
|
|
@ -217,9 +217,9 @@
|
|||
</ul>
|
||||
</div>
|
||||
<div class="content-block-title"><%= scope.textFormat %></div>
|
||||
<div class="list-block media-list">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<li class="media-item">
|
||||
<a id="settings-document-format" class="item-link item-content" data-page="#settings-document-formats-view">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="list-block media-list">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<a id="color-schemes" class="item-link item-content" data-page="#color-schemes-view">
|
||||
|
|
|
|||
|
|
@ -20,11 +20,6 @@
|
|||
<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>
|
||||
|
|
@ -47,6 +42,11 @@
|
|||
<i class="icon icon-search"></i>
|
||||
</a>
|
||||
<% } %>
|
||||
<% if (!phone) { %>
|
||||
<a href="#" id="toolbar-collaboration" class="link icon-only disabled" style="display: none;">
|
||||
<i class="icon icon-collaboration"></i>
|
||||
</a>
|
||||
<% } %>
|
||||
<a href="#" id="toolbar-settings" class="link icon-only">
|
||||
<i class="icon icon-settings"></i>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -151,7 +151,8 @@ define([
|
|||
textMarkup: 'Markup',
|
||||
textFinal: 'Final',
|
||||
textOriginal: 'Original',
|
||||
textChange: 'Change'
|
||||
textChange: 'Review Change',
|
||||
textEditUsers: 'Users'
|
||||
|
||||
}
|
||||
})(), DE.Views.Collaboration || {}))
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ define([
|
|||
|
||||
setMode: function (mode) {
|
||||
if (mode.isEdit) {
|
||||
$('#toolbar-edit, #toolbar-add, #toolbar-undo, #toolbar-redo, #toolbar-collaboration').show();
|
||||
$('#toolbar-edit, #toolbar-add, #toolbar-undo, #toolbar-redo').show();
|
||||
} else if (mode.canEdit && mode.canRequestEditRights){
|
||||
$('#toolbar-edit-document').show();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
"DE.Controllers.DocumentHolder.textColumns": "Columns",
|
||||
"DE.Controllers.DocumentHolder.textRows": "Rows",
|
||||
"DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table",
|
||||
"DE.Controllers.DocumentHolder.menuReviewChange": "Review Change",
|
||||
"DE.Controllers.EditContainer.textChart": "Chart",
|
||||
"DE.Controllers.EditContainer.textFooter": "Footer",
|
||||
"DE.Controllers.EditContainer.textHeader": "Header",
|
||||
|
|
@ -204,7 +205,7 @@
|
|||
"DE.Controllers.Collaboration.textSmallCaps": "Small caps",
|
||||
"DE.Controllers.Collaboration.textPosition": "Position",
|
||||
"DE.Controllers.Collaboration.textShd": "Background color",
|
||||
"DE.Controllers.Collaboration.textContextual": "Don\'t add interval between paragraphs of the same style",
|
||||
"DE.Controllers.Collaboration.textContextual": "Don't add interval between paragraphs of the same style",
|
||||
"DE.Controllers.Collaboration.textNoContextual": "Add interval between paragraphs of the same style",
|
||||
"DE.Controllers.Collaboration.textIndentLeft": "Indent left",
|
||||
"DE.Controllers.Collaboration.textIndentRight": "Indent right",
|
||||
|
|
@ -217,8 +218,8 @@
|
|||
"DE.Controllers.Collaboration.textKeepNext": "Keep with next",
|
||||
"DE.Controllers.Collaboration.textKeepLines": "Keep lines together",
|
||||
"DE.Controllers.Collaboration.textNoBreakBefore": "No page break before",
|
||||
"DE.Controllers.Collaboration.textNoKeepNext": "Don\'t keep with next",
|
||||
"DE.Controllers.Collaboration.textNoKeepLines": "Don\'t keep lines together",
|
||||
"DE.Controllers.Collaboration.textNoKeepNext": "Don't keep with next",
|
||||
"DE.Controllers.Collaboration.textNoKeepLines": "Don't keep lines together",
|
||||
"DE.Controllers.Collaboration.textLineSpacing": "Line Spacing: ",
|
||||
"DE.Controllers.Collaboration.textMultiple": "multiple",
|
||||
"DE.Controllers.Collaboration.textAtLeast": "at least",
|
||||
|
|
@ -234,6 +235,13 @@
|
|||
"DE.Controllers.Collaboration.textImage": "Image",
|
||||
"DE.Controllers.Collaboration.textChart": "Chart",
|
||||
"DE.Controllers.Collaboration.textShape": "Shape",
|
||||
"DE.Controllers.Collaboration.textTableChanged": "<b>Table Settings Changed</b>",
|
||||
"DE.Controllers.Collaboration.textTableRowsAdd": "<b>Table Rows Added<b/>",
|
||||
"DE.Controllers.Collaboration.textTableRowsDel": "<b>Table Rows Deleted<b/>",
|
||||
"DE.Controllers.Collaboration.textParaMoveTo": "<b>Moved:</b>",
|
||||
"DE.Controllers.Collaboration.textParaMoveFromUp": "<b>Moved Up:</b>",
|
||||
"DE.Controllers.Collaboration.textParaMoveFromDown": "<b>Moved Down:</b>",
|
||||
"DE.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.",
|
||||
"DE.Views.AddImage.textAddress": "Address",
|
||||
"DE.Views.AddImage.textBack": "Back",
|
||||
"DE.Views.AddImage.textFromLibrary": "Picture from Library",
|
||||
|
|
@ -489,5 +497,6 @@
|
|||
"DE.Views.Collaboration.textMarkup": "Markup",
|
||||
"DE.Views.Collaboration.textFinal": "Final",
|
||||
"DE.Views.Collaboration.textOriginal": "Original",
|
||||
"DE.Views.Collaboration.textChange": "Change"
|
||||
"DE.Views.Collaboration.textChange": "Review Change",
|
||||
"DE.Views.Collaboration.textEditUsers": "Users"
|
||||
}
|
||||
|
|
@ -5844,7 +5844,8 @@ html:not(.phone) #editor-navbar.navbar .right a + a,
|
|||
html:not(.phone) #editor-navbar.navbar .left a + a {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.phone.ios .container-edit .navbar:before {
|
||||
.phone.ios .container-edit .navbar:before,
|
||||
.phone.ios .container-collaboration .navbar:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
|
@ -5859,20 +5860,24 @@ html:not(.phone) #editor-navbar.navbar .left a + a {
|
|||
-webkit-transform-origin: 50% 0%;
|
||||
transform-origin: 50% 0%;
|
||||
}
|
||||
html.pixel-ratio-2 .phone.ios .container-edit .navbar:before {
|
||||
html.pixel-ratio-2 .phone.ios .container-edit .navbar:before,
|
||||
html.pixel-ratio-2 .phone.ios .container-collaboration .navbar:before {
|
||||
-webkit-transform: scaleY(0.5);
|
||||
transform: scaleY(0.5);
|
||||
}
|
||||
html.pixel-ratio-3 .phone.ios .container-edit .navbar:before {
|
||||
html.pixel-ratio-3 .phone.ios .container-edit .navbar:before,
|
||||
html.pixel-ratio-3 .phone.ios .container-collaboration .navbar:before {
|
||||
-webkit-transform: scaleY(0.33);
|
||||
transform: scaleY(0.33);
|
||||
}
|
||||
.phone.ios .container-edit .page-content .list-block:first-child {
|
||||
.phone.ios .container-edit .page-content .list-block:first-child,
|
||||
.phone.ios .container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.container-edit.popover,
|
||||
.container-add.popover,
|
||||
.container-settings.popover {
|
||||
.container-settings.popover,
|
||||
.container-collaboration.popover {
|
||||
width: 360px;
|
||||
}
|
||||
.settings.popup .list-block ul,
|
||||
|
|
@ -6269,6 +6274,8 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
margin: 0;
|
||||
max-width: 100%;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
.page-change #user-name {
|
||||
font-size: 17px;
|
||||
|
|
@ -6286,29 +6293,34 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
.page-change #text-change {
|
||||
color: #000000;
|
||||
font-size: 15px;
|
||||
line-height: 18px;
|
||||
line-height: 20px;
|
||||
margin: 0;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.page-change .block-btn {
|
||||
.page-change .block-btn,
|
||||
.page-change .content-block.block-btn:first-child {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
margin: 26px 0;
|
||||
}
|
||||
.page-change .block-btn #btn-next-change,
|
||||
.page-change .block-btn #btn-reject-change {
|
||||
.page-change .content-block.block-btn:first-child #btn-next-change,
|
||||
.page-change .block-btn #btn-reject-change,
|
||||
.page-change .content-block.block-btn:first-child #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
}
|
||||
.page-change .block-btn .link {
|
||||
height: 48px;
|
||||
width: 48px;
|
||||
display: inline-block;
|
||||
.page-change .block-btn #btn-goto-change,
|
||||
.page-change .content-block.block-btn:first-child #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.page-change .block-btn .link .icon {
|
||||
background-position: center;
|
||||
height: 48px;
|
||||
width: 48px;
|
||||
.page-change .block-btn .right-buttons,
|
||||
.page-change .content-block.block-btn:first-child .right-buttons {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .link,
|
||||
.page-change .content-block.block-btn:first-child .link {
|
||||
display: inline-block;
|
||||
}
|
||||
.navbar .center-collaboration {
|
||||
display: flex;
|
||||
|
|
@ -6318,6 +6330,9 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
position: absolute;
|
||||
right: 10px;
|
||||
}
|
||||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.tablet .searchbar.document.replace .center .searchbar:first-child {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
@ -6794,6 +6809,41 @@ i.icon.icon-format-html {
|
|||
height: 30px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2262px%22%20height%3D%2262px%22%20viewBox%3D%220%200%2062%2062%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M24.993%2C38.689L11.34%2C32.753v-3.288l13.653-5.91v3.872l-9.523%2C3.641l9.523%2C3.777V38.689z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M27.09%2C41.298l4.931-20.596h2.867l-4.986%2C20.596H27.09z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M36.986%2C38.703v-3.845l9.536-3.75L36.986%2C27.4v-3.817l13.666%2C5.91v3.261L36.986%2C38.703z%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M9%2018L2%2011L1%2012L9%2020L23%206L22%205L9%2018Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-reject {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5%204L4%205L11%2012L4%2019L5%2020L12%2013L19%2020L20%2019L13%2012L20%205L19%204L12%2011L5%204Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-next-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23clipnext)%22%3E%3Cpath%20d%3D%22M16%2012L6.5%2022L7.5%2023L18%2012L7.5%201L6.5%202L16%2012Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22clipnext%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-prev-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23clipprev)%22%3E%3Cpath%20d%3D%22M8%2012L17.5%202L16.5%201L6%2012L16.5%2023L17.5%2022L8%2012Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22clipprev%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-goto {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%203H3V21H21V3ZM3%202H2V3V21V22H3H21H22V21V3V2H21H3ZM15.2929%208H9V7H16.5H17V7.5V15H16V8.70711L7.35355%2017.3536L6.64645%2016.6464L15.2929%208Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-delete-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9.5%201H9V1.5V3H5H4H2V4H4V21V22H5H19H20V21V4H22V3H20H19H15V1.5V1H14.5H9.5ZM14%203V2H10V3H14ZM5%204H19V21H5V4ZM7%206H8V19H7V6ZM11%206H10V19H11V6ZM13%206H14V19H13V6ZM17%206H16V19H17V6Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.label-switch input[type="checkbox"]:checked + .checkbox {
|
||||
background: #446995;
|
||||
}
|
||||
|
|
@ -6909,3 +6959,26 @@ html.pixel-ratio-3 .numbers li {
|
|||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
#user-list .item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
#user-list .length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
#user-list .color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: #373737;
|
||||
font-weight: 500;
|
||||
}
|
||||
#user-list ul:before {
|
||||
content: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5628,12 +5628,14 @@ a.item-link,
|
|||
[disabled] [disabled] {
|
||||
opacity: 1;
|
||||
}
|
||||
.phone.android .container-edit .page-content .list-block:first-child {
|
||||
.phone.android .container-edit .page-content .list-block:first-child,
|
||||
.phone.android .container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.container-edit.popover,
|
||||
.container-add.popover,
|
||||
.container-settings.popover {
|
||||
.container-settings.popover,
|
||||
.container-collaboration.popover {
|
||||
width: 360px;
|
||||
}
|
||||
.settings.popup .list-block,
|
||||
|
|
@ -5868,6 +5870,8 @@ html.phone .document-menu .list-block .item-link {
|
|||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
margin: 0;
|
||||
max-width: 100%;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
.page-change #user-name {
|
||||
font-size: 17px;
|
||||
|
|
@ -5885,7 +5889,7 @@ html.phone .document-menu .list-block .item-link {
|
|||
.page-change #text-change {
|
||||
color: #000000;
|
||||
font-size: 15px;
|
||||
line-height: 18px;
|
||||
line-height: 20px;
|
||||
margin: 0;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
|
@ -5901,21 +5905,22 @@ html.phone .document-menu .list-block .item-link {
|
|||
.page-change .block-btn #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
}
|
||||
.page-change .block-btn #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.page-change .block-btn .right-buttons {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .link {
|
||||
display: inline-block;
|
||||
}
|
||||
.page-change .block-btn .link .icon {
|
||||
background-position: center;
|
||||
height: 48px;
|
||||
width: 48px;
|
||||
}
|
||||
.navbar .center-collaboration {
|
||||
text-align: center;
|
||||
}
|
||||
.container-collaboration .navbar .right.close-collaboration {
|
||||
position: absolute;
|
||||
right: 5px;
|
||||
}
|
||||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.tablet .searchbar.document.replace .center > .replace {
|
||||
display: flex;
|
||||
}
|
||||
|
|
@ -6028,6 +6033,11 @@ i.icon.icon-spellcheck {
|
|||
height: 22px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%201L3%2015H4.2L5.97686%2010H11.0231L11.6768%2011.8394C11.955%2011.5504%2012.262%2011.2892%2012.593%2011.0605L9%201H8ZM8.5%202.9L10.6678%209H6.33223L8.5%202.9Z%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%2021C18.7614%2021%2021%2018.7614%2021%2016C21%2013.2386%2018.7614%2011%2016%2011C13.2386%2011%2011%2013.2386%2011%2016C11%2018.7614%2013.2386%2021%2016%2021ZM15.3536%2018.3536L19.3536%2014.3536L18.6464%2013.6464L15%2017.2929L13.3536%2015.6464L12.6464%2016.3536L14.6464%2018.3536L15%2018.7071L15.3536%2018.3536Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20fill%3D%22%23446995%22%3E%3Cg%3E%3Cpath%20d%3D%22M11.8%2C3l0.4%2C2c0.1%2C0.7%2C0.6%2C1.1%2C1.3%2C1.1c0.3%2C0%2C0.5-0.1%2C0.7-0.2l1.9-1.2l1.1%2C1.1l-1.1%2C1.8C15.8%2C8%2C15.8%2C8.5%2C16%2C8.9c0.2%2C0.4%2C0.5%2C0.7%2C1%2C0.8l2.1%2C0.5v1.6L17%2C12.2c-0.5%2C0.1-0.8%2C0.4-1%2C0.8c-0.2%2C0.4-0.1%2C0.9%2C0.1%2C1.2l1.2%2C1.9l-1.1%2C1.1l-1.8-1.1c-0.2-0.2-0.5-0.2-0.8-0.2c-0.6%2C0-1.2%2C0.5-1.3%2C1.1l-0.5%2C2.1h-1.6l-0.4-2C9.7%2C16.4%2C9.2%2C16%2C8.5%2C16c-0.3%2C0-0.5%2C0.1-0.7%2C0.2l-1.9%2C1.2l-1.1-1.1l1.1-1.8c0.3-0.4%2C0.3-0.9%2C0.1-1.3c-0.2-0.4-0.5-0.7-1-0.8l-2.1-0.5v-1.6l2-0.4c0.5-0.1%2C0.8-0.4%2C1-0.8C6.1%2C8.7%2C6%2C8.2%2C5.8%2C7.9l-1-2l1.1-1.1l1.8%2C1.1C8%2C6.1%2C8.2%2C6.2%2C8.5%2C6.2c0.6%2C0%2C1.2-0.5%2C1.3-1.1L10.3%2C3H11.8%20M11%2C15.5c2.5%2C0%2C4.5-2%2C4.5-4.5s-2-4.5-4.5-4.5s-4.5%2C2-4.5%2C4.5S8.5%2C15.5%2C11%2C15.5%20M12.1%2C2H9.9C9.6%2C2%2C9.4%2C2.2%2C9.3%2C2.5L8.8%2C4.9c0%2C0.2-0.2%2C0.3-0.3%2C0.3s-0.1%2C0-0.2-0.1L6.2%2C3.8C6.1%2C3.7%2C6%2C3.7%2C5.8%2C3.7c-0.1%2C0-0.3%2C0-0.4%2C0.1L3.8%2C5.4c-0.1%2C0.2-0.2%2C0.5%2C0%2C0.8l1.3%2C2.1c0.1%2C0.2%2C0.1%2C0.4-0.2%2C0.5L2.5%2C9.3C2.2%2C9.4%2C2%2C9.6%2C2%2C9.9v2.2c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.6l2.4%2C0.5c0.3%2C0.1%2C0.4%2C0.3%2C0.2%2C0.5l-1.3%2C2.1c-0.2%2C0.2-0.1%2C0.6%2C0.1%2C0.8l1.6%2C1.6c0.1%2C0.1%2C0.3%2C0.2%2C0.4%2C0.2s0.2%2C0%2C0.3-0.1L8.3%2C17c0.1-0.1%2C0.1-0.1%2C0.2-0.1s0.3%2C0.1%2C0.3%2C0.3l0.5%2C2.3C9.4%2C19.8%2C9.6%2C20%2C9.9%2C20h2.2c0.3%2C0%2C0.5-0.2%2C0.6-0.5l0.5-2.4c0-0.2%2C0.1-0.3%2C0.3-0.3c0.1%2C0%2C0.1%2C0%2C0.2%2C0.1l2.1%2C1.3c0.1%2C0.1%2C0.2%2C0.1%2C0.3%2C0.1c0.2%2C0%2C0.3-0.1%2C0.4-0.2l1.6-1.6c0.2-0.2%2C0.2-0.5%2C0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5%2C0.2-0.5l2.4-0.5c0.3-0.1%2C0.5-0.3%2C0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2%2C0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2c-0.1%2C0-0.2%2C0-0.3%2C0.1l-2.1%2C1.3C13.6%2C5%2C13.6%2C5%2C13.5%2C5c-0.1%2C0-0.3-0.1-0.3-0.3l-0.5-2.2C12.6%2C2.2%2C12.4%2C2%2C12.1%2C2L12.1%2C2z%20M11%2C14.5c-1.9%2C0-3.5-1.6-3.5-3.5S9.1%2C7.5%2C11%2C7.5s3.5%2C1.6%2C3.5%2C3.5S12.9%2C14.5%2C11%2C14.5L11%2C14.5z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-review {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
|
|
@ -6282,6 +6292,41 @@ i.icon.icon-format-html {
|
|||
height: 30px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2262px%22%20height%3D%2262px%22%20viewBox%3D%220%200%2062%2062%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M24.993%2C38.689L11.34%2C32.753v-3.288l13.653-5.91v3.872l-9.523%2C3.641l9.523%2C3.777V38.689z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M27.09%2C41.298l4.931-20.596h2.867l-4.986%2C20.596H27.09z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M36.986%2C38.703v-3.845l9.536-3.75L36.986%2C27.4v-3.817l13.666%2C5.91v3.261L36.986%2C38.703z%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M9%2018L2%2011L1%2012L9%2020L23%206L22%205L9%2018Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-reject {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5%204L4%205L11%2012L4%2019L5%2020L12%2013L19%2020L20%2019L13%2012L20%205L19%204L12%2011L5%204Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-next-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23clipnext)%22%3E%3Cpath%20d%3D%22M16%2012L6.5%2022L7.5%2023L18%2012L7.5%201L6.5%202L16%2012Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22clipnext%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-prev-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23clipprev)%22%3E%3Cpath%20d%3D%22M8%2012L17.5%202L16.5%201L6%2012L16.5%2023L17.5%2022L8%2012Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22clipprev%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-goto {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%203H3V21H21V3ZM3%202H2V3V21V22H3H21H22V21V3V2H21H3ZM15.2929%208H9V7H16.5H17V7.5V15H16V8.70711L7.35355%2017.3536L6.64645%2016.6464L15.2929%208Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-delete-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9.5%201H9V1.5V3H5H4H2V4H4V21V22H5H19H20V21V4H22V3H20H19H15V1.5V1H14.5H9.5ZM14%203V2H10V3H14ZM5%204H19V21H5V4ZM7%206H8V19H7V6ZM11%206H10V19H11V6ZM13%206H14V19H13V6ZM17%206H16V19H17V6Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.navbar i.icon.icon-undo {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
@ -6332,6 +6377,11 @@ i.icon.icon-format-html {
|
|||
height: 22px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2022%2022%22%20fill%3D%22%23fff%22%3E%3Cg%3E%3Cpolygon%20points%3D%2210.9%2C16.9%202%2C8.1%204.1%2C6%2011.1%2C12.8%2017.9%2C6%2020%2C8.1%2011.2%2C16.9%2011.1%2C17%20%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.navbar i.icon.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M14.9912%206C14.9912%208.18203%2014.4464%209.76912%2013.7789%2010.7492C13.101%2011.7447%2012.4042%2012%2011.9912%2012C11.5782%2012%2010.8814%2011.7447%2010.2035%2010.7492C9.53601%209.76912%208.99121%208.18203%208.99121%206C8.99121%204.23017%2010.4571%203%2011.9912%203C13.5254%203%2014.9912%204.23017%2014.9912%206ZM13.4917%2013.6397C13.0059%2013.8771%2012.4989%2014%2011.9912%2014C11.4861%2014%2010.9817%2013.8784%2010.4983%2013.6434C8.53188%2014.3681%206.94518%2015.0737%205.78927%2015.7768C4.10512%2016.8011%204%2017.4079%204%2017.5C4%2017.7664%204.1014%2018.3077%205.27104%2018.8939C6.50029%2019.5099%208.64545%2019.9999%2012%2020C15.3546%2020%2017.4997%2019.5099%2018.7289%2018.8939C19.8986%2018.3078%2020%2017.7664%2020%2017.5C20%2017.4079%2019.8949%2016.8011%2018.2107%2015.7768C17.0529%2015.0726%2015.4627%2014.3657%2013.4917%2013.6397ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.sailfish i.icon.icon-text-align-center {
|
||||
background-color: transparent;
|
||||
-webkit-mask-image: none;
|
||||
|
|
@ -6683,3 +6733,26 @@ html.pixel-ratio-3 .numbers li {
|
|||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
#user-list .item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
#user-list .length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
#user-list .color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: #373737;
|
||||
font-weight: 400;
|
||||
}
|
||||
#user-list ul:before {
|
||||
content: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -239,4 +239,34 @@ input, textarea {
|
|||
.modal.modal-in {
|
||||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
||||
#user-list {
|
||||
.item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
.item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
.color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: @initialEditUser;
|
||||
font-weight: 500;
|
||||
|
||||
}
|
||||
ul:before {
|
||||
content: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -226,4 +226,33 @@ input, textarea {
|
|||
.modal.modal-in {
|
||||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
||||
#user-list {
|
||||
.item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
.item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
.color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: @initialEditUser;
|
||||
font-weight: 400;
|
||||
}
|
||||
ul:before {
|
||||
content: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -410,4 +410,40 @@ i.icon {
|
|||
height: 30px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="62px" height="62px" viewBox="0 0 62 62"><defs><style>.cls-1{fill:@{themeColor};}</style></defs><g><path class="cls-1" d="M24.993,38.689L11.34,32.753v-3.288l13.653-5.91v3.872l-9.523,3.641l9.523,3.777V38.689z" /><path class="cls-1" d="M27.09,41.298l4.931-20.596h2.867l-4.986,20.596H27.09z" /><path class="cls-1" d="M36.986,38.703v-3.845l9.536-3.75L36.986,27.4v-3.817l13.666,5.91v3.261L36.986,38.703z" /></g></svg>');
|
||||
}
|
||||
// Collaboration
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M15.9912 6C15.9912 8.34102 15.4074 10.1346 14.6055 11.3121C13.7983 12.4974 12.8249 13 11.9912 13C11.1575 13 10.1841 12.4974 9.37695 11.3121C8.57501 10.1346 7.99121 8.34102 7.99121 6C7.99121 3.61508 9.96974 2 11.9912 2C14.0127 2 15.9912 3.61508 15.9912 6ZM14.5015 12.9506C13.7365 13.6361 12.8649 14 11.9912 14C11.1195 14 10.2499 13.6378 9.48619 12.9554C7.78363 13.6081 6.36015 14.2591 5.26963 14.9224C3.55256 15.9667 3 16.8326 3 17.5C3 18.2545 3.4257 19.0877 4.82302 19.7879C6.25015 20.5031 8.57272 20.9999 12 21C15.4273 21 17.7499 20.5031 19.177 19.7879C20.5743 19.0877 21 18.2545 21 17.5C21 16.8326 20.4474 15.9667 18.7304 14.9224C17.6372 14.2575 16.2095 13.605 14.5015 12.9506ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{themeColor}"/></g></svg>');
|
||||
}
|
||||
&.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9 18L2 11L1 12L9 20L23 6L22 5L9 18Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-reject {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5 4L4 5L11 12L4 19L5 20L12 13L19 20L20 19L13 12L20 5L19 4L12 11L5 4Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-next-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clipnext)"><path d="M16 12L6.5 22L7.5 23L18 12L7.5 1L6.5 2L16 12Z" fill="@{themeColor}"/></g><defs><clipPath id="clipnext"><rect width="24" height="24" fill="none"/></clipPath></defs></svg>');
|
||||
}
|
||||
&.icon-prev-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clipprev)"><path d="M8 12L17.5 2L16.5 1L6 12L16.5 23L17.5 22L8 12Z" fill="@{themeColor}"/></g><defs><clipPath id="clipprev"><rect width="24" height="24" fill="none"/></clipPath></defs></svg>');
|
||||
}
|
||||
&.icon-goto {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M21 3H3V21H21V3ZM3 2H2V3V21V22H3H21H22V21V3V2H21H3ZM15.2929 8H9V7H16.5H17V7.5V15H16V8.70711L7.35355 17.3536L6.64645 16.6464L15.2929 8Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-delete-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M9.5 1H9V1.5V3H5H4H2V4H4V21V22H5H19H20V21V4H22V3H20H19H15V1.5V1H14.5H9.5ZM14 3V2H10V3H14ZM5 4H19V21H5V4ZM7 6H8V19H7V6ZM11 6H10V19H11V6ZM13 6H14V19H13V6ZM17 6H16V19H17V6Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
}
|
||||
|
|
@ -45,6 +45,11 @@ i.icon {
|
|||
height: 22px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M8 1L3 15H4.2L5.97686 10H11.0231L11.6768 11.8394C11.955 11.5504 12.262 11.2892 12.593 11.0605L9 1H8ZM8.5 2.9L10.6678 9H6.33223L8.5 2.9Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M16 21C18.7614 21 21 18.7614 21 16C21 13.2386 18.7614 11 16 11C13.2386 11 11 13.2386 11 16C11 18.7614 13.2386 21 16 21ZM15.3536 18.3536L19.3536 14.3536L18.6464 13.6464L15 17.2929L13.3536 15.6464L12.6464 16.3536L14.6464 18.3536L15 18.7071L15.3536 18.3536Z"/></g></svg>');
|
||||
}
|
||||
&.icon-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M11.8,3l0.4,2c0.1,0.7,0.6,1.1,1.3,1.1c0.3,0,0.5-0.1,0.7-0.2l1.9-1.2l1.1,1.1l-1.1,1.8C15.8,8,15.8,8.5,16,8.9c0.2,0.4,0.5,0.7,1,0.8l2.1,0.5v1.6L17,12.2c-0.5,0.1-0.8,0.4-1,0.8c-0.2,0.4-0.1,0.9,0.1,1.2l1.2,1.9l-1.1,1.1l-1.8-1.1c-0.2-0.2-0.5-0.2-0.8-0.2c-0.6,0-1.2,0.5-1.3,1.1l-0.5,2.1h-1.6l-0.4-2C9.7,16.4,9.2,16,8.5,16c-0.3,0-0.5,0.1-0.7,0.2l-1.9,1.2l-1.1-1.1l1.1-1.8c0.3-0.4,0.3-0.9,0.1-1.3c-0.2-0.4-0.5-0.7-1-0.8l-2.1-0.5v-1.6l2-0.4c0.5-0.1,0.8-0.4,1-0.8C6.1,8.7,6,8.2,5.8,7.9l-1-2l1.1-1.1l1.8,1.1C8,6.1,8.2,6.2,8.5,6.2c0.6,0,1.2-0.5,1.3-1.1L10.3,3H11.8 M11,15.5c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.5-4.5s-4.5,2-4.5,4.5S8.5,15.5,11,15.5 M12.1,2H9.9C9.6,2,9.4,2.2,9.3,2.5L8.8,4.9c0,0.2-0.2,0.3-0.3,0.3s-0.1,0-0.2-0.1L6.2,3.8C6.1,3.7,6,3.7,5.8,3.7c-0.1,0-0.3,0-0.4,0.1L3.8,5.4c-0.1,0.2-0.2,0.5,0,0.8l1.3,2.1c0.1,0.2,0.1,0.4-0.2,0.5L2.5,9.3C2.2,9.4,2,9.6,2,9.9v2.2c0,0.3,0.2,0.5,0.5,0.6l2.4,0.5c0.3,0.1,0.4,0.3,0.2,0.5l-1.3,2.1c-0.2,0.2-0.1,0.6,0.1,0.8l1.6,1.6c0.1,0.1,0.3,0.2,0.4,0.2s0.2,0,0.3-0.1L8.3,17c0.1-0.1,0.1-0.1,0.2-0.1s0.3,0.1,0.3,0.3l0.5,2.3C9.4,19.8,9.6,20,9.9,20h2.2c0.3,0,0.5-0.2,0.6-0.5l0.5-2.4c0-0.2,0.1-0.3,0.3-0.3c0.1,0,0.1,0,0.2,0.1l2.1,1.3c0.1,0.1,0.2,0.1,0.3,0.1c0.2,0,0.3-0.1,0.4-0.2l1.6-1.6c0.2-0.2,0.2-0.5,0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5,0.2-0.5l2.4-0.5c0.3-0.1,0.5-0.3,0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2,0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2c-0.1,0-0.2,0-0.3,0.1l-2.1,1.3C13.6,5,13.6,5,13.5,5c-0.1,0-0.3-0.1-0.3-0.3l-0.5-2.2C12.6,2.2,12.4,2,12.1,2L12.1,2z M11,14.5c-1.9,0-3.5-1.6-3.5-3.5S9.1,7.5,11,7.5s3.5,1.6,3.5,3.5S12.9,14.5,11,14.5L11,14.5z"/></g></svg>');
|
||||
}
|
||||
&.icon-review {
|
||||
width: 22px;
|
||||
height: 28px;
|
||||
|
|
@ -332,6 +337,42 @@ i.icon {
|
|||
height: 30px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="62px" height="62px" viewBox="0 0 62 62"><defs><style>.cls-1{fill:@{themeColor};}</style></defs><g><path class="cls-1" d="M24.993,38.689L11.34,32.753v-3.288l13.653-5.91v3.872l-9.523,3.641l9.523,3.777V38.689z" /><path class="cls-1" d="M27.09,41.298l4.931-20.596h2.867l-4.986,20.596H27.09z" /><path class="cls-1" d="M36.986,38.703v-3.845l9.536-3.75L36.986,27.4v-3.817l13.666,5.91v3.261L36.986,38.703z" /></g></svg>');
|
||||
}
|
||||
// Collaboration
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M15.9912 6C15.9912 8.34102 15.4074 10.1346 14.6055 11.3121C13.7983 12.4974 12.8249 13 11.9912 13C11.1575 13 10.1841 12.4974 9.37695 11.3121C8.57501 10.1346 7.99121 8.34102 7.99121 6C7.99121 3.61508 9.96974 2 11.9912 2C14.0127 2 15.9912 3.61508 15.9912 6ZM14.5015 12.9506C13.7365 13.6361 12.8649 14 11.9912 14C11.1195 14 10.2499 13.6378 9.48619 12.9554C7.78363 13.6081 6.36015 14.2591 5.26963 14.9224C3.55256 15.9667 3 16.8326 3 17.5C3 18.2545 3.4257 19.0877 4.82302 19.7879C6.25015 20.5031 8.57272 20.9999 12 21C15.4273 21 17.7499 20.5031 19.177 19.7879C20.5743 19.0877 21 18.2545 21 17.5C21 16.8326 20.4474 15.9667 18.7304 14.9224C17.6372 14.2575 16.2095 13.605 14.5015 12.9506ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{themeColor}"/></g></svg>');
|
||||
}
|
||||
&.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9 18L2 11L1 12L9 20L23 6L22 5L9 18Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-reject {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5 4L4 5L11 12L4 19L5 20L12 13L19 20L20 19L13 12L20 5L19 4L12 11L5 4Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-next-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clipnext)"><path d="M16 12L6.5 22L7.5 23L18 12L7.5 1L6.5 2L16 12Z" fill="@{themeColor}"/></g><defs><clipPath id="clipnext"><rect width="24" height="24" fill="none"/></clipPath></defs></svg>');
|
||||
}
|
||||
&.icon-prev-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clipprev)"><path d="M8 12L17.5 2L16.5 1L6 12L16.5 23L17.5 22L8 12Z" fill="@{themeColor}"/></g><defs><clipPath id="clipprev"><rect width="24" height="24" fill="none"/></clipPath></defs></svg>');
|
||||
}
|
||||
&.icon-goto {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M21 3H3V21H21V3ZM3 2H2V3V21V22H3H21H22V21V3V2H21H3ZM15.2929 8H9V7H16.5H17V7.5V15H16V8.70711L7.35355 17.3536L6.64645 16.6464L15.2929 8Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-delete-change {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M9.5 1H9V1.5V3H5H4H2V4H4V21V22H5H19H20V21V4H22V3H20H19H15V1.5V1H14.5H9.5ZM14 3V2H10V3H14ZM5 4H19V21H5V4ZM7 6H8V19H7V6ZM11 6H10V19H11V6ZM13 6H14V19H13V6ZM17 6H16V19H17V6Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
}
|
||||
|
||||
// Overwrite color for toolbar
|
||||
|
|
@ -388,5 +429,10 @@ i.icon {
|
|||
height: 22px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{navBarIconColor}"><g><polygon points="10.9,16.9 2,8.1 4.1,6 11.1,12.8 17.9,6 20,8.1 11.2,16.9 11.1,17 "/></g></svg>');
|
||||
}
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M14.9912 6C14.9912 8.18203 14.4464 9.76912 13.7789 10.7492C13.101 11.7447 12.4042 12 11.9912 12C11.5782 12 10.8814 11.7447 10.2035 10.7492C9.53601 9.76912 8.99121 8.18203 8.99121 6C8.99121 4.23017 10.4571 3 11.9912 3C13.5254 3 14.9912 4.23017 14.9912 6ZM13.4917 13.6397C13.0059 13.8771 12.4989 14 11.9912 14C11.4861 14 10.9817 13.8784 10.4983 13.6434C8.53188 14.3681 6.94518 15.0737 5.78927 15.7768C4.10512 16.8011 4 17.4079 4 17.5C4 17.7664 4.1014 18.3077 5.27104 18.8939C6.50029 19.5099 8.64545 19.9999 12 20C15.3546 20 17.4997 19.5099 18.7289 18.8939C19.8986 18.3078 20 17.7664 20 17.5C20 17.4079 19.8949 16.8011 18.2107 15.7768C17.0529 15.0726 15.4627 14.3657 13.4917 13.6397ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{navBarIconColor}"/></svg>');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -147,7 +147,8 @@ require([
|
|||
'AddShape',
|
||||
'AddImage',
|
||||
'AddLink',
|
||||
'AddSlide'
|
||||
'AddSlide',
|
||||
'Collaboration'
|
||||
]
|
||||
});
|
||||
|
||||
|
|
@ -214,7 +215,8 @@ require([
|
|||
'presentationeditor/mobile/app/controller/add/AddShape',
|
||||
'presentationeditor/mobile/app/controller/add/AddImage',
|
||||
'presentationeditor/mobile/app/controller/add/AddLink',
|
||||
'presentationeditor/mobile/app/controller/add/AddSlide'
|
||||
'presentationeditor/mobile/app/controller/add/AddSlide',
|
||||
'presentationeditor/mobile/app/controller/Collaboration'
|
||||
|
||||
], function() {
|
||||
window.compareVersions = true;
|
||||
|
|
|
|||
|
|
@ -158,7 +158,8 @@ require([
|
|||
'AddShape',
|
||||
'AddImage',
|
||||
'AddLink',
|
||||
'AddSlide'
|
||||
'AddSlide',
|
||||
'Collaboration'
|
||||
]
|
||||
});
|
||||
|
||||
|
|
@ -225,7 +226,8 @@ require([
|
|||
'presentationeditor/mobile/app/controller/add/AddShape',
|
||||
'presentationeditor/mobile/app/controller/add/AddImage',
|
||||
'presentationeditor/mobile/app/controller/add/AddLink',
|
||||
'presentationeditor/mobile/app/controller/add/AddSlide'
|
||||
'presentationeditor/mobile/app/controller/add/AddSlide',
|
||||
'presentationeditor/mobile/app/controller/Collaboration'
|
||||
], function() {
|
||||
app.start();
|
||||
});
|
||||
|
|
|
|||
217
apps/presentationeditor/mobile/app/controller/Collaboration.js
Normal file
217
apps/presentationeditor/mobile/app/controller/Collaboration.js
Normal file
|
|
@ -0,0 +1,217 @@
|
|||
/*
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2010-2019
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
|
||||
* street, Riga, Latvia, EU, LV-1050.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Collaboration.js
|
||||
* Presentation Editor
|
||||
*
|
||||
* Created by Julia Svinareva on 31/5/19
|
||||
* Copyright (c) 2019 Ascensio System SIA. All rights reserved.
|
||||
*
|
||||
*/
|
||||
define([
|
||||
'core',
|
||||
'jquery',
|
||||
'underscore',
|
||||
'backbone',
|
||||
'presentationeditor/mobile/app/view/Collaboration'
|
||||
], function (core, $, _, Backbone) {
|
||||
'use strict';
|
||||
|
||||
PE.Controllers.Collaboration = Backbone.Controller.extend(_.extend((function() {
|
||||
// Private
|
||||
var rootView,
|
||||
_userId,
|
||||
editUsers = [];
|
||||
|
||||
return {
|
||||
models: [],
|
||||
collections: [],
|
||||
views: [
|
||||
'Collaboration'
|
||||
],
|
||||
|
||||
initialize: function() {
|
||||
var me = this;
|
||||
me.addListeners({
|
||||
'Collaboration': {
|
||||
'page:show' : me.onPageShow
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
setApi: function(api) {
|
||||
this.api = api;
|
||||
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onChangeEditUsers, this));
|
||||
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onChangeEditUsers, this));
|
||||
},
|
||||
|
||||
onLaunch: function () {
|
||||
this.createView('Collaboration').render();
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.appConfig = mode;
|
||||
_userId = mode.user.id;
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
showModal: function() {
|
||||
var me = this,
|
||||
isAndroid = Framework7.prototype.device.android === true,
|
||||
modalView,
|
||||
mainView = PE.getController('Editor').getView('Editor').f7View;
|
||||
|
||||
uiApp.closeModal();
|
||||
|
||||
if (Common.SharedSettings.get('phone')) {
|
||||
modalView = $$(uiApp.pickerModal(
|
||||
'<div class="picker-modal settings container-collaboration">' +
|
||||
'<div class="view collaboration-root-view navbar-through">' +
|
||||
this.getView('Collaboration').rootLayout() +
|
||||
'</div>' +
|
||||
'</div>'
|
||||
)).on('opened', function () {
|
||||
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
|
||||
me.api.asc_OnShowContextMenu()
|
||||
}
|
||||
}).on('close', function (e) {
|
||||
mainView.showNavbar();
|
||||
}).on('closed', function () {
|
||||
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
|
||||
me.api.asc_OnHideContextMenu()
|
||||
}
|
||||
});
|
||||
mainView.hideNavbar();
|
||||
} else {
|
||||
modalView = uiApp.popover(
|
||||
'<div class="popover settings container-collaboration">' +
|
||||
'<div class="popover-angle"></div>' +
|
||||
'<div class="popover-inner">' +
|
||||
'<div class="content-block">' +
|
||||
'<div class="view popover-view collaboration-root-view navbar-through">' +
|
||||
this.getView('Collaboration').rootLayout() +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>',
|
||||
$$('#toolbar-collaboration')
|
||||
);
|
||||
}
|
||||
|
||||
if (Framework7.prototype.device.android === true) {
|
||||
$$('.view.collaboration-root-view.navbar-through').removeClass('navbar-through').addClass('navbar-fixed');
|
||||
$$('.view.collaboration-root-view .navbar').prependTo('.view.collaboration-root-view > .pages > .page');
|
||||
}
|
||||
|
||||
rootView = uiApp.addView('.collaboration-root-view', {
|
||||
dynamicNavbar: true,
|
||||
domCache: true
|
||||
});
|
||||
|
||||
Common.NotificationCenter.trigger('collaborationcontainer:show');
|
||||
this.onPageShow(this.getView('Collaboration'));
|
||||
|
||||
PE.getController('Toolbar').getView('Toolbar').hideSearch();
|
||||
},
|
||||
|
||||
rootView : function() {
|
||||
return rootView;
|
||||
},
|
||||
|
||||
onPageShow: function(view, pageId) {
|
||||
var me = this;
|
||||
|
||||
if('#edit-users-view' == pageId) {
|
||||
me.initEditUsers();
|
||||
Common.Utils.addScrollIfNeed('.page[data-page=edit-users-view]', '.page[data-page=edit-users-view] .page-content');
|
||||
} else {
|
||||
}
|
||||
},
|
||||
|
||||
onChangeEditUsers: function(users) {
|
||||
editUsers = users;
|
||||
},
|
||||
|
||||
initEditUsers: function() {
|
||||
var usersArray = [];
|
||||
_.each(editUsers, function(item){
|
||||
var fio = item.asc_getUserName().split(' ');
|
||||
var initials = fio[0].substring(0, 1).toUpperCase();
|
||||
if (fio.length > 1) {
|
||||
initials += fio[fio.length - 1].substring(0, 1).toUpperCase();
|
||||
}
|
||||
if(!item.asc_getView()) {
|
||||
var userAttr = {
|
||||
color: item.asc_getColor(),
|
||||
id: item.asc_getId(),
|
||||
idOriginal: item.asc_getIdOriginal(),
|
||||
name: item.asc_getUserName(),
|
||||
view: item.asc_getView(),
|
||||
initial: initials
|
||||
};
|
||||
if(item.asc_getIdOriginal() == _userId) {
|
||||
usersArray.unshift(userAttr);
|
||||
} else {
|
||||
usersArray.push(userAttr);
|
||||
}
|
||||
}
|
||||
});
|
||||
var userSort = _.chain(usersArray).groupBy('idOriginal').value();
|
||||
var templateUserItem = _.template([
|
||||
'<% _.each(users, function (user) { %>',
|
||||
'<li id="<%= user[0].id %>" class="<% if (user[0].view) {%> viewmode <% } %> item-content">' +
|
||||
'<div class="user-name item-inner">' +
|
||||
'<div class="color" style="background-color: <%= user[0].color %>;"><%= user[0].initial %></div>'+
|
||||
'<label><%= user[0].name %></label>' +
|
||||
'<% if (user.length>1) { %><label class="length"> (<%= user.length %>)</label><% } %>' +
|
||||
'</div>'+
|
||||
'</li>',
|
||||
'<% }); %>'].join(''));
|
||||
var templateUserList = _.template(
|
||||
'<div class="item-content"><div class="item-inner">' +
|
||||
this.textEditUser +
|
||||
'</div></div>' +
|
||||
'<ul>' +
|
||||
templateUserItem({users: userSort}) +
|
||||
'</ul>');
|
||||
$('#user-list').html(templateUserList());
|
||||
},
|
||||
|
||||
|
||||
textEditUser: 'Document is currently being edited by several users.'
|
||||
|
||||
}
|
||||
})(), PE.Controllers.Collaboration || {}))
|
||||
});
|
||||
|
|
@ -703,6 +703,8 @@ define([
|
|||
if (me.api) {
|
||||
me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(me.onSendThemeColors, me));
|
||||
me.api.asc_registerCallback('asc_onDownloadUrl', _.bind(me.onDownloadUrl, me));
|
||||
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -725,8 +727,6 @@ define([
|
|||
/** coauthoring begin **/
|
||||
me.api.asc_registerCallback('asc_onCollaborativeChanges', _.bind(me.onCollaborativeChanges, me));
|
||||
me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
|
||||
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
/** coauthoring end **/
|
||||
|
||||
if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
|
||||
|
|
@ -1153,6 +1153,10 @@ define([
|
|||
this._state.usersCount = length;
|
||||
},
|
||||
|
||||
returnUserCount: function() {
|
||||
return this._state.usersCount;
|
||||
},
|
||||
|
||||
onDocumentName: function(name) {
|
||||
// this.getApplication().getController('Viewport').getView('Common.Views.Header').setDocumentCaption(name);
|
||||
this.updateWindowTitle(true);
|
||||
|
|
|
|||
|
|
@ -163,6 +163,12 @@ define([
|
|||
$(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me));
|
||||
$('#page-settings-view #slide-size-block li').single('click', _.bind(me._onSlideSize, me));
|
||||
$('#settings-print').single('click', _.bind(me._onPrint, me));
|
||||
$('#settings-collaboration').single('click', _.bind(me.onCollaboration, me));
|
||||
|
||||
var _userCount = PE.getController('Main').returnUserCount();
|
||||
if (_userCount > 0) {
|
||||
$('#settings-collaboration').show();
|
||||
}
|
||||
|
||||
Common.Utils.addScrollIfNeed('.page[data-page=settings-setup-view]', '.page[data-page=settings-setup-view] .page-content');
|
||||
Common.Utils.addScrollIfNeed('.page[data-page=settings-download-view]', '.page[data-page=settings-download-view] .page-content');
|
||||
|
|
@ -187,6 +193,10 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
onCollaboration: function() {
|
||||
PE.getController('Collaboration').showModal();
|
||||
},
|
||||
|
||||
initPageColorSchemes: function () {
|
||||
$('#color-schemes-content').html(templateInsert);
|
||||
$('.color-schemes-menu').on('click', _.bind(this.onColorSchemaClick, this));
|
||||
|
|
|
|||
|
|
@ -80,6 +80,8 @@ define([
|
|||
this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo'));
|
||||
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this));
|
||||
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this));
|
||||
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this))
|
||||
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this));
|
||||
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
|
||||
},
|
||||
|
||||
|
|
@ -175,11 +177,11 @@ define([
|
|||
},
|
||||
|
||||
activateControls: function() {
|
||||
$('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').removeClass('disabled');
|
||||
$('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document, #toolbar-collaboration').removeClass('disabled');
|
||||
},
|
||||
|
||||
activateViewControls: function() {
|
||||
$('#toolbar-preview, #toolbar-search, #document-back').removeClass('disabled');
|
||||
$('#toolbar-preview, #toolbar-search, #document-back, #toolbar-collaboration').removeClass('disabled');
|
||||
},
|
||||
|
||||
deactivateEditControls: function() {
|
||||
|
|
@ -196,6 +198,21 @@ define([
|
|||
PE.getController('Settings').hideModal();
|
||||
},
|
||||
|
||||
displayCollaboration: function(users) {
|
||||
if(users !== undefined) {
|
||||
var length = 0;
|
||||
_.each(users, function (item) {
|
||||
if (!item.asc_getView())
|
||||
length++;
|
||||
});
|
||||
if (length > 0) {
|
||||
$('#toolbar-collaboration').show();
|
||||
} else {
|
||||
$('#toolbar-collaboration').hide();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
dlgLeaveTitleText : 'You leave the application',
|
||||
dlgLeaveMsgText : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
|
||||
leaveButtonText : 'Leave this Page',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
<!-- Root view -->
|
||||
<div id="collaboration-root-view">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="center sliding"><%= scope.textCollaboration %></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">
|
||||
<div class="page" data-page="collaboration-root-view">
|
||||
<div class="page-content">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<a id="list-edit-users" class="item-link" data-page="#edit-users-view">
|
||||
<div class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textEditUsers %></div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Editable Users view -->
|
||||
<div id="edit-users-view">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
|
||||
<div class="center sliding"><%= scope.textEditUsers %></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>
|
||||
</div>
|
||||
<div class="pages">
|
||||
<div class="page page-change" data-page="edit-users-view">
|
||||
<div class="page-content">
|
||||
<div id="user-list" class="list-block">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -25,6 +25,18 @@
|
|||
</a>
|
||||
</li>
|
||||
<% } %>
|
||||
<% if(phone) {%>
|
||||
<li>
|
||||
<div id="settings-collaboration" class="item-content" style="display: none;">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-collaboration"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textCollaboration %></div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<% } %>
|
||||
<li>
|
||||
<a id="settings-presentation-setup" class="item-link">
|
||||
<div class="item-content">
|
||||
|
|
@ -339,7 +351,7 @@
|
|||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="list-block media-list">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<a id="color-schemes" class="item-link item-content">
|
||||
|
|
|
|||
|
|
@ -45,6 +45,11 @@
|
|||
<i class="icon icon-search"></i>
|
||||
</a>
|
||||
<% } %>
|
||||
<% if (!phone) { %>
|
||||
<a href="#" id="toolbar-collaboration" class="link icon-only disabled" style="display: none;">
|
||||
<i class="icon icon-collaboration"></i>
|
||||
</a>
|
||||
<% } %>
|
||||
<a href="#" id="toolbar-settings" class="link icon-only">
|
||||
<i class="icon icon-settings"></i>
|
||||
</a>
|
||||
|
|
|
|||
149
apps/presentationeditor/mobile/app/view/Collaboration.js
Normal file
149
apps/presentationeditor/mobile/app/view/Collaboration.js
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
/*
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2010-2019
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
|
||||
* street, Riga, Latvia, EU, LV-1050.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Collaboration.js
|
||||
* Presentation Editor
|
||||
*
|
||||
* Created by Julia Svinareva on 31/5/19
|
||||
* Copyright (c) 2019 Ascensio System SIA. All rights reserved.
|
||||
*
|
||||
*/
|
||||
|
||||
define([
|
||||
'text!presentationeditor/mobile/app/template/Collaboration.template',
|
||||
'jquery',
|
||||
'underscore',
|
||||
'backbone'
|
||||
], function (settingsTemplate, $, _, Backbone) {
|
||||
'use strict';
|
||||
|
||||
PE.Views.Collaboration = Backbone.View.extend(_.extend((function() {
|
||||
// private
|
||||
|
||||
return {
|
||||
|
||||
template: _.template(settingsTemplate),
|
||||
|
||||
events: {
|
||||
//
|
||||
},
|
||||
|
||||
initialize: function() {
|
||||
Common.NotificationCenter.on('collaborationcontainer:show', _.bind(this.initEvents, this));
|
||||
this.on('page:show', _.bind(this.updateItemHandlers, this));
|
||||
},
|
||||
|
||||
initEvents: function () {
|
||||
var me = this;
|
||||
|
||||
Common.Utils.addScrollIfNeed('.view[data-page=collaboration-root-view] .pages', '.view[data-page=collaboration-root-view] .page');
|
||||
me.updateItemHandlers();
|
||||
},
|
||||
|
||||
initControls: function() {
|
||||
//
|
||||
},
|
||||
|
||||
// Render layout
|
||||
render: function() {
|
||||
this.layout = $('<div/>').append(this.template({
|
||||
android : Common.SharedSettings.get('android'),
|
||||
phone : Common.SharedSettings.get('phone'),
|
||||
orthography: Common.SharedSettings.get('sailfish'),
|
||||
scope : this
|
||||
}));
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
updateItemHandlers: function () {
|
||||
var selectorsDynamicPage = [
|
||||
'.page[data-page=collaboration-root-view]'
|
||||
].map(function (selector) {
|
||||
return selector + ' a.item-link[data-page]';
|
||||
}).join(', ');
|
||||
|
||||
$(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this));
|
||||
},
|
||||
|
||||
onItemClick: function (e) {
|
||||
var $target = $(e.currentTarget),
|
||||
page = $target.data('page');
|
||||
|
||||
if (page && page.length > 0 ) {
|
||||
this.showPage(page);
|
||||
}
|
||||
},
|
||||
|
||||
rootLayout: function () {
|
||||
if (this.layout) {
|
||||
var $layour = this.layout.find('#collaboration-root-view'),
|
||||
isPhone = Common.SharedSettings.get('phone');
|
||||
|
||||
return $layour.html();
|
||||
}
|
||||
|
||||
return '';
|
||||
},
|
||||
|
||||
showPage: function(templateId, animate) {
|
||||
var rootView = PE.getController('Collaboration').rootView();
|
||||
|
||||
if (rootView && this.layout) {
|
||||
var $content = this.layout.find(templateId);
|
||||
|
||||
// Android fix for navigation
|
||||
if (Framework7.prototype.device.android) {
|
||||
$content.find('.page').append($content.find('.navbar'));
|
||||
}
|
||||
|
||||
rootView.router.load({
|
||||
content: $content.html(),
|
||||
animatePages: animate !== false
|
||||
});
|
||||
|
||||
this.fireEvent('page:show', [this, templateId]);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
|
||||
textCollaboration: 'Collaboration',
|
||||
textСomments: 'Сomments',
|
||||
textBack: 'Back',
|
||||
textEditUsers: 'Users'
|
||||
|
||||
}
|
||||
})(), PE.Views.Collaboration || {}))
|
||||
});
|
||||
|
|
@ -121,6 +121,7 @@ define([
|
|||
$layour.find('#settings-readermode').hide();
|
||||
$layour.find('#settings-search .item-title').text(this.textFindAndReplace)
|
||||
} else {
|
||||
$layour.find('#settings-application').hide();
|
||||
$layour.find('#settings-spellcheck').hide();
|
||||
$layour.find('#settings-presentation-setup').hide();
|
||||
$layour.find('#settings-readermode input:checkbox')
|
||||
|
|
@ -246,7 +247,8 @@ define([
|
|||
textCentimeter: 'Centimeter',
|
||||
textPoint: 'Point',
|
||||
textInch: 'Inch',
|
||||
textColorSchemes: 'Color Schemes'
|
||||
textColorSchemes: 'Color Schemes',
|
||||
textCollaboration: 'Collaboration'
|
||||
}
|
||||
})(), PE.Views.Settings || {}))
|
||||
});
|
||||
|
|
@ -64,7 +64,8 @@ define([
|
|||
"click #toolbar-add" : "showInserts",
|
||||
"click #toolbar-settings" : "showSettings",
|
||||
"click #toolbar-preview" : "showPreview",
|
||||
"click #toolbar-edit-document": "editDocument"
|
||||
"click #toolbar-edit-document": "editDocument",
|
||||
"click #toolbar-collaboration" : "showCollaboration"
|
||||
},
|
||||
|
||||
// Set innerHTML and get the references to the DOM elements
|
||||
|
|
@ -159,6 +160,11 @@ define([
|
|||
Common.Gateway.requestEditRights();
|
||||
},
|
||||
|
||||
//Collaboration
|
||||
showCollaboration: function () {
|
||||
PE.getController('Collaboration').showModal();
|
||||
},
|
||||
|
||||
textBack: 'Back'
|
||||
}
|
||||
})(), PE.Views.Toolbar || {}))
|
||||
|
|
|
|||
|
|
@ -226,6 +226,7 @@
|
|||
"PE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application",
|
||||
"PE.Controllers.Toolbar.leaveButtonText": "Leave this Page",
|
||||
"PE.Controllers.Toolbar.stayButtonText": "Stay on this Page",
|
||||
"PE.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.",
|
||||
"PE.Views.AddImage.textAddress": "Address",
|
||||
"PE.Views.AddImage.textBack": "Back",
|
||||
"PE.Views.AddImage.textFromLibrary": "Picture from Library",
|
||||
|
|
@ -474,5 +475,10 @@
|
|||
"PE.Views.Settings.textPresentSettings": "Presentation Settings",
|
||||
"PE.Views.Settings.textColorSchemes": "Color Schemes",
|
||||
"PE.Views.Settings.unknownText": "Unknown",
|
||||
"PE.Views.Toolbar.textBack": "Back"
|
||||
"PE.Views.Settings.textCollaboration": "Collaboration",
|
||||
"PE.Views.Toolbar.textBack": "Back",
|
||||
"PE.Views.Collaboration.textCollaboration": "Collaboration",
|
||||
"PE.Views.Collaboration.textСomments": "Сomments",
|
||||
"PE.Views.Collaboration.textBack": "Back",
|
||||
"PE.Views.Collaboration.textEditUsers": "Users"
|
||||
}
|
||||
|
|
@ -5844,7 +5844,8 @@ html:not(.phone) #editor-navbar.navbar .right a + a,
|
|||
html:not(.phone) #editor-navbar.navbar .left a + a {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.phone.ios .container-edit .navbar:before {
|
||||
.phone.ios .container-edit .navbar:before,
|
||||
.phone.ios .container-collaboration .navbar:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
|
@ -5859,20 +5860,24 @@ html:not(.phone) #editor-navbar.navbar .left a + a {
|
|||
-webkit-transform-origin: 50% 0%;
|
||||
transform-origin: 50% 0%;
|
||||
}
|
||||
html.pixel-ratio-2 .phone.ios .container-edit .navbar:before {
|
||||
html.pixel-ratio-2 .phone.ios .container-edit .navbar:before,
|
||||
html.pixel-ratio-2 .phone.ios .container-collaboration .navbar:before {
|
||||
-webkit-transform: scaleY(0.5);
|
||||
transform: scaleY(0.5);
|
||||
}
|
||||
html.pixel-ratio-3 .phone.ios .container-edit .navbar:before {
|
||||
html.pixel-ratio-3 .phone.ios .container-edit .navbar:before,
|
||||
html.pixel-ratio-3 .phone.ios .container-collaboration .navbar:before {
|
||||
-webkit-transform: scaleY(0.33);
|
||||
transform: scaleY(0.33);
|
||||
}
|
||||
.phone.ios .container-edit .page-content .list-block:first-child {
|
||||
.phone.ios .container-edit .page-content .list-block:first-child,
|
||||
.phone.ios .container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.container-edit.popover,
|
||||
.container-add.popover,
|
||||
.container-settings.popover {
|
||||
.container-settings.popover,
|
||||
.container-collaboration.popover {
|
||||
width: 360px;
|
||||
}
|
||||
.settings.popup .list-block ul,
|
||||
|
|
@ -6721,6 +6726,11 @@ i.icon.icon-format-otp {
|
|||
height: 30px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3CclipPath%20id%3D%22clip-otp%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%23aa5252%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22otp%22%20clip-path%3D%22url(%23clip-otp)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_33%22%20data-name%3D%22Path%2033%22%20d%3D%22M125.173%2C121h0c-.046-.03-.093-.059-.141-.088a6.133%2C6.133%2C0%2C0%2C0-2.467-.869%2C6.014%2C6.014%2C0%2C0%2C0-4.309%2C1.188%2C6.223%2C6.223%2C0%2C0%2C0-2.892-1.147%2C5.965%2C5.965%2C0%2C0%2C0-4.039%2C1l-.036.024a.176.176%2C0%2C0%2C0-.049.125.145.145%2C0%2C0%2C0%2C.126.158l.019%2C0a.019.019%2C0%2C0%2C0%2C.009%2C0%2C5.781%2C5.781%2C0%2C0%2C1%2C2.005-.111%2C6.41%2C6.41%2C0%2C0%2C1%2C4.782%2C2.669c.06.081.115.076.178%2C0a6.288%2C6.288%2C0%2C0%2C1%2C6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155%2C0%2C0%2C0%2C125.173%2C121Z%22%20transform%3D%22translate(-94.24%20-116)%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_34%22%20data-name%3D%22Path%2034%22%20d%3D%22M126.894%2C125.978a.175.175%2C0%2C0%2C0-.022-.011%2C11.686%2C11.686%2C0%2C0%2C0-4.905-1.082%2C11.924%2C11.924%2C0%2C0%2C0-7.444%2C2.647%2C11.725%2C11.725%2C0%2C0%2C0-5.251-1.245%2C11.884%2C11.884%2C0%2C0%2C0-7.176%2C2.441.229.229%2C0%2C0%2C0-.022.016.217.217%2C0%2C0%2C0-.073.167.2.2%2C0%2C0%2C0%2C.191.211.167.167%2C0%2C0%2C0%2C.037%2C0%2C.118.118%2C0%2C0%2C0%2C.023-.008%2C11.679%2C11.679%2C0%2C0%2C1%2C3.71-.608c3.429%2C0%2C6.486.9%2C8.787%2C3.315a.093.093%2C0%2C0%2C1%2C.016.016.172.172%2C0%2C0%2C0%2C.123.052.18.18%2C0%2C0%2C0%2C.147-.078s.075-.115.111-.171a12.1%2C12.1%2C0%2C0%2C1%2C10.479-5.315c.306%2C0%2C.611.014.912.037l.273.022a.2.2%2C0%2C0%2C0%2C.191-.211A.211.211%2C0%2C0%2C0%2C126.894%2C125.978Z%22%20transform%3D%22translate(-100%20-115.885)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.label-switch input[type="checkbox"]:checked + .checkbox {
|
||||
background: #aa5252;
|
||||
}
|
||||
|
|
@ -6838,3 +6848,26 @@ html.pixel-ratio-3 .numbers li {
|
|||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
#user-list .item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
#user-list .length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
#user-list .color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: #373737;
|
||||
font-weight: 500;
|
||||
}
|
||||
#user-list ul:before {
|
||||
content: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5628,12 +5628,14 @@ a.item-link,
|
|||
[disabled] [disabled] {
|
||||
opacity: 1;
|
||||
}
|
||||
.phone.android .container-edit .page-content .list-block:first-child {
|
||||
.phone.android .container-edit .page-content .list-block:first-child,
|
||||
.phone.android .container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.container-edit.popover,
|
||||
.container-add.popover,
|
||||
.container-settings.popover {
|
||||
.container-settings.popover,
|
||||
.container-collaboration.popover {
|
||||
width: 360px;
|
||||
}
|
||||
.settings.popup .list-block,
|
||||
|
|
@ -6259,6 +6261,11 @@ i.icon.icon-format-otp {
|
|||
height: 30px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3CclipPath%20id%3D%22clip-otp%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%23aa5252%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22otp%22%20clip-path%3D%22url(%23clip-otp)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_33%22%20data-name%3D%22Path%2033%22%20d%3D%22M125.173%2C121h0c-.046-.03-.093-.059-.141-.088a6.133%2C6.133%2C0%2C0%2C0-2.467-.869%2C6.014%2C6.014%2C0%2C0%2C0-4.309%2C1.188%2C6.223%2C6.223%2C0%2C0%2C0-2.892-1.147%2C5.965%2C5.965%2C0%2C0%2C0-4.039%2C1l-.036.024a.176.176%2C0%2C0%2C0-.049.125.145.145%2C0%2C0%2C0%2C.126.158l.019%2C0a.019.019%2C0%2C0%2C0%2C.009%2C0%2C5.781%2C5.781%2C0%2C0%2C1%2C2.005-.111%2C6.41%2C6.41%2C0%2C0%2C1%2C4.782%2C2.669c.06.081.115.076.178%2C0a6.288%2C6.288%2C0%2C0%2C1%2C6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155%2C0%2C0%2C0%2C125.173%2C121Z%22%20transform%3D%22translate(-94.24%20-116)%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_34%22%20data-name%3D%22Path%2034%22%20d%3D%22M126.894%2C125.978a.175.175%2C0%2C0%2C0-.022-.011%2C11.686%2C11.686%2C0%2C0%2C0-4.905-1.082%2C11.924%2C11.924%2C0%2C0%2C0-7.444%2C2.647%2C11.725%2C11.725%2C0%2C0%2C0-5.251-1.245%2C11.884%2C11.884%2C0%2C0%2C0-7.176%2C2.441.229.229%2C0%2C0%2C0-.022.016.217.217%2C0%2C0%2C0-.073.167.2.2%2C0%2C0%2C0%2C.191.211.167.167%2C0%2C0%2C0%2C.037%2C0%2C.118.118%2C0%2C0%2C0%2C.023-.008%2C11.679%2C11.679%2C0%2C0%2C1%2C3.71-.608c3.429%2C0%2C6.486.9%2C8.787%2C3.315a.093.093%2C0%2C0%2C1%2C.016.016.172.172%2C0%2C0%2C0%2C.123.052.18.18%2C0%2C0%2C0%2C.147-.078s.075-.115.111-.171a12.1%2C12.1%2C0%2C0%2C1%2C10.479-5.315c.306%2C0%2C.611.014.912.037l.273.022a.2.2%2C0%2C0%2C0%2C.191-.211A.211.211%2C0%2C0%2C0%2C126.894%2C125.978Z%22%20transform%3D%22translate(-100%20-115.885)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.navbar i.icon.icon-undo {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
|
|
@ -6314,6 +6321,11 @@ i.icon.icon-format-otp {
|
|||
height: 22px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20viewBox%3D%220%200%2022%2022%22%20fill%3D%22%23fff%22%3E%3Cg%3E%3Cpolygon%20points%3D%2210.9%2C16.9%202%2C8.1%204.1%2C6%2011.1%2C12.8%2017.9%2C6%2020%2C8.1%2011.2%2C16.9%2011.1%2C17%20%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.navbar i.icon.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M14.9912%206C14.9912%208.18203%2014.4464%209.76912%2013.7789%2010.7492C13.101%2011.7447%2012.4042%2012%2011.9912%2012C11.5782%2012%2010.8814%2011.7447%2010.2035%2010.7492C9.53601%209.76912%208.99121%208.18203%208.99121%206C8.99121%204.23017%2010.4571%203%2011.9912%203C13.5254%203%2014.9912%204.23017%2014.9912%206ZM13.4917%2013.6397C13.0059%2013.8771%2012.4989%2014%2011.9912%2014C11.4861%2014%2010.9817%2013.8784%2010.4983%2013.6434C8.53188%2014.3681%206.94518%2015.0737%205.78927%2015.7768C4.10512%2016.8011%204%2017.4079%204%2017.5C4%2017.7664%204.1014%2018.3077%205.27104%2018.8939C6.50029%2019.5099%208.64545%2019.9999%2012%2020C15.3546%2020%2017.4997%2019.5099%2018.7289%2018.8939C19.8986%2018.3078%2020%2017.7664%2020%2017.5C20%2017.4079%2019.8949%2016.8011%2018.2107%2015.7768C17.0529%2015.0726%2015.4627%2014.3657%2013.4917%2013.6397ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.sailfish i.icon.icon-text-align-center {
|
||||
background-color: transparent;
|
||||
-webkit-mask-image: none;
|
||||
|
|
@ -6667,3 +6679,26 @@ html.pixel-ratio-3 .numbers li {
|
|||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
#user-list .item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
#user-list .length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
#user-list .color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: #373737;
|
||||
font-weight: 400;
|
||||
}
|
||||
#user-list ul:before {
|
||||
content: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -243,4 +243,34 @@ input, textarea {
|
|||
.modal.modal-in {
|
||||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
||||
#user-list {
|
||||
.item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
.item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
.color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: @initialEditUser;
|
||||
font-weight: 500;
|
||||
|
||||
}
|
||||
ul:before {
|
||||
content: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -231,4 +231,33 @@ input, textarea {
|
|||
.modal.modal-in {
|
||||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
||||
#user-list {
|
||||
.item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
.item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
.color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: @initialEditUser;
|
||||
font-weight: 400;
|
||||
}
|
||||
ul:before {
|
||||
content: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -398,4 +398,11 @@ i.icon {
|
|||
height: 30px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="33" height="33" viewBox="0 0 33 33"><defs><clipPath id="clip-otp"><rect width="33" height="33"/></clipPath><style>.cls-1{fill:@{themeColor};}</style></defs><g id="otp" clip-path="url(#clip-otp)"><rect id="Rectangle_20" data-name="Rectangle 20" width="33" height="33" fill="none"/><path id="Path_33" data-name="Path 33" d="M125.173,121h0c-.046-.03-.093-.059-.141-.088a6.133,6.133,0,0,0-2.467-.869,6.014,6.014,0,0,0-4.309,1.188,6.223,6.223,0,0,0-2.892-1.147,5.965,5.965,0,0,0-4.039,1l-.036.024a.176.176,0,0,0-.049.125.145.145,0,0,0,.126.158l.019,0a.019.019,0,0,0,.009,0,5.781,5.781,0,0,1,2.005-.111,6.41,6.41,0,0,1,4.782,2.669c.06.081.115.076.178,0a6.288,6.288,0,0,1,6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155,0,0,0,125.173,121Z" transform="translate(-94.24 -116)" class="cls-1"/><path id="Path_34" data-name="Path 34" d="M126.894,125.978a.175.175,0,0,0-.022-.011,11.686,11.686,0,0,0-4.905-1.082,11.924,11.924,0,0,0-7.444,2.647,11.725,11.725,0,0,0-5.251-1.245,11.884,11.884,0,0,0-7.176,2.441.229.229,0,0,0-.022.016.217.217,0,0,0-.073.167.2.2,0,0,0,.191.211.167.167,0,0,0,.037,0,.118.118,0,0,0,.023-.008,11.679,11.679,0,0,1,3.71-.608c3.429,0,6.486.9,8.787,3.315a.093.093,0,0,1,.016.016.172.172,0,0,0,.123.052.18.18,0,0,0,.147-.078s.075-.115.111-.171a12.1,12.1,0,0,1,10.479-5.315c.306,0,.611.014.912.037l.273.022a.2.2,0,0,0,.191-.211A.211.211,0,0,0,126.894,125.978Z" transform="translate(-100 -115.885)" class="cls-1"/><g id="Group_5" data-name="Group 5" transform="translate(16 16)"><path id="Path_44" data-name="Path 44" d="M1.011,0H13.989A1.011,1.011,0,0,1,15,1.011V13.989A1.011,1.011,0,0,1,13.989,15H1.011A1.011,1.011,0,0,1,0,13.989V1.011A1.011,1.011,0,0,1,1.011,0Z" class="cls-1"/><path id="Path_39" data-name="Path 39" d="M5.794,13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z" transform="translate(2.742 -0.25)" fill="#fff"/></g></g></svg>');
|
||||
}
|
||||
|
||||
// Collaboration
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M15.9912 6C15.9912 8.34102 15.4074 10.1346 14.6055 11.3121C13.7983 12.4974 12.8249 13 11.9912 13C11.1575 13 10.1841 12.4974 9.37695 11.3121C8.57501 10.1346 7.99121 8.34102 7.99121 6C7.99121 3.61508 9.96974 2 11.9912 2C14.0127 2 15.9912 3.61508 15.9912 6ZM14.5015 12.9506C13.7365 13.6361 12.8649 14 11.9912 14C11.1195 14 10.2499 13.6378 9.48619 12.9554C7.78363 13.6081 6.36015 14.2591 5.26963 14.9224C3.55256 15.9667 3 16.8326 3 17.5C3 18.2545 3.4257 19.0877 4.82302 19.7879C6.25015 20.5031 8.57272 20.9999 12 21C15.4273 21 17.7499 20.5031 19.177 19.7879C20.5743 19.0877 21 18.2545 21 17.5C21 16.8326 20.4474 15.9667 18.7304 14.9224C17.6372 14.2575 16.2095 13.605 14.5015 12.9506ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{themeColor}"/></g></svg>');
|
||||
}
|
||||
}
|
||||
|
|
@ -368,6 +368,13 @@ i.icon {
|
|||
height: 30px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="33" height="33" viewBox="0 0 33 33"><defs><clipPath id="clip-otp"><rect width="33" height="33"/></clipPath><style>.cls-1{fill:@{themeColor};}</style></defs><g id="otp" clip-path="url(#clip-otp)"><rect id="Rectangle_20" data-name="Rectangle 20" width="33" height="33" fill="none"/><path id="Path_33" data-name="Path 33" d="M125.173,121h0c-.046-.03-.093-.059-.141-.088a6.133,6.133,0,0,0-2.467-.869,6.014,6.014,0,0,0-4.309,1.188,6.223,6.223,0,0,0-2.892-1.147,5.965,5.965,0,0,0-4.039,1l-.036.024a.176.176,0,0,0-.049.125.145.145,0,0,0,.126.158l.019,0a.019.019,0,0,0,.009,0,5.781,5.781,0,0,1,2.005-.111,6.41,6.41,0,0,1,4.782,2.669c.06.081.115.076.178,0a6.288,6.288,0,0,1,6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155,0,0,0,125.173,121Z" transform="translate(-94.24 -116)" class="cls-1"/><path id="Path_34" data-name="Path 34" d="M126.894,125.978a.175.175,0,0,0-.022-.011,11.686,11.686,0,0,0-4.905-1.082,11.924,11.924,0,0,0-7.444,2.647,11.725,11.725,0,0,0-5.251-1.245,11.884,11.884,0,0,0-7.176,2.441.229.229,0,0,0-.022.016.217.217,0,0,0-.073.167.2.2,0,0,0,.191.211.167.167,0,0,0,.037,0,.118.118,0,0,0,.023-.008,11.679,11.679,0,0,1,3.71-.608c3.429,0,6.486.9,8.787,3.315a.093.093,0,0,1,.016.016.172.172,0,0,0,.123.052.18.18,0,0,0,.147-.078s.075-.115.111-.171a12.1,12.1,0,0,1,10.479-5.315c.306,0,.611.014.912.037l.273.022a.2.2,0,0,0,.191-.211A.211.211,0,0,0,126.894,125.978Z" transform="translate(-100 -115.885)" class="cls-1"/><g id="Group_5" data-name="Group 5" transform="translate(16 16)"><path id="Path_44" data-name="Path 44" d="M1.011,0H13.989A1.011,1.011,0,0,1,15,1.011V13.989A1.011,1.011,0,0,1,13.989,15H1.011A1.011,1.011,0,0,1,0,13.989V1.011A1.011,1.011,0,0,1,1.011,0Z" class="cls-1"/><path id="Path_39" data-name="Path 39" d="M5.794,13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z" transform="translate(2.742 -0.25)" fill="#fff"/></g></g></svg>');
|
||||
}
|
||||
|
||||
// Collaboration
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M15.9912 6C15.9912 8.34102 15.4074 10.1346 14.6055 11.3121C13.7983 12.4974 12.8249 13 11.9912 13C11.1575 13 10.1841 12.4974 9.37695 11.3121C8.57501 10.1346 7.99121 8.34102 7.99121 6C7.99121 3.61508 9.96974 2 11.9912 2C14.0127 2 15.9912 3.61508 15.9912 6ZM14.5015 12.9506C13.7365 13.6361 12.8649 14 11.9912 14C11.1195 14 10.2499 13.6378 9.48619 12.9554C7.78363 13.6081 6.36015 14.2591 5.26963 14.9224C3.55256 15.9667 3 16.8326 3 17.5C3 18.2545 3.4257 19.0877 4.82302 19.7879C6.25015 20.5031 8.57272 20.9999 12 21C15.4273 21 17.7499 20.5031 19.177 19.7879C20.5743 19.0877 21 18.2545 21 17.5C21 16.8326 20.4474 15.9667 18.7304 14.9224C17.6372 14.2575 16.2095 13.605 14.5015 12.9506ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{themeColor}"/></g></svg>');
|
||||
}
|
||||
}
|
||||
|
||||
// Overwrite color for toolbar
|
||||
|
|
@ -428,5 +435,10 @@ i.icon {
|
|||
height: 22px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{navBarIconColor}"><g><polygon points="10.9,16.9 2,8.1 4.1,6 11.1,12.8 17.9,6 20,8.1 11.2,16.9 11.1,17 "/></g></svg>');
|
||||
}
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M14.9912 6C14.9912 8.18203 14.4464 9.76912 13.7789 10.7492C13.101 11.7447 12.4042 12 11.9912 12C11.5782 12 10.8814 11.7447 10.2035 10.7492C9.53601 9.76912 8.99121 8.18203 8.99121 6C8.99121 4.23017 10.4571 3 11.9912 3C13.5254 3 14.9912 4.23017 14.9912 6ZM13.4917 13.6397C13.0059 13.8771 12.4989 14 11.9912 14C11.4861 14 10.9817 13.8784 10.4983 13.6434C8.53188 14.3681 6.94518 15.0737 5.78927 15.7768C4.10512 16.8011 4 17.4079 4 17.5C4 17.7664 4.1014 18.3077 5.27104 18.8939C6.50029 19.5099 8.64545 19.9999 12 20C15.3546 20 17.4997 19.5099 18.7289 18.8939C19.8986 18.3078 20 17.7664 20 17.5C20 17.4079 19.8949 16.8011 18.2107 15.7768C17.0529 15.0726 15.4627 14.3657 13.4917 13.6397ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{navBarIconColor}"/></svg>');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -133,6 +133,7 @@ require([
|
|||
,'AddShape'
|
||||
,'AddOther'
|
||||
,'AddLink'
|
||||
,'Collaboration'
|
||||
]
|
||||
});
|
||||
|
||||
|
|
@ -203,6 +204,7 @@ require([
|
|||
,'spreadsheeteditor/mobile/app/controller/add/AddShape'
|
||||
,'spreadsheeteditor/mobile/app/controller/add/AddOther'
|
||||
,'spreadsheeteditor/mobile/app/controller/add/AddLink'
|
||||
,'spreadsheeteditor/mobile/app/controller/Collaboration'
|
||||
], function() {
|
||||
window.compareVersions = true;
|
||||
app.start();
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ require([
|
|||
,'AddShape'
|
||||
,'AddOther'
|
||||
,'AddLink'
|
||||
,'Collaboration'
|
||||
]
|
||||
});
|
||||
|
||||
|
|
@ -214,6 +215,7 @@ require([
|
|||
,'spreadsheeteditor/mobile/app/controller/add/AddShape'
|
||||
,'spreadsheeteditor/mobile/app/controller/add/AddOther'
|
||||
,'spreadsheeteditor/mobile/app/controller/add/AddLink'
|
||||
,'spreadsheeteditor/mobile/app/controller/Collaboration'
|
||||
], function() {
|
||||
app.start();
|
||||
});
|
||||
|
|
|
|||
217
apps/spreadsheeteditor/mobile/app/controller/Collaboration.js
Normal file
217
apps/spreadsheeteditor/mobile/app/controller/Collaboration.js
Normal file
|
|
@ -0,0 +1,217 @@
|
|||
/*
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2010-2019
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
|
||||
* street, Riga, Latvia, EU, LV-1050.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Collaboration.js
|
||||
* Spreadsheet Editor
|
||||
*
|
||||
* Created by Julia Svinareva on 4/6/19
|
||||
* Copyright (c) 2019 Ascensio System SIA. All rights reserved.
|
||||
*
|
||||
*/
|
||||
define([
|
||||
'core',
|
||||
'jquery',
|
||||
'underscore',
|
||||
'backbone',
|
||||
'spreadsheeteditor/mobile/app/view/Collaboration'
|
||||
], function (core, $, _, Backbone) {
|
||||
'use strict';
|
||||
|
||||
SSE.Controllers.Collaboration = Backbone.Controller.extend(_.extend((function() {
|
||||
// Private
|
||||
var rootView,
|
||||
_userId,
|
||||
editUsers = [];
|
||||
|
||||
return {
|
||||
models: [],
|
||||
collections: [],
|
||||
views: [
|
||||
'Collaboration'
|
||||
],
|
||||
|
||||
initialize: function() {
|
||||
var me = this;
|
||||
me.addListeners({
|
||||
'Collaboration': {
|
||||
'page:show' : me.onPageShow
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
setApi: function(api) {
|
||||
this.api = api;
|
||||
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onChangeEditUsers, this));
|
||||
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onChangeEditUsers, this));
|
||||
},
|
||||
|
||||
onLaunch: function () {
|
||||
this.createView('Collaboration').render();
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.appConfig = mode;
|
||||
_userId = mode.user.id;
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
showModal: function() {
|
||||
var me = this,
|
||||
isAndroid = Framework7.prototype.device.android === true,
|
||||
modalView,
|
||||
mainView = SSE.getController('Editor').getView('Editor').f7View;
|
||||
|
||||
uiApp.closeModal();
|
||||
|
||||
if (Common.SharedSettings.get('phone')) {
|
||||
modalView = $$(uiApp.pickerModal(
|
||||
'<div class="picker-modal settings container-collaboration">' +
|
||||
'<div class="view collaboration-root-view navbar-through">' +
|
||||
this.getView('Collaboration').rootLayout() +
|
||||
'</div>' +
|
||||
'</div>'
|
||||
)).on('opened', function () {
|
||||
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
|
||||
me.api.asc_OnShowContextMenu()
|
||||
}
|
||||
}).on('close', function (e) {
|
||||
mainView.showNavbar();
|
||||
}).on('closed', function () {
|
||||
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
|
||||
me.api.asc_OnHideContextMenu()
|
||||
}
|
||||
});
|
||||
mainView.hideNavbar();
|
||||
} else {
|
||||
modalView = uiApp.popover(
|
||||
'<div class="popover settings container-collaboration">' +
|
||||
'<div class="popover-angle"></div>' +
|
||||
'<div class="popover-inner">' +
|
||||
'<div class="content-block">' +
|
||||
'<div class="view popover-view collaboration-root-view navbar-through">' +
|
||||
this.getView('Collaboration').rootLayout() +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>',
|
||||
$$('#toolbar-collaboration')
|
||||
);
|
||||
}
|
||||
|
||||
if (Framework7.prototype.device.android === true) {
|
||||
$$('.view.collaboration-root-view.navbar-through').removeClass('navbar-through').addClass('navbar-fixed');
|
||||
$$('.view.collaboration-root-view .navbar').prependTo('.view.collaboration-root-view > .pages > .page');
|
||||
}
|
||||
|
||||
rootView = uiApp.addView('.collaboration-root-view', {
|
||||
dynamicNavbar: true,
|
||||
domCache: true
|
||||
});
|
||||
|
||||
Common.NotificationCenter.trigger('collaborationcontainer:show');
|
||||
this.onPageShow(this.getView('Collaboration'));
|
||||
|
||||
SSE.getController('Toolbar').getView('Toolbar').hideSearch();
|
||||
},
|
||||
|
||||
rootView : function() {
|
||||
return rootView;
|
||||
},
|
||||
|
||||
onPageShow: function(view, pageId) {
|
||||
var me = this;
|
||||
|
||||
if('#edit-users-view' == pageId) {
|
||||
me.initEditUsers();
|
||||
Common.Utils.addScrollIfNeed('.page[data-page=edit-users-view]', '.page[data-page=edit-users-view] .page-content');
|
||||
} else {
|
||||
}
|
||||
},
|
||||
|
||||
onChangeEditUsers: function(users) {
|
||||
editUsers = users;
|
||||
},
|
||||
|
||||
initEditUsers: function() {
|
||||
var usersArray = [];
|
||||
_.each(editUsers, function(item){
|
||||
var fio = item.asc_getUserName().split(' ');
|
||||
var initials = fio[0].substring(0, 1).toUpperCase();
|
||||
if (fio.length > 1) {
|
||||
initials += fio[fio.length - 1].substring(0, 1).toUpperCase();
|
||||
}
|
||||
if(!item.asc_getView()) {
|
||||
var userAttr = {
|
||||
color: item.asc_getColor(),
|
||||
id: item.asc_getId(),
|
||||
idOriginal: item.asc_getIdOriginal(),
|
||||
name: item.asc_getUserName(),
|
||||
view: item.asc_getView(),
|
||||
initial: initials
|
||||
};
|
||||
if(item.asc_getIdOriginal() == _userId) {
|
||||
usersArray.unshift(userAttr);
|
||||
} else {
|
||||
usersArray.push(userAttr);
|
||||
}
|
||||
}
|
||||
});
|
||||
var userSort = _.chain(usersArray).groupBy('idOriginal').value();
|
||||
var templateUserItem = _.template([
|
||||
'<% _.each(users, function (user) { %>',
|
||||
'<li id="<%= user[0].id %>" class="<% if (user[0].view) {%> viewmode <% } %> item-content">' +
|
||||
'<div class="user-name item-inner">' +
|
||||
'<div class="color" style="background-color: <%= user[0].color %>;"><%= user[0].initial %></div>'+
|
||||
'<label><%= user[0].name %></label>' +
|
||||
'<% if (user.length>1) { %><label class="length"> (<%= user.length %>)</label><% } %>' +
|
||||
'</div>'+
|
||||
'</li>',
|
||||
'<% }); %>'].join(''));
|
||||
var templateUserList = _.template(
|
||||
'<div class="item-content"><div class="item-inner">' +
|
||||
this.textEditUser +
|
||||
'</div></div>' +
|
||||
'<ul>' +
|
||||
templateUserItem({users: userSort}) +
|
||||
'</ul>');
|
||||
$('#user-list').html(templateUserList());
|
||||
},
|
||||
|
||||
|
||||
textEditUser: 'Document is currently being edited by several users.'
|
||||
|
||||
}
|
||||
})(), SSE.Controllers.Collaboration || {}))
|
||||
});
|
||||
|
|
@ -715,6 +715,8 @@ define([
|
|||
me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(me.onSendThemeColors, me));
|
||||
me.api.asc_registerCallback('asc_onDownloadUrl', _.bind(me.onDownloadUrl, me));
|
||||
}
|
||||
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
},
|
||||
|
||||
applyModeEditorElements: function() {
|
||||
|
|
@ -729,8 +731,6 @@ define([
|
|||
/** coauthoring begin **/
|
||||
me.api.asc_registerCallback('asc_onCollaborativeChanges', _.bind(me.onCollaborativeChanges, me));
|
||||
me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
|
||||
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
|
||||
/** coauthoring end **/
|
||||
if (me.appOptions.isEditDiagram)
|
||||
me.api.asc_registerCallback('asc_onSelectionChanged', _.bind(me.onSelectionChanged, me));
|
||||
|
|
@ -1339,6 +1339,10 @@ define([
|
|||
this._state.usersCount = length;
|
||||
},
|
||||
|
||||
returnUserCount: function() {
|
||||
return this._state.usersCount;
|
||||
},
|
||||
|
||||
applySettings: function() {
|
||||
if (this.appOptions.isEdit && this.appOptions.canLicense && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
|
||||
var value = Common.localStorage.getItem("sse-settings-coauthmode"),
|
||||
|
|
|
|||
|
|
@ -81,14 +81,15 @@ define([
|
|||
'searchbar:show' : this.onSearchbarShow,
|
||||
'searchbar:hide' : this.onSearchbarHide,
|
||||
'searchbar:render' : this.onSearchbarRender,
|
||||
'searchbar:showsettings': this.onSearchbarSettings
|
||||
'searchbar:showsettings': this.onSearchbarSettings,
|
||||
'search:highlight' : this.onSearchHighlight
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
setApi: function(api) {
|
||||
this.api = api;
|
||||
this.api.asc_registerCallback('asc_onRenameCellTextEnd', _.bind(this.onRenameText, this));
|
||||
this.api.asc_registerCallback('asc_onRenameCellTextEnd', _.bind(this.onReplaceNext, this));
|
||||
},
|
||||
|
||||
setMode: function (mode) {
|
||||
|
|
@ -169,22 +170,40 @@ define([
|
|||
searchIn = Common.SharedSettings.get('search-in') === 'sheet' ? 'sheet' : 'workbook',
|
||||
isMatchCase = Common.SharedSettings.get('search-match-case') === true,
|
||||
isMatchCell = Common.SharedSettings.get('search-match-cell') === true,
|
||||
isHighlightRes = Common.SharedSettings.get('search-highlight-res') === true,
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows' ? 'rows' : 'columns',
|
||||
lookIn = Common.SharedSettings.get('look-in') === 'formulas' ? 'formulas' : 'values',
|
||||
$pageSettings = $('.page[data-page=search-settings]'),
|
||||
$inputType = $pageSettings.find('input[name=search-type]'),
|
||||
$inputSearchIn = $pageSettings.find('input[name=search-in]'),
|
||||
$inputSearchBy = $pageSettings.find('input[name=search-by]'),
|
||||
$inputMatchCase = $pageSettings.find('#search-match-case input:checkbox'),
|
||||
$inputMatchCell = $pageSettings.find('#search-match-cell input:checkbox');
|
||||
$inputMatchCell = $pageSettings.find('#search-match-cell input:checkbox'),
|
||||
$inputHighlightResults = $pageSettings.find('#search-highlight-res input:checkbox'),
|
||||
$inputLookIn = $pageSettings.find('input[name=look-in]');
|
||||
|
||||
$inputType.val([isReplace ? 'replace' : 'search']);
|
||||
$inputSearchIn.val([searchIn]);
|
||||
$inputMatchCase.prop('checked', isMatchCase);
|
||||
$inputMatchCell.prop('checked', isMatchCell);
|
||||
$inputHighlightResults.prop('checked', isHighlightRes);
|
||||
$inputSearchBy.val([searchBy]);
|
||||
$inputLookIn.val([lookIn]);
|
||||
|
||||
// init events
|
||||
$inputType.single('change', _.bind(me.onTypeChange, me));
|
||||
$inputSearchIn.single('change', _.bind(me.onSearchInChange, me));
|
||||
$inputSearchBy.single('change', _.bind(me.onSearchByChange, me));
|
||||
$inputLookIn.single('change', _.bind(me.onLookInChange, me));
|
||||
$inputMatchCase.single('change', _.bind(me.onMatchCaseClick, me));
|
||||
$inputMatchCell.single('change', _.bind(me.onMatchCellClick, me));
|
||||
$inputHighlightResults.single('change', _.bind(me.onHighlightResultsClick, me));
|
||||
|
||||
if (isReplace) {
|
||||
Common.SharedSettings.set('look-in', 'formulas');
|
||||
$('input[name=look-in]').val(['formulas']);
|
||||
$('input[name=look-in]:eq(1)').parent().addClass('disabled');
|
||||
}
|
||||
},
|
||||
|
||||
onSearchbarShow: function(bar) {
|
||||
|
|
@ -242,7 +261,12 @@ define([
|
|||
},
|
||||
|
||||
onReplace: function (btn) {
|
||||
this.onQueryReplace(this.searchBar.query, this.replaceBar.query);
|
||||
var me = this;
|
||||
me.onQueryReplace(me.searchBar.query, me.replaceBar.query ? me.replaceBar.query : "");
|
||||
},
|
||||
|
||||
onReplaceNext: function() {
|
||||
this.onQuerySearch(this.searchBar.query, 'next');
|
||||
},
|
||||
|
||||
onReplaceAll: function (e) {
|
||||
|
|
@ -270,7 +294,9 @@ define([
|
|||
onQuerySearch: function(query, direction) {
|
||||
var matchCase = Common.SharedSettings.get('search-match-case') || false,
|
||||
matchCell = Common.SharedSettings.get('search-match-cell') || false,
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet';
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet',
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows',
|
||||
lookIn = Common.SharedSettings.get('look-in') === 'formulas';
|
||||
|
||||
if (query && query.length) {
|
||||
var options = new Asc.asc_CFindOptions();
|
||||
|
|
@ -279,8 +305,8 @@ define([
|
|||
options.asc_setIsMatchCase(matchCase);
|
||||
options.asc_setIsWholeCell(matchCell);
|
||||
options.asc_setScanOnOnlySheet(lookInSheet);
|
||||
// options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
|
||||
// options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
|
||||
options.asc_setScanByRows(searchBy);
|
||||
options.asc_setLookIn(lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
|
||||
|
||||
if (!this.api.asc_findText(options)) {
|
||||
var me = this;
|
||||
|
|
@ -299,7 +325,9 @@ define([
|
|||
onQueryReplace: function(search, replace) {
|
||||
var matchCase = Common.SharedSettings.get('search-match-case') || false,
|
||||
matchCell = Common.SharedSettings.get('search-match-cell') || false,
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet';
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet',
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows',
|
||||
lookIn = Common.SharedSettings.get('look-in') === 'formulas';
|
||||
|
||||
if (search && search.length) {
|
||||
this.api.isReplaceAll = false;
|
||||
|
|
@ -310,8 +338,8 @@ define([
|
|||
options.asc_setIsMatchCase(matchCase);
|
||||
options.asc_setIsWholeCell(matchCell);
|
||||
options.asc_setScanOnOnlySheet(lookInSheet);
|
||||
// options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
|
||||
// options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
|
||||
options.asc_setScanByRows(searchBy);
|
||||
options.asc_setLookIn(lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
|
||||
options.asc_setIsReplaceAll(false);
|
||||
|
||||
this.api.asc_replaceText(options);
|
||||
|
|
@ -321,7 +349,9 @@ define([
|
|||
onQueryReplaceAll: function(search, replace) {
|
||||
var matchCase = Common.SharedSettings.get('search-match-case') || false,
|
||||
matchCell = Common.SharedSettings.get('search-match-cell') || false,
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet';
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet',
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows',
|
||||
lookIn = Common.SharedSettings.get('look-in') === 'formulas';
|
||||
|
||||
if (search && search.length) {
|
||||
this.api.isReplaceAll = true;
|
||||
|
|
@ -332,54 +362,42 @@ define([
|
|||
options.asc_setIsMatchCase(matchCase);
|
||||
options.asc_setIsWholeCell(matchCell);
|
||||
options.asc_setScanOnOnlySheet(lookInSheet);
|
||||
// options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
|
||||
// options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
|
||||
options.asc_setScanByRows(searchBy);
|
||||
options.asc_setLookIn(lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
|
||||
options.asc_setIsReplaceAll(true);
|
||||
|
||||
this.api.asc_replaceText(options);
|
||||
}
|
||||
},
|
||||
|
||||
onRenameText: function(found, replaced) {
|
||||
if (this.api.isReplaceAll) return;
|
||||
|
||||
var matchCase = Common.SharedSettings.get('search-match-case') || false,
|
||||
matchCell = Common.SharedSettings.get('search-match-cell') || false,
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet';
|
||||
|
||||
var options = new Asc.asc_CFindOptions();
|
||||
options.asc_setFindWhat(this.searchBar.query);
|
||||
options.asc_setScanForward(true);
|
||||
options.asc_setIsMatchCase(matchCase);
|
||||
options.asc_setIsWholeCell(matchCell);
|
||||
options.asc_setScanOnOnlySheet(lookInSheet);
|
||||
// options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
|
||||
// options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
|
||||
|
||||
if (!this.api.asc_findText(options)) {
|
||||
var me = this;
|
||||
uiApp.alert(
|
||||
'',
|
||||
me.textNoTextFound,
|
||||
function () {
|
||||
me.searchBar.input.focus();
|
||||
}
|
||||
);
|
||||
}
|
||||
},
|
||||
|
||||
onTypeChange: function (e) {
|
||||
var $target = $(e.currentTarget),
|
||||
isReplace = ($target.val() === 'replace');
|
||||
|
||||
Common.SharedSettings.set('search-is-replace', isReplace);
|
||||
$('.searchbar.document').toggleClass('replace', isReplace);
|
||||
|
||||
if (isReplace) {
|
||||
Common.SharedSettings.set('look-in', 'formulas');
|
||||
$('input[name=look-in]').val(['formulas']);
|
||||
$('input[name=look-in]:eq(1)').parent().addClass('disabled');
|
||||
} else {
|
||||
$('input[name=look-in]:eq(1)').parent().removeClass('disabled');
|
||||
}
|
||||
},
|
||||
|
||||
onSearchInChange: function (e) {
|
||||
Common.SharedSettings.set('search-in', $(e.currentTarget).val());
|
||||
},
|
||||
|
||||
onSearchByChange: function(e) {
|
||||
Common.SharedSettings.set('search-by', $(e.currentTarget).val());
|
||||
},
|
||||
|
||||
onLookInChange: function(e) {
|
||||
Common.SharedSettings.set('look-in', $(e.currentTarget).val());
|
||||
},
|
||||
|
||||
onMatchCaseClick: function (e) {
|
||||
Common.SharedSettings.set('search-match-case', $(e.currentTarget).is(':checked'));
|
||||
},
|
||||
|
|
@ -388,6 +406,16 @@ define([
|
|||
Common.SharedSettings.set('search-match-cell', $(e.currentTarget).is(':checked'));
|
||||
},
|
||||
|
||||
onHighlightResultsClick: function (e) {
|
||||
var value = $(e.currentTarget).is(':checked');
|
||||
Common.SharedSettings.set('search-highlight-res', value);
|
||||
this.api.asc_selectSearchingResults(value);
|
||||
},
|
||||
|
||||
onSearchHighlight: function(w, highlight) {
|
||||
this.api.asc_selectSearchingResults(highlight);
|
||||
},
|
||||
|
||||
// API handlers
|
||||
|
||||
textNoTextFound: 'Text not found',
|
||||
|
|
|
|||
|
|
@ -76,7 +76,17 @@ define([
|
|||
{ caption: 'A2', subtitle: Common.Utils.String.format('42{0} x 59,4{0}', txtCm), value: [420, 594] },
|
||||
{ caption: 'A6', subtitle: Common.Utils.String.format('10,5{0} x 14,8{0}', txtCm), value: [105, 148] }
|
||||
],
|
||||
_metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric())
|
||||
_metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()),
|
||||
_dataLang = [
|
||||
{ value: 'en', displayValue: 'English', exampleValue: ' SUM; MIN; MAX; COUNT' },
|
||||
{ value: 'de', displayValue: 'Deutsch', exampleValue: ' SUMME; MIN; MAX; ANZAHL' },
|
||||
{ value: 'es', displayValue: 'Spanish', exampleValue: ' SUMA; MIN; MAX; CALCULAR' },
|
||||
{ value: 'fr', displayValue: 'French', exampleValue: ' SOMME; MIN; MAX; NB' },
|
||||
{ value: 'it', displayValue: 'Italian', exampleValue: ' SOMMA; MIN; MAX; CONTA.NUMERI' },
|
||||
{ value: 'ru', displayValue: 'Russian', exampleValue: ' СУММ; МИН; МАКС; СЧЁТ' },
|
||||
{ value: 'pl', displayValue: 'Polish', exampleValue: ' SUMA; MIN; MAX; ILE.LICZB' }
|
||||
],
|
||||
_indexLang = 0;
|
||||
|
||||
var mm2Cm = function(mm) {
|
||||
return parseFloat((mm/10.).toFixed(2));
|
||||
|
|
@ -184,6 +194,7 @@ define([
|
|||
$('#settings-search').single('click', _.bind(me._onSearch, me));
|
||||
$(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me));
|
||||
$('#settings-print').single('click', _.bind(me._onPrint, me));
|
||||
$('#settings-collaboration').single('click', _.bind(me.onCollaboration, me));
|
||||
me.initSettings(pageId);
|
||||
},
|
||||
|
||||
|
|
@ -204,9 +215,35 @@ define([
|
|||
me.initSpreadsheetPageSize();
|
||||
} else if ('#margins-view' == pageId) {
|
||||
me.initSpreadsheetMargins();
|
||||
} else if ('#language-formula-view' == pageId) {
|
||||
me.initFormulaLang();
|
||||
} else {
|
||||
var _userCount = SSE.getController('Main').returnUserCount();
|
||||
if (_userCount > 0) {
|
||||
$('#settings-collaboration').show();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
initFormulaLang: function() {
|
||||
var value = Common.localStorage.getItem('sse-settings-func-lang');
|
||||
var item = _.findWhere(_dataLang, {value: value});
|
||||
this.getView('Settings').renderFormLang(item ? _dataLang.indexOf(item) : 0, _dataLang);
|
||||
$('.page[data-page=language-formula-view] input:radio[name=language-formula]').single('change', _.bind(this.onFormulaLangChange, this));
|
||||
Common.Utils.addScrollIfNeed('.page[data-page=language-formula-view]', '.page[data-page=language-formula-view] .page-content');
|
||||
},
|
||||
|
||||
onFormulaLangChange: function(e) {
|
||||
var langValue = $(e.currentTarget).val();
|
||||
Common.localStorage.setItem("sse-settings-func-lang", langValue);
|
||||
this.initPageApplicationSettings();
|
||||
SSE.getController('AddFunction').onDocumentReady();
|
||||
},
|
||||
|
||||
onCollaboration: function() {
|
||||
SSE.getController('Collaboration').showModal();
|
||||
},
|
||||
|
||||
initSpreadsheetSettings: function() {
|
||||
var me = this,
|
||||
$pageSpreadsheetSettings = $('.page[data-page=settings-spreadsheet-view]'),
|
||||
|
|
@ -438,6 +475,16 @@ define([
|
|||
var value = Common.localStorage.getItem('se-mobile-settings-unit');
|
||||
value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
|
||||
$unitMeasurement.val([value]);
|
||||
|
||||
//init formula language
|
||||
value = Common.localStorage.getItem('sse-settings-func-lang');
|
||||
var item = _.findWhere(_dataLang, {value: value});
|
||||
if(!item) {
|
||||
item = _dataLang[0];
|
||||
}
|
||||
var $pageLang = $('#language-formula');
|
||||
$pageLang.find('.item-title').text(item.displayValue);
|
||||
$pageLang.find('.item-example').text(item.exampleValue);
|
||||
},
|
||||
|
||||
unitMeasurementChange: function (e) {
|
||||
|
|
|
|||
|
|
@ -87,6 +87,8 @@ define([
|
|||
this.api.asc_registerCallback('asc_onWorksheetLocked', _.bind(this.onApiWorksheetLocked, this));
|
||||
this.api.asc_registerCallback('asc_onActiveSheetChanged', _.bind(this.onApiActiveSheetChanged, this));
|
||||
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this));
|
||||
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this))
|
||||
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this));
|
||||
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
|
||||
|
||||
Common.NotificationCenter.on('sheet:active', this.onApiActiveSheetChanged.bind(this));
|
||||
|
|
@ -198,11 +200,11 @@ define([
|
|||
},
|
||||
|
||||
activateControls: function() {
|
||||
$('#toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').removeClass('disabled');
|
||||
$('#toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document, #toolbar-collaboration').removeClass('disabled');
|
||||
},
|
||||
|
||||
activateViewControls: function() {
|
||||
$('#toolbar-search, #document-back').removeClass('disabled');
|
||||
$('#toolbar-search, #document-back, #toolbar-collaboration').removeClass('disabled');
|
||||
},
|
||||
|
||||
deactivateEditControls: function() {
|
||||
|
|
@ -219,6 +221,21 @@ define([
|
|||
SSE.getController('Settings').hideModal();
|
||||
},
|
||||
|
||||
displayCollaboration: function(users) {
|
||||
if(users !== undefined) {
|
||||
var length = 0;
|
||||
_.each(users, function (item) {
|
||||
if (!item.asc_getView())
|
||||
length++;
|
||||
});
|
||||
if (length > 0) {
|
||||
$('#toolbar-collaboration').show();
|
||||
} else {
|
||||
$('#toolbar-collaboration').hide();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
dlgLeaveTitleText : 'You leave the application',
|
||||
dlgLeaveMsgText : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
|
||||
leaveButtonText : 'Leave this Page',
|
||||
|
|
|
|||
|
|
@ -86,7 +86,8 @@ define([
|
|||
var me = this;
|
||||
|
||||
_.defer(function () {
|
||||
var editorLang = SSE.getController("Main").editorConfig.lang;
|
||||
var editorLang = Common.localStorage.getItem('sse-settings-func-lang');
|
||||
|
||||
editorLang = (editorLang ? editorLang : 'en').split(/[\-\_]/)[0].toLowerCase();
|
||||
|
||||
var localizationFunctions = function(data) {
|
||||
|
|
@ -105,8 +106,8 @@ define([
|
|||
|
||||
fillFunctions: function() {
|
||||
var me = this,
|
||||
functions = {},
|
||||
editorLang = SSE.getController("Main").editorConfig.lang;
|
||||
functions = {};
|
||||
var editorLang = Common.localStorage.getItem('sse-settings-func-lang');
|
||||
|
||||
editorLang = (editorLang ? editorLang : 'en').split(/[\-\_]/)[0].toLowerCase();
|
||||
|
||||
|
|
@ -141,7 +142,7 @@ define([
|
|||
}
|
||||
}
|
||||
|
||||
view.setFunctions(functions);
|
||||
view.setFunctions(functions, editorLang);
|
||||
view.render();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
<!-- Root view -->
|
||||
<div id="collaboration-root-view">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="center sliding"><%= scope.textCollaboration %></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">
|
||||
<div class="page" data-page="collaboration-root-view">
|
||||
<div class="page-content">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<a id="list-edit-users" class="item-link" data-page="#edit-users-view">
|
||||
<div class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textEditUsers %></div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Editable Users view -->
|
||||
<div id="edit-users-view">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
|
||||
<div class="center sliding"><%= scope.textEditUsers %></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>
|
||||
</div>
|
||||
<div class="pages">
|
||||
<div class="page page-change" data-page="edit-users-view">
|
||||
<div class="page-content">
|
||||
<div id="user-list" class="list-block">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -95,6 +95,52 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="content-block-title"><%= scope.textSearchBy %></div>
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="search-by" value="rows">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textByRows %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
<li>
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="search-by" value="columns">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textByColumns %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="content-block-title"><%= scope.textLookIn %></div>
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="look-in" value="formulas">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textFormulas %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
<li>
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="look-in" value="values">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textValues %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
|
|
@ -123,6 +169,19 @@
|
|||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<div id="search-highlight-res" class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textHighlightRes %></div>
|
||||
<div class="item-after">
|
||||
<label class="label-switch">
|
||||
<input type="checkbox">
|
||||
<div class="checkbox"></div>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,18 @@
|
|||
</a>
|
||||
</li>
|
||||
<% } %>
|
||||
<% if(phone) {%>
|
||||
<li>
|
||||
<div id="settings-collaboration" class="item-content" style="display: none;">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-collaboration"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textCollaboration %></div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<% } %>
|
||||
<li>
|
||||
<a id="settings-spreadsheet" class="item-link">
|
||||
<div class="item-content">
|
||||
|
|
@ -402,7 +414,22 @@
|
|||
</label>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-block-title"><%= scope.textFormulaLanguage %></div>
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li class="media-item">
|
||||
<a id="language-formula" class="item-link item-content" data-page="#language-formula-view">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
<div class="item-title"><%= scope.textCustom %></div>
|
||||
</div>
|
||||
<div class="item-subtitle"><%= scope.textExample + ": "%><span class="item-example"><%= scope.textCustomSize %></span></div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -441,9 +468,9 @@
|
|||
</ul>
|
||||
</div>
|
||||
<div class="content-block-title"><%= scope.textFormat %></div>
|
||||
<div class="list-block media-list">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<li class="media-item">
|
||||
<a id="settings-spreadsheet-format" class="item-link item-content" data-page="#settings-page-size-view">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
|
|
@ -494,7 +521,7 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="list-block media-list">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<a id="color-schemes" class="item-link item-content">
|
||||
|
|
@ -629,4 +656,24 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Language Formula View --->
|
||||
<div id="language-formula-view">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
|
||||
<div class="center sliding"><%= scope.textFormulaLanguage %></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pages">
|
||||
<div class="page" data-page="language-formula-view">
|
||||
<div class="page-content">
|
||||
<div class="list-block media-list">
|
||||
<ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -42,6 +42,11 @@
|
|||
<i class="icon icon-search"></i>
|
||||
</a>
|
||||
<% } %>
|
||||
<% if (!phone) { %>
|
||||
<a href="#" id="toolbar-collaboration" class="link icon-only disabled" style="display: none;">
|
||||
<i class="icon icon-collaboration"></i>
|
||||
</a>
|
||||
<% } %>
|
||||
<a href="#" id="toolbar-settings" class="link icon-only">
|
||||
<i class="icon icon-settings"></i>
|
||||
</a>
|
||||
|
|
|
|||
149
apps/spreadsheeteditor/mobile/app/view/Collaboration.js
Normal file
149
apps/spreadsheeteditor/mobile/app/view/Collaboration.js
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
/*
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2010-2019
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
|
||||
* street, Riga, Latvia, EU, LV-1050.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Collaboration.js
|
||||
* Presentation Editor
|
||||
*
|
||||
* Created by Julia Svinareva on 31/5/19
|
||||
* Copyright (c) 2019 Ascensio System SIA. All rights reserved.
|
||||
*
|
||||
*/
|
||||
|
||||
define([
|
||||
'text!spreadsheeteditor/mobile/app/template/Collaboration.template',
|
||||
'jquery',
|
||||
'underscore',
|
||||
'backbone'
|
||||
], function (settingsTemplate, $, _, Backbone) {
|
||||
'use strict';
|
||||
|
||||
SSE.Views.Collaboration = Backbone.View.extend(_.extend((function() {
|
||||
// private
|
||||
|
||||
return {
|
||||
|
||||
template: _.template(settingsTemplate),
|
||||
|
||||
events: {
|
||||
//
|
||||
},
|
||||
|
||||
initialize: function() {
|
||||
Common.NotificationCenter.on('collaborationcontainer:show', _.bind(this.initEvents, this));
|
||||
this.on('page:show', _.bind(this.updateItemHandlers, this));
|
||||
},
|
||||
|
||||
initEvents: function () {
|
||||
var me = this;
|
||||
|
||||
Common.Utils.addScrollIfNeed('.view[data-page=collaboration-root-view] .pages', '.view[data-page=collaboration-root-view] .page');
|
||||
me.updateItemHandlers();
|
||||
},
|
||||
|
||||
initControls: function() {
|
||||
//
|
||||
},
|
||||
|
||||
// Render layout
|
||||
render: function() {
|
||||
this.layout = $('<div/>').append(this.template({
|
||||
android : Common.SharedSettings.get('android'),
|
||||
phone : Common.SharedSettings.get('phone'),
|
||||
orthography: Common.SharedSettings.get('sailfish'),
|
||||
scope : this
|
||||
}));
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
updateItemHandlers: function () {
|
||||
var selectorsDynamicPage = [
|
||||
'.page[data-page=collaboration-root-view]'
|
||||
].map(function (selector) {
|
||||
return selector + ' a.item-link[data-page]';
|
||||
}).join(', ');
|
||||
|
||||
$(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this));
|
||||
},
|
||||
|
||||
onItemClick: function (e) {
|
||||
var $target = $(e.currentTarget),
|
||||
page = $target.data('page');
|
||||
|
||||
if (page && page.length > 0 ) {
|
||||
this.showPage(page);
|
||||
}
|
||||
},
|
||||
|
||||
rootLayout: function () {
|
||||
if (this.layout) {
|
||||
var $layour = this.layout.find('#collaboration-root-view'),
|
||||
isPhone = Common.SharedSettings.get('phone');
|
||||
|
||||
return $layour.html();
|
||||
}
|
||||
|
||||
return '';
|
||||
},
|
||||
|
||||
showPage: function(templateId, animate) {
|
||||
var rootView = SSE.getController('Collaboration').rootView();
|
||||
|
||||
if (rootView && this.layout) {
|
||||
var $content = this.layout.find(templateId);
|
||||
|
||||
// Android fix for navigation
|
||||
if (Framework7.prototype.device.android) {
|
||||
$content.find('.page').append($content.find('.navbar'));
|
||||
}
|
||||
|
||||
rootView.router.load({
|
||||
content: $content.html(),
|
||||
animatePages: animate !== false
|
||||
});
|
||||
|
||||
this.fireEvent('page:show', [this, templateId]);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
|
||||
textCollaboration: 'Collaboration',
|
||||
textСomments: 'Сomments',
|
||||
textBack: 'Back',
|
||||
textEditUsers: 'Users'
|
||||
|
||||
}
|
||||
})(), SSE.Views.Collaboration || {}))
|
||||
});
|
||||
|
|
@ -155,6 +155,19 @@ define([
|
|||
me.fireEvent('searchbar:render', me);
|
||||
me.fireEvent('searchbar:show', me);
|
||||
|
||||
if(Common.SharedSettings.get('search-highlight-res') === undefined) {
|
||||
Common.SharedSettings.set('search-highlight-res', true);
|
||||
}
|
||||
if (Common.SharedSettings.get('search-highlight-res')) {
|
||||
this.fireEvent('search:highlight', [this, true]);
|
||||
}
|
||||
if(Common.SharedSettings.get('search-by') === undefined) {
|
||||
Common.SharedSettings.set('search-by', 'rows');
|
||||
}
|
||||
if(Common.SharedSettings.get('look-in') === undefined) {
|
||||
Common.SharedSettings.set('look-in', 'formulas');
|
||||
}
|
||||
|
||||
searchBar = $$('.searchbar.document');
|
||||
|
||||
_.defer(function() {
|
||||
|
|
@ -188,6 +201,8 @@ define([
|
|||
uiApp.hideNavbar(searchBar);
|
||||
}, 10);
|
||||
}
|
||||
|
||||
this.fireEvent('search:highlight', [this, false]);
|
||||
},
|
||||
|
||||
textFind: 'Find',
|
||||
|
|
@ -199,7 +214,14 @@ define([
|
|||
textMatchCell: 'Match Cell',
|
||||
textSearchIn: 'Search In',
|
||||
textWorkbook: 'Workbook',
|
||||
textSheet: 'Sheet'
|
||||
textSheet: 'Sheet',
|
||||
textHighlightRes: 'Highlight results',
|
||||
textByColumns: 'By columns',
|
||||
textByRows: 'By rows',
|
||||
textSearchBy: 'Search',
|
||||
textLookIn: 'Look In',
|
||||
textFormulas: 'Formulas',
|
||||
textValues: 'Values'
|
||||
}
|
||||
})(), SSE.Views.Search || {}))
|
||||
});
|
||||
|
|
@ -129,6 +129,8 @@ define([
|
|||
if (isEdit) {
|
||||
$layout.find('#settings-search .item-title').text(this.textFindAndReplace)
|
||||
} else {
|
||||
$layout.find('#settings-spreadsheet').hide();
|
||||
$layout.find('#settings-application').hide();
|
||||
}
|
||||
if (!canDownload) $layout.find('#settings-download').hide();
|
||||
if (!canAbout) $layout.find('#settings-about').hide();
|
||||
|
|
@ -166,6 +168,11 @@ define([
|
|||
|
||||
showSetApp: function() {
|
||||
this.showPage('#settings-application-view');
|
||||
$('#language-formula').single('click', _.bind(this.showFormulaLanguage, this));
|
||||
},
|
||||
|
||||
showFormulaLanguage: function () {
|
||||
this.showPage('#language-formula-view');
|
||||
},
|
||||
|
||||
showColorSchemes: function () {
|
||||
|
|
@ -259,6 +266,38 @@ define([
|
|||
$list.html(items.join(''));
|
||||
},
|
||||
|
||||
renderFormLang: function(indexLang, languages) {
|
||||
var $pageLang = $('.page[data-page=language-formula-view]'),
|
||||
$list = $pageLang.find('ul'),
|
||||
items = [],
|
||||
textEx = this.textExample;
|
||||
|
||||
_.each(languages, function (lang, index) {
|
||||
items.push(_.template([
|
||||
'<li>',
|
||||
'<label class="label-radio item-content">',
|
||||
'<input type="radio" name="language-formula" value="<%= item.value %>" <% if (index == selectIndex) { %>checked="checked"<% } %> >',
|
||||
'<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>',
|
||||
'<div class="item-inner">',
|
||||
'<div class="item-title-row">',
|
||||
'<div class="item-title"><%= item.displayValue %></div>',
|
||||
'</div>',
|
||||
'<div class="item-subtitle"><%= textExamp + ": "%> <%= item.exampleValue %></div>',
|
||||
'</div>',
|
||||
'</label>',
|
||||
'</li>'
|
||||
].join(''))({
|
||||
android: Framework7.prototype.device.android,
|
||||
item: lang,
|
||||
index: index,
|
||||
selectIndex: indexLang,
|
||||
textExamp: textEx
|
||||
}));
|
||||
});
|
||||
|
||||
$list.html(items.join(''));
|
||||
},
|
||||
|
||||
unknownText: 'Unknown',
|
||||
textFindAndReplace: 'Find and Replace',
|
||||
textSettings: 'Settings',
|
||||
|
|
@ -301,7 +340,10 @@ define([
|
|||
textTop: 'Top',
|
||||
textLeft: 'Left',
|
||||
textBottom: 'Bottom',
|
||||
textRight: 'Right'
|
||||
textRight: 'Right',
|
||||
textCollaboration: 'Collaboration',
|
||||
textFormulaLanguage: 'Formula Language',
|
||||
textExample: 'Example'
|
||||
}
|
||||
})(), SSE.Views.Settings || {}))
|
||||
});
|
||||
|
|
@ -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
|
||||
|
|
@ -155,6 +156,11 @@ define([
|
|||
Common.Gateway.requestEditRights();
|
||||
},
|
||||
|
||||
//Collaboration
|
||||
showCollaboration: function () {
|
||||
SSE.getController('Collaboration').showModal();
|
||||
},
|
||||
|
||||
textBack: 'Back'
|
||||
}
|
||||
})(), SSE.Views.Toolbar || {}))
|
||||
|
|
|
|||
|
|
@ -109,17 +109,35 @@ define([
|
|||
quickFunction.caption = me.functions[quickFunction.type].caption
|
||||
});
|
||||
}
|
||||
var lang = me.lang;
|
||||
|
||||
this.translatTable = {};
|
||||
|
||||
var name = '', translate = '',
|
||||
descriptions = ['DateAndTime', 'Engineering', 'Financial', 'Information', 'Logical', 'LookupAndReference', 'Mathematic', 'Statistical', 'TextAndData' ];
|
||||
for (var i=0; i<descriptions.length; i++) {
|
||||
name = descriptions[i];
|
||||
translate = 'sCat' + name;
|
||||
this.translatTable[name] = {
|
||||
en: this[translate],
|
||||
de: this[translate+'_de'],
|
||||
ru: this[translate+'_ru'],
|
||||
pl: this[translate+'_pl'],
|
||||
es: this[translate+'_es'],
|
||||
fr: this[translate+'_fr']
|
||||
};
|
||||
}
|
||||
|
||||
me.groups = {
|
||||
'DateAndTime': me.sCatDateAndTime,
|
||||
'Engineering': me.sCatEngineering,
|
||||
'TextAndData': me.sCatTextAndData,
|
||||
'Statistical': me.sCatStatistical,
|
||||
'Financial': me.sCatFinancial,
|
||||
'Mathematic': me.sCatMathematic,
|
||||
'LookupAndReference': me.sCatLookupAndReference,
|
||||
'Information': me.sCatInformation,
|
||||
'Logical': me.sCatLogical
|
||||
'DateAndTime': me.translatTable['DateAndTime'][lang] || me.translatTable['DateAndTime']['en'],
|
||||
'Engineering': me.translatTable['Engineering'][lang] || me.translatTable['Engineering']['en'],
|
||||
'TextAndData': me.translatTable['TextAndData'][lang] || me.translatTable['TextAndData']['en'],
|
||||
'Statistical': me.translatTable['Statistical'][lang] || me.translatTable['Statistical']['en'],
|
||||
'Financial': me.translatTable['Financial'][lang] || me.translatTable['Financial']['en'],
|
||||
'Mathematic': me.translatTable['Mathematic'][lang] || me.translatTable['Mathematic']['en'],
|
||||
'LookupAndReference': me.translatTable['LookupAndReference'][lang] || me.translatTable['LookupAndReference']['en'],
|
||||
'Information': me.translatTable['Information'][lang] || me.translatTable['Information']['en'],
|
||||
'Logical': me.translatTable['Logical'][lang] || me.translatTable['Logical']['en']
|
||||
};
|
||||
|
||||
me.layout = $('<div/>').append(_.template(me.template)({
|
||||
|
|
@ -134,8 +152,9 @@ define([
|
|||
return this;
|
||||
},
|
||||
|
||||
setFunctions: function (arr) {
|
||||
setFunctions: function (arr, lang) {
|
||||
this.functions = arr;
|
||||
this.lang = lang;
|
||||
},
|
||||
|
||||
rootLayout: function () {
|
||||
|
|
@ -202,7 +221,57 @@ define([
|
|||
sCatLookupAndReference: 'Lookup and Reference',
|
||||
sCatMathematic: 'Math and trigonometry',
|
||||
sCatStatistical: 'Statistical',
|
||||
sCatTextAndData: 'Text and data'
|
||||
sCatTextAndData: 'Text and data',
|
||||
|
||||
sCatDateAndTime_ru: 'Дата и время',
|
||||
sCatEngineering_ru: 'Инженерные',
|
||||
sCatFinancial_ru: 'Финансовые',
|
||||
sCatInformation_ru: 'Информационные',
|
||||
sCatLogical_ru: 'Логические',
|
||||
sCatLookupAndReference_ru: 'Поиск и ссылки',
|
||||
sCatMathematic_ru: 'Математические',
|
||||
sCatStatistical_ru: 'Статистические',
|
||||
sCatTextAndData_ru: 'Текст и данные',
|
||||
|
||||
sCatLogical_es: 'Lógico',
|
||||
sCatDateAndTime_es: 'Fecha y hora',
|
||||
sCatEngineering_es: 'Ingenería',
|
||||
sCatFinancial_es: 'Financial',
|
||||
sCatInformation_es: 'Información',
|
||||
sCatLookupAndReference_es: 'Búsqueda y referencia',
|
||||
sCatMathematic_es: 'Matemáticas y trigonometría',
|
||||
sCatStatistical_es: 'Estadístico',
|
||||
sCatTextAndData_es: 'Texto y datos',
|
||||
|
||||
sCatLogical_fr: 'Logique',
|
||||
sCatDateAndTime_fr: 'Date et heure',
|
||||
sCatEngineering_fr: 'Ingénierie',
|
||||
sCatFinancial_fr: 'Financier',
|
||||
sCatInformation_fr: 'Information',
|
||||
sCatLookupAndReference_fr: 'Recherche et référence',
|
||||
sCatMathematic_fr: 'Maths et trigonométrie',
|
||||
sCatStatistical_fr: 'Statistiques',
|
||||
sCatTextAndData_fr: 'Texte et données',
|
||||
|
||||
sCatLogical_pl: 'Logiczny',
|
||||
sCatDateAndTime_pl: 'Data i czas',
|
||||
sCatEngineering_pl: 'Inżyniera',
|
||||
sCatFinancial_pl: 'Finansowe',
|
||||
sCatInformation_pl: 'Informacja',
|
||||
sCatLookupAndReference_pl: 'Wyszukiwanie i odniesienie',
|
||||
sCatMathematic_pl: 'Matematyczne i trygonometryczne',
|
||||
sCatStatistical_pl: 'Statystyczny',
|
||||
sCatTextAndData_pl: 'Tekst i data',
|
||||
|
||||
sCatDateAndTime_de: 'Datum und Uhrzeit',
|
||||
sCatEngineering_de: 'Konstruktion',
|
||||
sCatFinancial_de: 'Finanzmathematik',
|
||||
sCatInformation_de: 'Information',
|
||||
sCatLogical_de: 'Logisch',
|
||||
sCatLookupAndReference_de: 'Suchen und Bezüge',
|
||||
sCatMathematic_de: 'Mathematik und Trigonometrie',
|
||||
sCatStatistical_de: 'Statistik',
|
||||
sCatTextAndData_de: 'Text und Daten'
|
||||
|
||||
}
|
||||
})(), SSE.Views.AddFunction || {}));
|
||||
|
|
|
|||
|
|
@ -300,6 +300,7 @@
|
|||
"SSE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application",
|
||||
"SSE.Controllers.Toolbar.leaveButtonText": "Leave this Page",
|
||||
"SSE.Controllers.Toolbar.stayButtonText": "Stay on this Page",
|
||||
"SSE.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.",
|
||||
"SSE.Views.AddFunction.sCatDateAndTime": "Date and time",
|
||||
"SSE.Views.AddFunction.sCatEngineering": "Engineering",
|
||||
"SSE.Views.AddFunction.sCatFinancial": "Financial",
|
||||
|
|
@ -495,6 +496,13 @@
|
|||
"SSE.Views.Search.textSearchIn": "Search In",
|
||||
"SSE.Views.Search.textSheet": "Sheet",
|
||||
"SSE.Views.Search.textWorkbook": "Workbook",
|
||||
"SSE.Views.Search.textLookIn": "Look In",
|
||||
"SSE.Views.Search.textFormulas": "Formulas",
|
||||
"SSE.Views.Search.textValues": "Values",
|
||||
"SSE.Views.Search.textByColumns": "By columns",
|
||||
"SSE.Views.Search.textByRows": "By rows",
|
||||
"SSE.Views.Search.textSearchBy": "Search",
|
||||
"SSE.Views.Search.textHighlightRes": "Highlight results",
|
||||
"SSE.Views.Settings.textAbout": "About",
|
||||
"SSE.Views.Settings.textAddress": "address",
|
||||
"SSE.Views.Settings.textAuthor": "Author",
|
||||
|
|
@ -538,5 +546,12 @@
|
|||
"SSE.Views.Settings.textBottom": "Bottom",
|
||||
"SSE.Views.Settings.textRight": "Right",
|
||||
"SSE.Views.Settings.unknownText": "Unknown",
|
||||
"SSE.Views.Toolbar.textBack": "Back"
|
||||
"SSE.Views.Settings.textFormulaLanguage": "Formula Language",
|
||||
"SSE.Views.Settings.textExample": "Example",
|
||||
"SSE.Views.Settings.textCollaboration": "Collaboration",
|
||||
"SSE.Views.Toolbar.textBack": "Back",
|
||||
"SSE.Views.Collaboration.textCollaboration": "Collaboration",
|
||||
"SSE.Views.Collaboration.textСomments": "Сomments",
|
||||
"SSE.Views.Collaboration.textBack": "Back",
|
||||
"SSE.Views.Collaboration.textEditUsers": "Users"
|
||||
}
|
||||
|
|
@ -5844,7 +5844,8 @@ html:not(.phone) #editor-navbar.navbar .right a + a,
|
|||
html:not(.phone) #editor-navbar.navbar .left a + a {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.phone.ios .container-edit .navbar:before {
|
||||
.phone.ios .container-edit .navbar:before,
|
||||
.phone.ios .container-collaboration .navbar:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
|
@ -5859,20 +5860,24 @@ html:not(.phone) #editor-navbar.navbar .left a + a {
|
|||
-webkit-transform-origin: 50% 0%;
|
||||
transform-origin: 50% 0%;
|
||||
}
|
||||
html.pixel-ratio-2 .phone.ios .container-edit .navbar:before {
|
||||
html.pixel-ratio-2 .phone.ios .container-edit .navbar:before,
|
||||
html.pixel-ratio-2 .phone.ios .container-collaboration .navbar:before {
|
||||
-webkit-transform: scaleY(0.5);
|
||||
transform: scaleY(0.5);
|
||||
}
|
||||
html.pixel-ratio-3 .phone.ios .container-edit .navbar:before {
|
||||
html.pixel-ratio-3 .phone.ios .container-edit .navbar:before,
|
||||
html.pixel-ratio-3 .phone.ios .container-collaboration .navbar:before {
|
||||
-webkit-transform: scaleY(0.33);
|
||||
transform: scaleY(0.33);
|
||||
}
|
||||
.phone.ios .container-edit .page-content .list-block:first-child {
|
||||
.phone.ios .container-edit .page-content .list-block:first-child,
|
||||
.phone.ios .container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.container-edit.popover,
|
||||
.container-add.popover,
|
||||
.container-settings.popover {
|
||||
.container-settings.popover,
|
||||
.container-collaboration.popover {
|
||||
width: 360px;
|
||||
}
|
||||
.settings.popup .list-block ul,
|
||||
|
|
@ -6607,6 +6612,11 @@ i.icon.icon-format-csv {
|
|||
height: 30px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2235.5%22%20%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
.chart-types .thumb.bar-normal {
|
||||
background-image: url('../img/charts/chart-03.png');
|
||||
}
|
||||
|
|
@ -7182,3 +7192,26 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
|
|||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
#user-list .item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
#user-list .length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
#user-list .color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: #373737;
|
||||
font-weight: 500;
|
||||
}
|
||||
#user-list ul:before {
|
||||
content: none;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -191,4 +191,34 @@ input, textarea {
|
|||
.modal.modal-in {
|
||||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
||||
#user-list {
|
||||
.item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
.item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
.color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: @initialEditUser;
|
||||
font-weight: 500;
|
||||
|
||||
}
|
||||
ul:before {
|
||||
content: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -178,4 +178,33 @@ input, textarea {
|
|||
.modal.modal-in {
|
||||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
||||
#user-list {
|
||||
.item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
.item-inner {
|
||||
justify-content: flex-start;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.length {
|
||||
margin-left: 4px;
|
||||
}
|
||||
.color {
|
||||
min-width: 40px;
|
||||
min-height: 40px;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50px;
|
||||
line-height: 40px;
|
||||
color: @initialEditUser;
|
||||
font-weight: 400;
|
||||
}
|
||||
ul:before {
|
||||
content: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -352,6 +352,12 @@ i.icon {
|
|||
height: 30px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 58 58" height="58px" width="58px" y="0px" x="0px" xml:space="preserve"><defs><style>.cls-1{fill:@{themeColor};}</style></defs><rect height="1" width="9" class="cls-1" y="42.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="38.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="34.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="30.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="26.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="22.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="18.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="14.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="42.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="38.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="34.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="30.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="26.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="22.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="18.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="14.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="42.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="38.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="34.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="30.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="26.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="22.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="18.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="14.5" x="35.5" /></svg>');
|
||||
}
|
||||
// Collaboration
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M15.9912 6C15.9912 8.34102 15.4074 10.1346 14.6055 11.3121C13.7983 12.4974 12.8249 13 11.9912 13C11.1575 13 10.1841 12.4974 9.37695 11.3121C8.57501 10.1346 7.99121 8.34102 7.99121 6C7.99121 3.61508 9.96974 2 11.9912 2C14.0127 2 15.9912 3.61508 15.9912 6ZM14.5015 12.9506C13.7365 13.6361 12.8649 14 11.9912 14C11.1195 14 10.2499 13.6378 9.48619 12.9554C7.78363 13.6081 6.36015 14.2591 5.26963 14.9224C3.55256 15.9667 3 16.8326 3 17.5C3 18.2545 3.4257 19.0877 4.82302 19.7879C6.25015 20.5031 8.57272 20.9999 12 21C15.4273 21 17.7499 20.5031 19.177 19.7879C20.5743 19.0877 21 18.2545 21 17.5C21 16.8326 20.4474 15.9667 18.7304 14.9224C17.6372 14.2575 16.2095 13.605 14.5015 12.9506ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{themeColor}"/></g></svg>');
|
||||
}
|
||||
}
|
||||
|
||||
.chart-types .thumb {
|
||||
|
|
|
|||
|
|
@ -315,6 +315,12 @@ i.icon {
|
|||
height: 30px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 58 58" height="58px" width="58px" y="0px" x="0px" xml:space="preserve"><defs><style>.cls-1{fill:@{themeColor};}</style></defs><rect height="1" width="9" class="cls-1" y="42.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="38.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="34.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="30.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="26.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="22.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="18.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="14.5" x="13.5" /><rect height="1" width="9" class="cls-1" y="42.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="38.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="34.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="30.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="26.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="22.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="18.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="14.5" x="24.5" /><rect height="1" width="9" class="cls-1" y="42.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="38.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="34.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="30.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="26.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="22.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="18.5" x="35.5" /><rect height="1" width="9" class="cls-1" y="14.5" x="35.5" /></svg>');
|
||||
}
|
||||
// Collaboration
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g><path fill-rule="evenodd" clip-rule="evenodd" d="M15.9912 6C15.9912 8.34102 15.4074 10.1346 14.6055 11.3121C13.7983 12.4974 12.8249 13 11.9912 13C11.1575 13 10.1841 12.4974 9.37695 11.3121C8.57501 10.1346 7.99121 8.34102 7.99121 6C7.99121 3.61508 9.96974 2 11.9912 2C14.0127 2 15.9912 3.61508 15.9912 6ZM14.5015 12.9506C13.7365 13.6361 12.8649 14 11.9912 14C11.1195 14 10.2499 13.6378 9.48619 12.9554C7.78363 13.6081 6.36015 14.2591 5.26963 14.9224C3.55256 15.9667 3 16.8326 3 17.5C3 18.2545 3.4257 19.0877 4.82302 19.7879C6.25015 20.5031 8.57272 20.9999 12 21C15.4273 21 17.7499 20.5031 19.177 19.7879C20.5743 19.0877 21 18.2545 21 17.5C21 16.8326 20.4474 15.9667 18.7304 14.9224C17.6372 14.2575 16.2095 13.605 14.5015 12.9506ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{themeColor}"/></g></svg>');
|
||||
}
|
||||
}
|
||||
|
||||
// Overwrite color for toolbar
|
||||
|
|
@ -370,6 +376,11 @@ i.icon {
|
|||
height: 22px;
|
||||
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{navBarIconColor}"><g><polygon points="10.9,16.9 2,8.1 4.1,6 11.1,12.8 17.9,6 20,8.1 11.2,16.9 11.1,17 "/></g></svg>');
|
||||
}
|
||||
&.icon-collaboration {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M14.9912 6C14.9912 8.18203 14.4464 9.76912 13.7789 10.7492C13.101 11.7447 12.4042 12 11.9912 12C11.5782 12 10.8814 11.7447 10.2035 10.7492C9.53601 9.76912 8.99121 8.18203 8.99121 6C8.99121 4.23017 10.4571 3 11.9912 3C13.5254 3 14.9912 4.23017 14.9912 6ZM13.4917 13.6397C13.0059 13.8771 12.4989 14 11.9912 14C11.4861 14 10.9817 13.8784 10.4983 13.6434C8.53188 14.3681 6.94518 15.0737 5.78927 15.7768C4.10512 16.8011 4 17.4079 4 17.5C4 17.7664 4.1014 18.3077 5.27104 18.8939C6.50029 19.5099 8.64545 19.9999 12 20C15.3546 20 17.4997 19.5099 18.7289 18.8939C19.8986 18.3078 20 17.7664 20 17.5C20 17.4079 19.8949 16.8011 18.2107 15.7768C17.0529 15.0726 15.4627 14.3657 13.4917 13.6397ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z" fill="@{navBarIconColor}"/></svg>');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue