Merge branch 'develop' into feature/sse-slicer
This commit is contained in:
GoshaZotov
commit
7e623c5406
|
|
@ -306,8 +306,8 @@ if (Common === undefined) {
|
|||
_postMessage({event:'onRequestSendNotify', data: emails});
|
||||
},
|
||||
|
||||
requestInsertImage: function () {
|
||||
_postMessage({event:'onRequestInsertImage'});
|
||||
requestInsertImage: function (command) {
|
||||
_postMessage({event:'onRequestInsertImage', data: {c: command}});
|
||||
},
|
||||
|
||||
requestMailMergeRecipients: function () {
|
||||
|
|
|
|||
|
|
@ -571,6 +571,8 @@ define([
|
|||
}
|
||||
}
|
||||
} else {
|
||||
var cg = Common.Utils.croppedGeometry();
|
||||
docH = cg.height - 10;
|
||||
if (top + menuH > docH) {
|
||||
if (fixedAlign && typeof fixedAlign == 'string') { // how to align if menu height > window height
|
||||
m = fixedAlign.match(/^([a-z]+)-([a-z]+)/);
|
||||
|
|
@ -579,13 +581,18 @@ define([
|
|||
top = docH - menuH;
|
||||
}
|
||||
|
||||
if (top < 0)
|
||||
top = 0;
|
||||
|
||||
if (top < cg.top)
|
||||
top = cg.top;
|
||||
}
|
||||
if (this.options.additionalAlign)
|
||||
this.options.additionalAlign.call(this, menuRoot, left, top);
|
||||
else
|
||||
menuRoot.css({left: Math.ceil(left), top: Math.ceil(top)});
|
||||
else {
|
||||
var _css = {left: Math.ceil(left), top: Math.ceil(top)};
|
||||
if (!(menuH < docH)) _css['margin-top'] = 0;
|
||||
|
||||
menuRoot.css(_css);
|
||||
}
|
||||
},
|
||||
|
||||
clearAll: function() {
|
||||
|
|
|
|||
|
|
@ -216,7 +216,9 @@ Common.Utils = _.extend(new(function() {
|
|||
zoom: function() {return me.zoom;},
|
||||
topOffset: 0,
|
||||
innerWidth: function() {return me.innerWidth;},
|
||||
innerHeight: function() {return me.innerHeight;}
|
||||
innerHeight: function() {return me.innerHeight;},
|
||||
croppedGeometry: function() {return {left:0, top: Common.Utils.InternalSettings.get('window-inactive-area-top'),
|
||||
width: me.innerWidth, height: me.innerHeight - Common.Utils.InternalSettings.get('window-inactive-area-top')}}
|
||||
}
|
||||
})(), Common.Utils || {});
|
||||
|
||||
|
|
|
|||
|
|
@ -374,10 +374,19 @@ define([
|
|||
if(arrChangeReview.length == 0) {
|
||||
$('#current-change').css('display','none');
|
||||
$('.accept-reject').find('a').addClass('disabled');
|
||||
$('#current-change').after(_.template('<div id="no-changes">' + this.textNoChanges + '</div>'));
|
||||
} else {
|
||||
$('#current-change #date-change').html(arrChangeReview[0].date);
|
||||
$('#current-change #user-name').html(arrChangeReview[0].user);
|
||||
$('#current-change #text-change').html(arrChangeReview[0].changetext);
|
||||
if ($('#no-changes').length > 0) {
|
||||
$('#no-changes').remove();
|
||||
}
|
||||
var arr = {
|
||||
date: arrChangeReview[0].date,
|
||||
user: arrChangeReview[0].user,
|
||||
color: arrChangeReview[0].usercolor.get_hex(),
|
||||
text: arrChangeReview[0].changetext,
|
||||
initials: this.getInitials(arrChangeReview[0].user)
|
||||
};
|
||||
this.view.renderChangeReview(arr);
|
||||
goto = arrChangeReview[0].goto;
|
||||
}
|
||||
if (goto) {
|
||||
|
|
@ -395,7 +404,7 @@ define([
|
|||
$('#btn-accept-change').remove();
|
||||
$('#btn-reject-change').remove();
|
||||
if(arrChangeReview.length != 0 && arrChangeReview[0].editable) {
|
||||
$('.accept-reject').html('<div id="btn-delete-change"><i class="icon icon-delete-change"></i></div>');
|
||||
$('.accept-reject').html('<a href="#" id="btn-delete-change" class="link">' + this.textDelete + '</a>');
|
||||
$('#btn-delete-change').single('click', _.bind(this.onDeleteChange, this));
|
||||
}
|
||||
}
|
||||
|
|
@ -449,6 +458,7 @@ define([
|
|||
$('#btn-goto-change').hide();
|
||||
$('#btn-delete-change').hide();
|
||||
$('.accept-reject').find('a').addClass('disabled');
|
||||
$('#current-change').after(_.template('<div id="no-changes">' + this.textNoChanges + '</div>'));
|
||||
} else {
|
||||
$('#current-change').show();
|
||||
$('.accept-reject').find('a').removeClass('disabled');
|
||||
|
|
@ -650,12 +660,13 @@ define([
|
|||
}
|
||||
var date = (item.get_DateTime() == '') ? new Date() : new Date(item.get_DateTime()),
|
||||
user = item.get_UserName(),
|
||||
userColor = item.get_UserColor(),
|
||||
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, goto: goto, editable: editable});
|
||||
arr.push({date: date, user: user, usercolor: userColor, changetext: changetext, goto: goto, editable: editable});
|
||||
});
|
||||
arrChangeReview = arr;
|
||||
dateChange = data;
|
||||
|
|
@ -1771,7 +1782,9 @@ define([
|
|||
textReopen: 'Reopen',
|
||||
textMessageDeleteComment: 'Do you really want to delete this comment?',
|
||||
textMessageDeleteReply: 'Do you really want to delete this reply?',
|
||||
textYes: 'Yes'
|
||||
textYes: 'Yes',
|
||||
textDelete: 'Delete',
|
||||
textNoChanges: 'There are no changes.'
|
||||
|
||||
}
|
||||
})(), Common.Controllers.Collaboration || {}))
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
<li>
|
||||
<a id="list-edit-users" class="item-link" data-page="#edit-users-view">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-users"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textEditUsers %></div>
|
||||
</div>
|
||||
|
|
@ -23,6 +26,9 @@
|
|||
<li id="item-comments">
|
||||
<a id="comments-settings" class="item-link" data-page="#comments-view">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-insert-comment"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textСomments %></div>
|
||||
</div>
|
||||
|
|
@ -33,6 +39,9 @@
|
|||
<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-review"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textReviewing %></div>
|
||||
</div>
|
||||
|
|
@ -102,9 +111,16 @@
|
|||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<a id="change-settings" class="item-link" data-page="#change-view">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-review-changes"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textChange %></div>
|
||||
</div>
|
||||
|
|
@ -113,6 +129,9 @@
|
|||
</li>
|
||||
<li>
|
||||
<div id="settings-accept-all" class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-accept-changes"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textAcceptAllChanges %></div>
|
||||
</div>
|
||||
|
|
@ -120,6 +139,9 @@
|
|||
</li>
|
||||
<li>
|
||||
<div id="settings-reject-all" class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="icon icon-reject-changes"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textRejectAllChanges %></div>
|
||||
</div>
|
||||
|
|
@ -144,34 +166,43 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="pages">
|
||||
<div class="page" data-page="display-mode-view">
|
||||
<div class="page page-display-mode" data-page="display-mode-view">
|
||||
<div class="page-content">
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<li class="media-item">
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="doc-orientation" value="markup">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textMarkup %></div>
|
||||
<div class="item-title-row">
|
||||
<div class="item-title"><%= scope.textMarkup %></div>
|
||||
</div>
|
||||
<div class="item-subtitle"><%= scope.textAllChangesEditing %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
<li>
|
||||
<li class="media-item">
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="doc-orientation" value="final">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textFinal %></div>
|
||||
<div class="item-title-row">
|
||||
<div class="item-title"><%= scope.textFinal %></div>
|
||||
</div>
|
||||
<div class="item-subtitle"><%= scope.textAllChangesAcceptedPreview %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
<li>
|
||||
<li class="media-item">
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="doc-orientation" value="original">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textOriginal %></div>
|
||||
<div class="item-title-row">
|
||||
<div class="item-title"><%= scope.textOriginal %></div>
|
||||
</div>
|
||||
<div class="item-subtitle"><%= scope.textAllChangesRejectedPreview %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
|
|
@ -196,22 +227,19 @@
|
|||
<div class="page page-change" data-page="change-view">
|
||||
<div class="page-content">
|
||||
<div class="content-block block-btn">
|
||||
<span class="change-buttons">
|
||||
<span class="accept-reject">
|
||||
<a href="#" id="btn-accept-change" class="link icon-only"><%= scope.textAccept %></a>
|
||||
<a href="#" id="btn-reject-change" class="link icon-only"><%= scope.textReject %></a>
|
||||
</span>
|
||||
<a href="#" id="btn-goto-change" class="link icon-only" style="display: none;"><i class="icon icon-goto"></i></a>
|
||||
</span>
|
||||
<span class="next-prev">
|
||||
<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-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">
|
||||
<p id="user-name"></p>
|
||||
<p id="date-change"></p>
|
||||
<p id="text-change"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -439,6 +439,16 @@ define([
|
|||
return template;
|
||||
},
|
||||
|
||||
renderChangeReview: function(change) {
|
||||
var isAndroid = Framework7.prototype.device.android === true;
|
||||
var template = (isAndroid ? '<div class="header-change"><div class="initials-change" style="background-color: #' + change.color + ';">' + change.initials + '</div><div>' : '') +
|
||||
'<div id="user-name">' + change.user + '</div>' +
|
||||
'<div id="date-change">' + change.date + '</div>' +
|
||||
(isAndroid ? '</div></div>' : '') +
|
||||
'<div id="text-change">' + change.text + '</div>';
|
||||
$('#current-change').html(_.template(template));
|
||||
},
|
||||
|
||||
textCollaboration: 'Collaboration',
|
||||
textReviewing: 'Review',
|
||||
textСomments: 'Сomments',
|
||||
|
|
@ -457,7 +467,12 @@ define([
|
|||
textDone: 'Done',
|
||||
textAddReply: 'Add Reply',
|
||||
textEditReply: 'Edit Reply',
|
||||
textCancel: 'Cancel'
|
||||
textCancel: 'Cancel',
|
||||
textAllChangesEditing: 'All changes (Editing)',
|
||||
textAllChangesAcceptedPreview: 'All changes accepted (Preview)',
|
||||
textAllChangesRejectedPreview: 'All changes rejected (Preview)',
|
||||
textAccept: 'Accept',
|
||||
textReject: 'Reject'
|
||||
}
|
||||
})(), Common.Views.Collaboration || {}))
|
||||
});
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
.page-change {
|
||||
background-color: #FFFFFF;
|
||||
.block-description {
|
||||
background-color: #fff;
|
||||
padding-top: 15px;
|
||||
|
|
@ -28,23 +29,44 @@
|
|||
margin-top: 10px;
|
||||
}
|
||||
.block-btn, .content-block.block-btn:first-child {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
margin: 26px 0;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 44px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
|
||||
#btn-next-change, #btn-reject-change {
|
||||
#btn-reject-change {
|
||||
margin-left: 20px;
|
||||
}
|
||||
#btn-goto-change {
|
||||
margin-right: 20px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.right-buttons {
|
||||
.change-buttons, .accept-reject {
|
||||
display: flex;
|
||||
}
|
||||
.link {
|
||||
display: inline-block;
|
||||
.next-prev {
|
||||
display: flex;
|
||||
.link {
|
||||
width: 44px;
|
||||
}
|
||||
}
|
||||
.link {
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 17px;
|
||||
height: 44px;
|
||||
min-width: 44px;
|
||||
}
|
||||
}
|
||||
#no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
}
|
||||
.navbar .center-collaboration {
|
||||
|
|
@ -61,6 +83,21 @@
|
|||
}
|
||||
}
|
||||
|
||||
//Display mode
|
||||
.page-display-mode[data-page="display-mode-view"] {
|
||||
.list-block {
|
||||
li.media-item {
|
||||
.item-title {
|
||||
font-weight: normal;
|
||||
}
|
||||
.item-subtitle {
|
||||
font-size: 14px;
|
||||
color: @gray;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
word-wrap: break-word;
|
||||
}
|
||||
#user-name {
|
||||
font-size: 17px;
|
||||
font-size: 16px;
|
||||
line-height: 22px;
|
||||
color: #000000;
|
||||
margin: 0;
|
||||
|
|
@ -28,26 +28,54 @@
|
|||
margin-top: 10px;
|
||||
}
|
||||
.block-btn {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
padding: 26px 0;
|
||||
background-color: #EFEFF4;
|
||||
width: 100%;
|
||||
height: 56px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
|
||||
#btn-next-change, #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
#btn-reject-change {
|
||||
margin-left: 15px;
|
||||
}
|
||||
#btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.right-buttons {
|
||||
.change-buttons, .accept-reject, .next-prev {
|
||||
display: flex;
|
||||
}
|
||||
.link {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 14px;
|
||||
text-transform: uppercase;
|
||||
font-weight: 500;
|
||||
height: 56px;
|
||||
min-width: 48px;
|
||||
}
|
||||
}
|
||||
.header-change {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
padding-right: 16px;
|
||||
.initials-change {
|
||||
height: 40px;
|
||||
width: 40px;
|
||||
border-radius: 50px;
|
||||
color: #FFFFFF;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 16px;
|
||||
font-size: 18px;
|
||||
}
|
||||
}
|
||||
#no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
}
|
||||
.container-collaboration {
|
||||
.navbar .right.close-collaboration {
|
||||
|
|
@ -59,6 +87,15 @@
|
|||
}
|
||||
}
|
||||
|
||||
//Display mode
|
||||
.page-display-mode {
|
||||
.list-block {
|
||||
.item-subtitle {
|
||||
font-size: 14px;
|
||||
color: @gray;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Edit users
|
||||
@initialEditUser: #373737;
|
||||
|
|
|
|||
|
|
@ -390,6 +390,8 @@ define([
|
|||
Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this));
|
||||
this.api.asc_registerCallback('asc_onTableDrawModeChanged', _.bind(this.onTableDraw, this));
|
||||
this.api.asc_registerCallback('asc_onTableEraseModeChanged', _.bind(this.onTableErase, this));
|
||||
Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this));
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
} else if (this.mode.isRestrictedEdit) {
|
||||
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
|
||||
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
|
||||
|
|
@ -1506,26 +1508,36 @@ define([
|
|||
}
|
||||
})).show();
|
||||
} else if (item.value === 'storage') {
|
||||
if (this.toolbar.mode.canRequestInsertImage) {
|
||||
Common.Gateway.requestInsertImage();
|
||||
} else {
|
||||
(new Common.Views.SelectFileDlg({
|
||||
fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
|
||||
})).on('selectfile', function(obj, file){
|
||||
me.insertImage(file);
|
||||
}).show();
|
||||
}
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'add');
|
||||
}
|
||||
},
|
||||
|
||||
insertImage: function(data) {
|
||||
if (data && data.url) {
|
||||
openImageFromStorage: function(type) {
|
||||
var me = this;
|
||||
if (this.toolbar.mode.canRequestInsertImage) {
|
||||
Common.Gateway.requestInsertImage(type);
|
||||
} else {
|
||||
(new Common.Views.SelectFileDlg({
|
||||
fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
|
||||
})).on('selectfile', function(obj, file){
|
||||
file && (file.c = type);
|
||||
me.insertImage(file);
|
||||
}).show();
|
||||
}
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && (!data.c || data.c=='add')) {
|
||||
this.toolbar.fireEvent('insertimage', this.toolbar);
|
||||
this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage
|
||||
Common.component.Analytics.trackEvent('ToolBar', 'Image');
|
||||
}
|
||||
},
|
||||
|
||||
insertImage: function(data) { // gateway
|
||||
Common.NotificationCenter.trigger('storage:image-insert', data);
|
||||
},
|
||||
|
||||
onBtnInsertTextClick: function(btn, e) {
|
||||
if (this.api)
|
||||
this._addAutoshape(btn.pressed, 'textRect');
|
||||
|
|
@ -2053,6 +2065,7 @@ define([
|
|||
props: me.api.asc_GetWatermarkProps(),
|
||||
api: me.api,
|
||||
lang: me.mode.lang,
|
||||
storage: me.mode.canRequestInsertImage || me.mode.fileChoiceUrl && me.mode.fileChoiceUrl.indexOf("{documentType}")>-1,
|
||||
fontStore: me.fontstore,
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
|
|
|
|||
|
|
@ -75,20 +75,12 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td colspan=2>
|
||||
<label class="header" id="image-lbl-replace" ><%= scope.textInsert %></label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="image-button-from-file" style="width:85px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="image-button-from-url" style="width:85px;"><%= scope.textFromUrl %></button>
|
||||
<div id="image-button-replace" style="width:100%;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="padding-small" colspan=2>
|
||||
<button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100px;"><%= scope.textEdit %></button>
|
||||
<button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100%;"><%= scope.textEditObject %></button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -17,11 +17,8 @@
|
|||
<div id="shape-panel-image-fill" class="settings-hidden padding-small" style="width: 100%;">
|
||||
<table cols="2" style="width: 100%;">
|
||||
<tr>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;float:right;"><%= scope.textFromUrl %></button>
|
||||
<td colspan="2" class="padding-small">
|
||||
<div id="shape-button-replace" style="width:100%;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -45,13 +45,10 @@
|
|||
<div id="watermark-radio-image"></div>
|
||||
</td></tr>
|
||||
<tr><td class="padding-small">
|
||||
<table id="watermark-tbl-image" cols="3" style="margin-left: 22px;">
|
||||
<table id="watermark-tbl-image" cols="2" style="margin-left: 22px;">
|
||||
<tr>
|
||||
<td style="vertical-align: top;">
|
||||
<button type="button" class="btn btn-text-default" id="watermark-from-file" style="width:90px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td style="vertical-align: top;">
|
||||
<button type="button" class="btn btn-text-default" id="watermark-from-url" style="width:90px;margin-left: 15px;"><%= scope.textFromUrl %></button>
|
||||
<div id="watermark-select-image"></div>
|
||||
</td>
|
||||
<td rowspan="2">
|
||||
<div style="width: 80px; height: 70px; padding: 9px 14px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;margin-left: 15px;">
|
||||
|
|
@ -62,9 +59,8 @@
|
|||
<tr>
|
||||
<td style="vertical-align: bottom;">
|
||||
<label class="input-label" style=""><%= scope.textScale %></label>
|
||||
<div id="watermark-combo-scale" style="width: 90px;"></div>
|
||||
<div id="watermark-combo-scale" style="width: 142px;"></div>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td></tr>
|
||||
|
|
|
|||
|
|
@ -2433,6 +2433,11 @@ define([
|
|||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
})).show();
|
||||
}),
|
||||
new Common.UI.MenuItem({
|
||||
caption : this.textFromStorage
|
||||
}).on('click', function(item) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'change');
|
||||
})
|
||||
]
|
||||
})
|
||||
|
|
@ -2579,6 +2584,7 @@ define([
|
|||
menuImgReplace.setVisible(value.imgProps.isOnlyImg && (pluginGuid===null || pluginGuid===undefined));
|
||||
if (menuImgReplace.isVisible())
|
||||
menuImgReplace.setDisabled(islocked || pluginGuid===null);
|
||||
menuImgReplace.menu.items[2].setVisible(me.mode.canRequestInsertImage || me.mode.fileChoiceUrl && me.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
menuImgRotate.setVisible(!value.imgProps.isChart && (pluginGuid===null || pluginGuid===undefined));
|
||||
if (menuImgRotate.isVisible())
|
||||
|
|
@ -4416,7 +4422,8 @@ define([
|
|||
textCells: 'Cells',
|
||||
textSeveral: 'Several Rows/Columns',
|
||||
txtInsertCaption: 'Insert Caption',
|
||||
txtEmpty: '(Empty)'
|
||||
txtEmpty: '(Empty)',
|
||||
textFromStorage: 'From Storage'
|
||||
|
||||
}, DE.Views.DocumentHolder || {}));
|
||||
});
|
||||
|
|
@ -101,9 +101,15 @@ define([
|
|||
this.api.asc_registerCallback('asc_onImgWrapStyleChanged', _.bind(this._ImgWrapStyleChanged, this));
|
||||
this.api.asc_registerCallback('asc_ChangeCropState', _.bind(this._changeCropState, this));
|
||||
}
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
},
|
||||
|
||||
updateMetricUnit: function() {
|
||||
var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
|
||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||
|
|
@ -164,30 +170,13 @@ define([
|
|||
this.btnOriginalSize.cmpEl.width(w);
|
||||
this.btnFitMargins.cmpEl.width(w);
|
||||
|
||||
this.btnInsertFromFile = new Common.UI.Button({
|
||||
el: $('#image-button-from-file')
|
||||
});
|
||||
this.lockedControls.push(this.btnInsertFromFile);
|
||||
|
||||
this.btnInsertFromUrl = new Common.UI.Button({
|
||||
el: $('#image-button-from-url')
|
||||
});
|
||||
this.lockedControls.push(this.btnInsertFromUrl);
|
||||
|
||||
this.btnEditObject = new Common.UI.Button({
|
||||
el: $('#image-button-edit-object')
|
||||
});
|
||||
this.lockedControls.push(this.btnEditObject);
|
||||
|
||||
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||
if (this._isFromFile) return;
|
||||
this._isFromFile = true;
|
||||
if (this.api) this.api.ChangeImageFromFile();
|
||||
this.fireEvent('editcomplete', this);
|
||||
this._isFromFile = false;
|
||||
}, this));
|
||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
|
||||
this.btnEditObject.on('click', _.bind(function(btn){
|
||||
if (this.api) this.api.asc_startEditCurrentOleObject();
|
||||
this.fireEvent('editcomplete', this);
|
||||
|
|
@ -268,8 +257,26 @@ define([
|
|||
this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this));
|
||||
this.lockedControls.push(this.btnCrop);
|
||||
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#image-button-replace'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textInsert,
|
||||
style: "width:100%;",
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 194px;',
|
||||
maxHeight: 200,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.lockedControls.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
this.linkAdvanced = $('#image-advanced-link');
|
||||
this.lblReplace = $('#image-lbl-replace');
|
||||
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
||||
},
|
||||
|
||||
|
|
@ -335,10 +342,8 @@ define([
|
|||
var pluginGuid = props.asc_getPluginGuid();
|
||||
value = (pluginGuid !== null && pluginGuid !== undefined);
|
||||
if (this._state.isOleObject!==value) {
|
||||
this.btnInsertFromUrl.setVisible(!value);
|
||||
this.btnInsertFromFile.setVisible(!value);
|
||||
this.btnSelectImage.setVisible(!value);
|
||||
this.btnEditObject.setVisible(value);
|
||||
this.lblReplace.text(value ? this.textEditObject : this.textInsert);
|
||||
this.btnRotate270.setDisabled(value);
|
||||
this.btnRotate90.setDisabled(value);
|
||||
this.btnFlipV.setDisabled(value);
|
||||
|
|
@ -350,8 +355,7 @@ define([
|
|||
var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
|
||||
this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
|
||||
} else {
|
||||
this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
|
||||
this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
|
||||
this.btnSelectImage.setDisabled(pluginGuid===null || this._locked);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -463,23 +467,43 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
var props = new Asc.asc_CImgProperty();
|
||||
props.put_ImageUrl(checkUrl);
|
||||
me.api.ImgApply(props);
|
||||
setImageUrl: function(url, token) {
|
||||
var props = new Asc.asc_CImgProperty();
|
||||
props.put_ImageUrl(url, token);
|
||||
this.api.ImgApply(props);
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && data.c=='change') {
|
||||
this.setImageUrl(data.url, data.token);
|
||||
}
|
||||
},
|
||||
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.setImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
})).show();
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'change');
|
||||
} else {
|
||||
if (this._isFromFile) return;
|
||||
this._isFromFile = true;
|
||||
if (this.api) this.api.ChangeImageFromFile();
|
||||
this.fireEvent('editcomplete', this);
|
||||
this._isFromFile = false;
|
||||
}
|
||||
},
|
||||
|
||||
onBtnRotateClick: function(btn) {
|
||||
|
|
@ -606,6 +630,7 @@ define([
|
|||
textHintFlipH: 'Flip Horizontally',
|
||||
textCrop: 'Crop',
|
||||
textCropFill: 'Fill',
|
||||
textCropFit: 'Fit'
|
||||
textCropFit: 'Fit',
|
||||
textFromStorage: 'From Storage'
|
||||
}, DE.Views.ImageSettings || {}));
|
||||
});
|
||||
|
|
@ -245,8 +245,9 @@ define([
|
|||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
if (this.mergeSettings)
|
||||
this.mergeSettings.setMode(mode);
|
||||
this.mergeSettings && this.mergeSettings.setMode(mode);
|
||||
this.imageSettings && this.imageSettings.setMode(mode);
|
||||
this.shapeSettings && this.shapeSettings.setMode(mode);
|
||||
},
|
||||
|
||||
onBtnMenuClick: function(btn, e) {
|
||||
|
|
|
|||
|
|
@ -152,9 +152,14 @@ define([
|
|||
this.api.asc_setInterfaceDrawImagePlaceShape('shape-texture-img');
|
||||
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
|
||||
}
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
},
|
||||
|
||||
onFillSrcSelect: function(combo, record) {
|
||||
this.ShowHideElem(record.value);
|
||||
switch (record.value){
|
||||
|
|
@ -690,32 +695,49 @@ define([
|
|||
this.fireEvent('editcomplete', this);
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
if (me.BlipFillType !== null) {
|
||||
var props = new Asc.asc_CShapeProperty();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.put_fill( new Asc.asc_CFillBlip());
|
||||
fill.get_fill().put_type(me.BlipFillType);
|
||||
fill.get_fill().put_url(checkUrl);
|
||||
setImageUrl: function(url, token) {
|
||||
if (this.BlipFillType !== null) {
|
||||
var props = new Asc.asc_CShapeProperty();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.put_fill( new Asc.asc_CFillBlip());
|
||||
fill.get_fill().put_type(this.BlipFillType);
|
||||
fill.get_fill().put_url(url, token);
|
||||
|
||||
props.put_fill(fill);
|
||||
me.imgprops.put_ShapeProperties(props);
|
||||
me.api.ImgApply(me.imgprops);
|
||||
props.put_fill(fill);
|
||||
this.imgprops.put_ShapeProperties(props);
|
||||
this.api.ImgApply(this.imgprops);
|
||||
}
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && data.c=='fill') {
|
||||
this.setImageUrl(data.url, data.token);
|
||||
}
|
||||
},
|
||||
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.setImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
})).show();
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'fill');
|
||||
} else {
|
||||
if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType);
|
||||
this.fireEvent('editcomplete', this);
|
||||
}
|
||||
},
|
||||
|
||||
openAdvancedSettings: function(e) {
|
||||
|
|
@ -1206,21 +1228,24 @@ define([
|
|||
});
|
||||
this.fillControls.push(this.cmbPattern);
|
||||
|
||||
this.btnInsertFromFile = new Common.UI.Button({
|
||||
el: $('#shape-button-from-file')
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#shape-button-replace'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textSelectImage,
|
||||
style: "width:100%;",
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 194px;',
|
||||
maxHeight: 200,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.fillControls.push(this.btnInsertFromFile);
|
||||
|
||||
this.btnInsertFromUrl = new Common.UI.Button({
|
||||
el: $('#shape-button-from-url')
|
||||
});
|
||||
this.fillControls.push(this.btnInsertFromUrl);
|
||||
|
||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||
if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType);
|
||||
this.fireEvent('editcomplete', this);
|
||||
}, this));
|
||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
this.fillControls.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
this._arrFillType = [
|
||||
{displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH},
|
||||
|
|
@ -1848,6 +1873,8 @@ define([
|
|||
textHint90: 'Rotate 90° Clockwise',
|
||||
textHintFlipV: 'Flip Vertically',
|
||||
textHintFlipH: 'Flip Horizontally',
|
||||
strShadow: 'Show shadow'
|
||||
strShadow: 'Show shadow',
|
||||
textFromStorage: 'From Storage',
|
||||
textSelectImage: 'Select Picture'
|
||||
}, DE.Views.ShapeSettings || {}));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
|
|||
this.props = options.props;
|
||||
this.fontStore = options.fontStore;
|
||||
this.api = options.api;
|
||||
this.storage = !!options.storage;
|
||||
this.textControls = [];
|
||||
this.imageControls = [];
|
||||
this.fontName = 'Arial';
|
||||
|
|
@ -165,19 +166,25 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
|
|||
}, this));
|
||||
|
||||
// Image watermark
|
||||
this.btnFromFile = new Common.UI.Button({
|
||||
el: $('#watermark-from-file')
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#watermark-select-image'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textSelect,
|
||||
style: 'width: 142px;',
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 142px;',
|
||||
maxHeight: 200,
|
||||
additionalAlign: this.menuAddAlign,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.btnFromFile.on('click', _.bind(function(btn){
|
||||
this.props.showFileDialog();
|
||||
}, this));
|
||||
this.imageControls.push(this.btnFromFile);
|
||||
|
||||
this.btnFromUrl = new Common.UI.Button({
|
||||
el: $('#watermark-from-url')
|
||||
});
|
||||
this.btnFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
this.imageControls.push(this.btnFromUrl);
|
||||
this.imageControls.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.storage);
|
||||
|
||||
this._arrScale = [
|
||||
{displayValue: this.textAuto, value: -1},
|
||||
|
|
@ -190,7 +197,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
|
|||
this.cmbScale = new Common.UI.ComboBox({
|
||||
el : $('#watermark-combo-scale'),
|
||||
cls : 'input-group-nr',
|
||||
menuStyle : 'min-width: 90px;',
|
||||
menuStyle : 'min-width: 142px;',
|
||||
data : this._arrScale
|
||||
}).on('selected', _.bind(function(combo, record) {
|
||||
}, this));
|
||||
|
|
@ -410,8 +417,17 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
|
|||
me.btnOk.setDisabled(false);
|
||||
};
|
||||
this.api.asc_registerCallback('asc_onWatermarkImageLoaded', onApiWMLoaded);
|
||||
|
||||
var insertImageFromStorage = function(data) {
|
||||
if (data && data.url && data.c=='watermark') {
|
||||
me.props.put_ImageUrl(data.url, data.token);
|
||||
}
|
||||
};
|
||||
Common.NotificationCenter.on('storage:image-insert', insertImageFromStorage);
|
||||
|
||||
this.on('close', function(obj){
|
||||
me.api.asc_unregisterCallback('asc_onWatermarkImageLoaded', onApiWMLoaded);
|
||||
Common.NotificationCenter.off('storage:image-insert', insertImageFromStorage);
|
||||
});
|
||||
},
|
||||
|
||||
|
|
@ -482,18 +498,24 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
|
|||
return item ? item.get('displayValue') : null;
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.props.put_ImageUrl(checkUrl);
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.props.put_ImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})).show();
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'watermark');
|
||||
} else {
|
||||
this.props.showFileDialog();
|
||||
}
|
||||
},
|
||||
|
||||
_setDefaults: function (props) {
|
||||
|
|
@ -672,7 +694,9 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
|
|||
textHor: 'Horizontal',
|
||||
textColor: 'Text color',
|
||||
textNewColor: 'Add New Custom Color',
|
||||
textLanguage: 'Language'
|
||||
textLanguage: 'Language',
|
||||
textFromStorage: 'From Storage',
|
||||
textSelect: 'Select Image'
|
||||
|
||||
}, DE.Views.WatermarkSettingsDialog || {}))
|
||||
});
|
||||
|
|
@ -1419,6 +1419,7 @@
|
|||
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
|
||||
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
|
||||
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
|
||||
"DE.Views.DocumentHolder.textFromStorage": "From Storage",
|
||||
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
|
||||
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
|
||||
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
|
||||
|
|
@ -1631,6 +1632,7 @@
|
|||
"DE.Views.ImageSettings.txtThrough": "Through",
|
||||
"DE.Views.ImageSettings.txtTight": "Tight",
|
||||
"DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
|
||||
"DE.Views.ImageSettings.textFromStorage": "From Storage",
|
||||
"DE.Views.ImageSettingsAdvanced.strMargins": "Text Padding",
|
||||
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute",
|
||||
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alignment",
|
||||
|
|
@ -2008,6 +2010,8 @@
|
|||
"DE.Views.ShapeSettings.txtTight": "Tight",
|
||||
"DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
|
||||
"DE.Views.ShapeSettings.txtWood": "Wood",
|
||||
"DE.Views.ShapeSettings.textFromStorage": "From Storage",
|
||||
"DE.Views.ShapeSettings.textSelectImage": "Select Picture",
|
||||
"DE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
|
||||
"DE.Views.SignatureSettings.strDelete": "Remove Signature",
|
||||
"DE.Views.SignatureSettings.strDetails": "Signature Details",
|
||||
|
|
@ -2425,5 +2429,7 @@
|
|||
"DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent",
|
||||
"DE.Views.WatermarkSettingsDialog.textUnderline": "Underline",
|
||||
"DE.Views.WatermarkSettingsDialog.tipFontName": "Font Name",
|
||||
"DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size"
|
||||
"DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size",
|
||||
"DE.Views.WatermarkSettingsDialog.textFromStorage": "From Storage",
|
||||
"DE.Views.WatermarkSettingsDialog.textSelect": "Select Image"
|
||||
}
|
||||
|
|
@ -69,6 +69,8 @@
|
|||
"Common.Controllers.Collaboration.textTabs": "Change tabs",
|
||||
"Common.Controllers.Collaboration.textUnderline": "Underline",
|
||||
"Common.Controllers.Collaboration.textWidow": "Widow control",
|
||||
"Common.Controllers.Collaboration.textDelete": "Delete",
|
||||
"Common.Controllers.Collaboration.textNoChanges": "There are no changes.",
|
||||
"Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors",
|
||||
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
|
||||
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
|
||||
|
|
@ -93,6 +95,11 @@
|
|||
"Common.Views.Collaboration.textAddReply": "Add Reply",
|
||||
"Common.Views.Collaboration.textEditReply": "Edit Reply",
|
||||
"Common.Views.Collaboration.textCancel": "Cancel",
|
||||
"Common.Views.Collaboration.textAllChangesEditing": "All changes (Editing)",
|
||||
"Common.Views.Collaboration.textAllChangesAcceptedPreview": "All changes accepted (Preview)",
|
||||
"Common.Views.Collaboration.textAllChangesRejectedPreview": "All changes rejected (Preview)",
|
||||
"Common.Views.Collaboration.textAccept": "Accept",
|
||||
"Common.Views.Collaboration.textReject": "Reject",
|
||||
"DE.Controllers.AddContainer.textImage": "Image",
|
||||
"DE.Controllers.AddContainer.textOther": "Other",
|
||||
"DE.Controllers.AddContainer.textShape": "Shape",
|
||||
|
|
|
|||
|
|
@ -6403,6 +6403,9 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
margin-left: 20px;
|
||||
color: #212121;
|
||||
}
|
||||
.page-change {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
.page-change .block-description {
|
||||
background-color: #fff;
|
||||
padding-top: 15px;
|
||||
|
|
@ -6433,28 +6436,51 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
}
|
||||
.page-change .block-btn,
|
||||
.page-change .content-block.block-btn:first-child {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
margin: 26px 0;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 44px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.page-change .block-btn #btn-next-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 #btn-goto-change,
|
||||
.page-change .content-block.block-btn:first-child #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.page-change .block-btn .right-buttons,
|
||||
.page-change .content-block.block-btn:first-child .right-buttons {
|
||||
.page-change .block-btn .change-buttons,
|
||||
.page-change .content-block.block-btn:first-child .change-buttons,
|
||||
.page-change .block-btn .accept-reject,
|
||||
.page-change .content-block.block-btn:first-child .accept-reject {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .next-prev,
|
||||
.page-change .content-block.block-btn:first-child .next-prev {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .next-prev .link,
|
||||
.page-change .content-block.block-btn:first-child .next-prev .link {
|
||||
width: 44px;
|
||||
}
|
||||
.page-change .block-btn .link,
|
||||
.page-change .content-block.block-btn:first-child .link {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 17px;
|
||||
height: 44px;
|
||||
min-width: 44px;
|
||||
}
|
||||
.page-change #no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
.navbar .center-collaboration {
|
||||
display: flex;
|
||||
|
|
@ -6467,6 +6493,13 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-title {
|
||||
font-weight: normal;
|
||||
}
|
||||
.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-subtitle {
|
||||
font-size: 14px;
|
||||
color: #8e8e93;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
|
@ -7472,6 +7505,31 @@ i.icon.icon-collaboration {
|
|||
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-users {
|
||||
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%22M16%207C16%209.34102%2015.4162%2011.1346%2014.6143%2012.3121C13.8071%2013.4974%2012.8337%2014%2012%2014C11.1663%2014%2010.1929%2013.4974%209.38574%2012.3121C8.5838%2011.1346%208%209.34102%208%207C8%204.61508%209.97853%203%2012%203C14.0215%203%2016%204.61508%2016%207ZM15.1891%2013.2201C14.2865%2014.375%2013.1451%2015%2012%2015C10.8549%2015%209.71347%2014.375%208.81092%2013.2201C7.40473%2013.7844%206.21268%2014.3488%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.7873%2014.3488%2016.5953%2013.7844%2015.1891%2013.2201ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-review {
|
||||
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%22M3%203H20V7H19V4H4V20H19V14H20V21H3V3Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M16%208H7V7H16V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2010H16V9H7V10Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M14%2012H7V11H14V12Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2014H12V13H7V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M11%2016H7V15H11V16Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M13%2015.5V17H14.5L22.5%209L21%207.5L13%2015.5Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-review-changes {
|
||||
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%22M19%2010H5V9H19V10Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M19%2013H5V12H19V13Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M19%2016H5V15H19V16Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%206H3V19H21V6ZM3%205H2V6V19V20H3H21H22V19V6V5H21H3Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-accept-changes {
|
||||
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%22M12%2020L9%2017L8%2018L12%2022L22%2012L21%2011L12%2020Z%22%20fill%3D%22%2340865C%22%2F%3E%3Cpath%20d%3D%22M19%209H5V8H19V9Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M16%2012H5V11H16V12Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M14%2015H5V14H14V15Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%205H21V9H22V5V4H21H3H2V5V19V20H3H6V19H3V5Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-reject-changes {
|
||||
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%22M13%2011L12%2012L16%2016L12%2020L13%2021L17%2017L21%2021L22%2020L18%2016L22%2012L21%2011L17%2015L13%2011Z%22%20fill%3D%22%23AA5252%22%2F%3E%3Cpath%20d%3D%22M19%209H5V8H19V9Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M10%2012H5V11H10V12Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M10%2015H5V14H10V15Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%205H21V9H22V5V4H21H3H2V5V19V20H3H10V19H3V5Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
@ -7497,11 +7555,6 @@ i.icon.icon-goto {
|
|||
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");
|
||||
}
|
||||
i.icon.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -5986,7 +5986,7 @@ html.phone .document-menu .list-block .item-link {
|
|||
word-wrap: break-word;
|
||||
}
|
||||
.page-change #user-name {
|
||||
font-size: 17px;
|
||||
font-size: 16px;
|
||||
line-height: 22px;
|
||||
color: #000000;
|
||||
margin: 0;
|
||||
|
|
@ -6006,25 +6006,54 @@ html.phone .document-menu .list-block .item-link {
|
|||
margin-top: 10px;
|
||||
}
|
||||
.page-change .block-btn {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
padding: 26px 0;
|
||||
background-color: #EFEFF4;
|
||||
width: 100%;
|
||||
height: 56px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.page-change .block-btn #btn-next-change,
|
||||
.page-change .block-btn #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
margin-left: 15px;
|
||||
}
|
||||
.page-change .block-btn #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.page-change .block-btn .right-buttons {
|
||||
.page-change .block-btn .change-buttons,
|
||||
.page-change .block-btn .accept-reject,
|
||||
.page-change .block-btn .next-prev {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .link {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 14px;
|
||||
text-transform: uppercase;
|
||||
font-weight: 500;
|
||||
height: 56px;
|
||||
min-width: 48px;
|
||||
}
|
||||
.page-change .header-change {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
padding-right: 16px;
|
||||
}
|
||||
.page-change .header-change .initials-change {
|
||||
height: 40px;
|
||||
width: 40px;
|
||||
border-radius: 50px;
|
||||
color: #FFFFFF;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 16px;
|
||||
font-size: 18px;
|
||||
}
|
||||
.page-change #no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
.container-collaboration .navbar .right.close-collaboration {
|
||||
position: absolute;
|
||||
|
|
@ -6033,6 +6062,10 @@ html.phone .document-menu .list-block .item-link {
|
|||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.page-display-mode .list-block .item-subtitle {
|
||||
font-size: 14px;
|
||||
color: #9e9e9e;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
|
@ -7019,6 +7052,31 @@ i.icon.icon-collaboration {
|
|||
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-users {
|
||||
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%22M15.5%207C15.5%209.26153%2014.9357%2010.9518%2014.201%2012.0307C13.4584%2013.121%2012.6234%2013.5%2012%2013.5C11.3766%2013.5%2010.5416%2013.121%209.79901%2012.0307C9.0643%2010.9518%208.5%209.26153%208.5%207C8.5%204.92262%2010.2222%203.5%2012%203.5C13.7778%203.5%2015.5%204.92262%2015.5%207ZM14.8461%2013.6216C14.006%2014.5191%2013.0044%2015%2012%2015C10.9956%2015%209.99399%2014.5191%209.15395%2013.6216C7.69714%2014.1996%206.4782%2014.7725%205.52945%2015.3496C3.82884%2016.3839%203.5%2017.1203%203.5%2017.5C3.5%2018.0104%203.76355%2018.6977%205.04703%2019.3409C6.37522%2020.0065%208.60909%2020.4999%2012%2020.5C15.3909%2020.5%2017.6248%2020.0065%2018.953%2019.3409C20.2364%2018.6977%2020.5%2018.0104%2020.5%2017.5C20.5%2017.1203%2020.1712%2016.3839%2018.4705%2015.3496C17.5218%2014.7725%2016.3029%2014.1996%2014.8461%2013.6216ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-review {
|
||||
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%22M17.5%203.5H4.5V20.5H17.5V18H19V20C19%2020.5321%2018.7973%2021.0297%2018.3918%2021.4366C17.9864%2021.8122%2017.5302%2022%2017%2022H5C4.46979%2022%204.01364%2021.8122%203.60819%2021.4366C3.20273%2021.0297%203%2020.5266%203%2019.9945V4C3%202.89543%203.89543%202%205%202H17C17.5302%202%2017.9864%202.20344%2018.3918%202.61033C18.7661%202.98592%2019%203.46792%2019%204V7H17.5V3.5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22.8438%2010.2396L21.8281%2011.2552L19.7448%209.17188L20.7604%208.15625C20.8646%208.05208%2020.9948%208%2021.151%208C21.3073%208%2021.4375%208.05208%2021.5417%208.15625L22.8438%209.45833C22.9479%209.5625%2023%209.69271%2023%209.84896C23%2010.0052%2022.9479%2010.1354%2022.8438%2010.2396ZM13%2015.9167L19.1458%209.77083L21.2292%2011.8542L15.0833%2018H13V15.9167Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2015.5H11V17H7V15.5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2011H13V12.5H7V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%207H15V8.5H7V7Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-review-changes {
|
||||
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%22M20.5%204.5L20.5%2019.5L3.5%2019.5L3.5%204.5L20.5%204.5ZM22%2019L22%205C22%203.89543%2021.1046%203%2020%203L4.00549%203C3.47341%203%202.97026%203.20273%202.56338%203.60819C2.18779%204.01364%202%204.46978%202%205L2%2019C2%2019.5302%202.18779%2019.9864%202.56338%2020.3918C2.97026%2020.7973%203.46792%2021%204%2021L20%2021C20.5321%2021%2021.0141%2020.7661%2021.3897%2020.3918C21.7966%2019.9864%2022%2019.5302%2022%2019Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2015H18V16.5H6V15Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2011H18V12.5H6V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%207H18V8.5H6V7Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-accept-changes {
|
||||
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%22M13.3966%2019.2877L21.6495%2011L23%2012.3562L13.3966%2022L9%2017.5849L10.3505%2016.2288L13.3966%2019.2877Z%22%20fill%3D%22%2340865C%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.5%208L20.5%204.5L3.5%204.5L3.5%2017.5L7%2017.5L7%2019L4%2019C3.46792%2019%202.97026%2018.7973%202.56338%2018.3918C2.18779%2017.9864%202%2017.5302%202%2017L2%205C2%204.46978%202.18779%204.01364%202.56338%203.60819C2.97026%203.20273%203.4734%203%204.00549%203L20%203C21.1046%203%2022%203.89543%2022%205L22%208L20.5%208Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%208H18V9.5H6V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2012H16V13.5H6V12Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-reject-changes {
|
||||
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%22M23%2013.4099L19.4099%2017L23%2020.5901L21.5901%2022L18%2018.4099L14.4099%2022L13%2020.5901L16.5901%2017L13%2013.4099L14.4099%2012L18%2015.5901L21.5901%2012L23%2013.4099Z%22%20fill%3D%22%23C60915%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.5%2010L20.5%204.5L3.5%204.5L3.5%2017.5L11%2017.5L11%2019L4%2019C3.46792%2019%202.97026%2018.7973%202.56338%2018.3918C2.18779%2017.9864%202%2017.5302%202%2017L2%205C2%204.46978%202.18779%204.01364%202.56338%203.60819C2.97026%203.20273%203.4734%203%204.00549%203L20%203C21.1046%203%2022%203.89543%2022%205L22%2010L20.5%2010Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%208H18V9.5H6L6%208Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2012H11V13.5H6V12Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
@ -7032,22 +7090,17 @@ i.icon.icon-reject {
|
|||
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");
|
||||
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.98438%206L15.9844%2012L9.98438%2018L8.57812%2016.5938L13.1719%2012L8.57812%207.40625L9.98438%206Z%22%20fill%3D%22%23446995%22%2F%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");
|
||||
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%22M15.4219%207.40625L10.8281%2012L15.4219%2016.5938L14.0156%2018L8.01562%2012L14.0156%206L15.4219%207.40625Z%22%20fill%3D%22%23446995%22%2F%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");
|
||||
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%22M20.5%203.5H3.5V20.5H20.5V3.5ZM3.5%202H2V3.5V20.5V22H3.5H20.5H22V20.5V3.5V2H20.5H3.5ZM14.6893%208.25H9V6.75H16.5H17.25V7.5V15H15.75V9.31066L7.53033%2017.5303L6.46967%2016.4697L14.6893%208.25Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-app-settings {
|
||||
width: 24px;
|
||||
|
|
|
|||
|
|
@ -426,6 +426,31 @@ i.icon {
|
|||
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-users {
|
||||
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="M16 7C16 9.34102 15.4162 11.1346 14.6143 12.3121C13.8071 13.4974 12.8337 14 12 14C11.1663 14 10.1929 13.4974 9.38574 12.3121C8.5838 11.1346 8 9.34102 8 7C8 4.61508 9.97853 3 12 3C14.0215 3 16 4.61508 16 7ZM15.1891 13.2201C14.2865 14.375 13.1451 15 12 15C10.8549 15 9.71347 14.375 8.81092 13.2201C7.40473 13.7844 6.21268 14.3488 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.7873 14.3488 16.5953 13.7844 15.1891 13.2201ZM15.7544 12.37C16.5137 11.0279 17 9.20917 17 7C17 4 14.5088 2 12 2C9.49121 2 7 4 7 7C7 9.20917 7.48633 11.0279 8.24563 12.37C4.38973 13.9392 2 15.579 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.579 19.6103 13.9392 15.7544 12.37Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-review {
|
||||
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="M3 3H20V7H19V4H4V20H19V14H20V21H3V3Z" fill="@{themeColor}"/><path d="M16 8H7V7H16V8Z" fill="@{themeColor}"/><path d="M7 10H16V9H7V10Z" fill="@{themeColor}"/><path d="M14 12H7V11H14V12Z" fill="@{themeColor}"/><path d="M7 14H12V13H7V14Z" fill="@{themeColor}"/><path d="M11 16H7V15H11V16Z" fill="@{themeColor}"/><path d="M13 15.5V17H14.5L22.5 9L21 7.5L13 15.5Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-review-changes {
|
||||
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="M19 10H5V9H19V10Z" fill="@{themeColor}"/><path d="M19 13H5V12H19V13Z" fill="@{themeColor}"/><path d="M19 16H5V15H19V16Z" fill="@{themeColor}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 6H3V19H21V6ZM3 5H2V6V19V20H3H21H22V19V6V5H21H3Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-accept-changes {
|
||||
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="M12 20L9 17L8 18L12 22L22 12L21 11L12 20Z" fill="#40865C"/><path d="M19 9H5V8H19V9Z" fill="@{themeColor}"/><path d="M16 12H5V11H16V12Z" fill="@{themeColor}"/><path d="M14 15H5V14H14V15Z" fill="@{themeColor}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3 5H21V9H22V5V4H21H3H2V5V19V20H3H6V19H3V5Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-reject-changes {
|
||||
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="M13 11L12 12L16 16L12 20L13 21L17 17L21 21L22 20L18 16L22 12L21 11L17 15L13 11Z" fill="#AA5252"/><path d="M19 9H5V8H19V9Z" fill="@{themeColor}"/><path d="M10 12H5V11H10V12Z" fill="@{themeColor}"/><path d="M10 15H5V14H10V15Z" fill="@{themeColor}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3 5H21V9H22V5V4H21H3H2V5V19V20H3H10V19H3V5Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
@ -451,11 +476,6 @@ i.icon {
|
|||
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>');
|
||||
}
|
||||
&.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -349,6 +349,31 @@ i.icon {
|
|||
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-users {
|
||||
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="M15.5 7C15.5 9.26153 14.9357 10.9518 14.201 12.0307C13.4584 13.121 12.6234 13.5 12 13.5C11.3766 13.5 10.5416 13.121 9.79901 12.0307C9.0643 10.9518 8.5 9.26153 8.5 7C8.5 4.92262 10.2222 3.5 12 3.5C13.7778 3.5 15.5 4.92262 15.5 7ZM14.8461 13.6216C14.006 14.5191 13.0044 15 12 15C10.9956 15 9.99399 14.5191 9.15395 13.6216C7.69714 14.1996 6.4782 14.7725 5.52945 15.3496C3.82884 16.3839 3.5 17.1203 3.5 17.5C3.5 18.0104 3.76355 18.6977 5.04703 19.3409C6.37522 20.0065 8.60909 20.4999 12 20.5C15.3909 20.5 17.6248 20.0065 18.953 19.3409C20.2364 18.6977 20.5 18.0104 20.5 17.5C20.5 17.1203 20.1712 16.3839 18.4705 15.3496C17.5218 14.7725 16.3029 14.1996 14.8461 13.6216ZM15.7544 12.37C16.5137 11.0279 17 9.20917 17 7C17 4 14.5088 2 12 2C9.49121 2 7 4 7 7C7 9.20917 7.48633 11.0279 8.24563 12.37C4.38973 13.9392 2 15.579 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.579 19.6103 13.9392 15.7544 12.37Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-review {
|
||||
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="M17.5 3.5H4.5V20.5H17.5V18H19V20C19 20.5321 18.7973 21.0297 18.3918 21.4366C17.9864 21.8122 17.5302 22 17 22H5C4.46979 22 4.01364 21.8122 3.60819 21.4366C3.20273 21.0297 3 20.5266 3 19.9945V4C3 2.89543 3.89543 2 5 2H17C17.5302 2 17.9864 2.20344 18.3918 2.61033C18.7661 2.98592 19 3.46792 19 4V7H17.5V3.5Z" fill="@{themeColor}"/><path d="M22.8438 10.2396L21.8281 11.2552L19.7448 9.17188L20.7604 8.15625C20.8646 8.05208 20.9948 8 21.151 8C21.3073 8 21.4375 8.05208 21.5417 8.15625L22.8438 9.45833C22.9479 9.5625 23 9.69271 23 9.84896C23 10.0052 22.9479 10.1354 22.8438 10.2396ZM13 15.9167L19.1458 9.77083L21.2292 11.8542L15.0833 18H13V15.9167Z" fill="@{themeColor}"/><path d="M7 15.5H11V17H7V15.5Z" fill="@{themeColor}"/><path d="M7 11H13V12.5H7V11Z" fill="@{themeColor}"/><path d="M7 7H15V8.5H7V7Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-review-changes {
|
||||
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="M20.5 4.5L20.5 19.5L3.5 19.5L3.5 4.5L20.5 4.5ZM22 19L22 5C22 3.89543 21.1046 3 20 3L4.00549 3C3.47341 3 2.97026 3.20273 2.56338 3.60819C2.18779 4.01364 2 4.46978 2 5L2 19C2 19.5302 2.18779 19.9864 2.56338 20.3918C2.97026 20.7973 3.46792 21 4 21L20 21C20.5321 21 21.0141 20.7661 21.3897 20.3918C21.7966 19.9864 22 19.5302 22 19Z" fill="@{themeColor}"/><path d="M6 15H18V16.5H6V15Z" fill="@{themeColor}"/><path d="M6 11H18V12.5H6V11Z" fill="@{themeColor}"/><path d="M6 7H18V8.5H6V7Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-accept-changes {
|
||||
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="M13.3966 19.2877L21.6495 11L23 12.3562L13.3966 22L9 17.5849L10.3505 16.2288L13.3966 19.2877Z" fill="#40865C"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20.5 8L20.5 4.5L3.5 4.5L3.5 17.5L7 17.5L7 19L4 19C3.46792 19 2.97026 18.7973 2.56338 18.3918C2.18779 17.9864 2 17.5302 2 17L2 5C2 4.46978 2.18779 4.01364 2.56338 3.60819C2.97026 3.20273 3.4734 3 4.00549 3L20 3C21.1046 3 22 3.89543 22 5L22 8L20.5 8Z" fill="@{themeColor}"/><path d="M6 8H18V9.5H6V8Z" fill="@{themeColor}"/><path d="M6 12H16V13.5H6V12Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-reject-changes {
|
||||
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="M23 13.4099L19.4099 17L23 20.5901L21.5901 22L18 18.4099L14.4099 22L13 20.5901L16.5901 17L13 13.4099L14.4099 12L18 15.5901L21.5901 12L23 13.4099Z" fill="#C60915"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20.5 10L20.5 4.5L3.5 4.5L3.5 17.5L11 17.5L11 19L4 19C3.46792 19 2.97026 18.7973 2.56338 18.3918C2.18779 17.9864 2 17.5302 2 17L2 5C2 4.46978 2.18779 4.01364 2.56338 3.60819C2.97026 3.20273 3.4734 3 4.00549 3L20 3C21.1046 3 22 3.89543 22 5L22 10L20.5 10Z" fill="@{themeColor}"/><path d="M6 8H18V9.5H6L6 8Z" fill="@{themeColor}"/><path d="M6 12H11V13.5H6V12Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-accept {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
@ -362,22 +387,17 @@ i.icon {
|
|||
&.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>');
|
||||
.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.98438 6L15.9844 12L9.98438 18L8.57812 16.5938L13.1719 12L8.57812 7.40625L9.98438 6Z" fill="@{themeColor}"/></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>');
|
||||
.encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M15.4219 7.40625L10.8281 12L15.4219 16.5938L14.0156 18L8.01562 12L14.0156 6L15.4219 7.40625Z" fill="@{themeColor}"/></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>');
|
||||
.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="M20.5 3.5H3.5V20.5H20.5V3.5ZM3.5 2H2V3.5V20.5V22H3.5H20.5H22V20.5V3.5V2H20.5H3.5ZM14.6893 8.25H9V6.75H16.5H17.25V7.5V15H15.75V9.31066L7.53033 17.5303L6.46967 16.4697L14.6893 8.25Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-app-settings {
|
||||
width: 24px;
|
||||
|
|
|
|||
|
|
@ -368,6 +368,8 @@ define([
|
|||
this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this));
|
||||
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
|
||||
this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this));
|
||||
Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this));
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
} else if (this.mode.isRestrictedEdit) {
|
||||
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPagesRestricted, this));
|
||||
}
|
||||
|
|
@ -1453,26 +1455,36 @@ define([
|
|||
}
|
||||
})).show();
|
||||
} else if (opts === 'storage') {
|
||||
if (this.toolbar.mode.canRequestInsertImage) {
|
||||
Common.Gateway.requestInsertImage();
|
||||
} else {
|
||||
(new Common.Views.SelectFileDlg({
|
||||
fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
|
||||
})).on('selectfile', function(obj, file){
|
||||
me.insertImage(file);
|
||||
}).show();
|
||||
}
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'add');
|
||||
}
|
||||
},
|
||||
|
||||
insertImage: function(data) {
|
||||
if (data && data.url) {
|
||||
openImageFromStorage: function(type) {
|
||||
var me = this;
|
||||
if (this.toolbar.mode.canRequestInsertImage) {
|
||||
Common.Gateway.requestInsertImage(type);
|
||||
} else {
|
||||
(new Common.Views.SelectFileDlg({
|
||||
fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
|
||||
})).on('selectfile', function(obj, file){
|
||||
file && (file.c = type);
|
||||
me.insertImage(file);
|
||||
}).show();
|
||||
}
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && (!data.c || data.c=='add')) {
|
||||
this.toolbar.fireEvent('insertimage', this.toolbar);
|
||||
this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage
|
||||
Common.component.Analytics.trackEvent('ToolBar', 'Image');
|
||||
}
|
||||
},
|
||||
|
||||
insertImage: function(data) { // gateway
|
||||
Common.NotificationCenter.trigger('storage:image-insert', data);
|
||||
},
|
||||
|
||||
onInsertText: function(status) {
|
||||
if ( status == 'begin' ) {
|
||||
this._addAutoshape(true, 'textRect');
|
||||
|
|
|
|||
|
|
@ -60,20 +60,12 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td colspan=2>
|
||||
<label class="header" id="image-lbl-replace" ><%= scope.textInsert %></label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="image-button-from-file" style="width:85px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="image-button-from-url" style="width:85px;"><%= scope.textFromUrl %></button>
|
||||
<div id="image-button-replace" style="width:100%;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="padding-small" colspan=2>
|
||||
<button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100px;"><%= scope.textEdit %></button>
|
||||
<button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100%;"><%= scope.textEditObject %></button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -17,11 +17,8 @@
|
|||
<div id="shape-panel-image-fill" class="settings-hidden padding-small" style="width: 100%;">
|
||||
<table cols="2" style="width: 100%;">
|
||||
<tr>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;float:right;"><%= scope.textFromUrl %></button>
|
||||
<td colspan="2" class="padding-small">
|
||||
<div id="shape-button-replace" style="width:100%;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -17,11 +17,8 @@
|
|||
<div id="slide-panel-image-fill" class="settings-hidden padding-small" style="width: 100%;">
|
||||
<table cols="2" style="width: 100%;">
|
||||
<tr>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="slide-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="slide-button-from-url" style="width:90px;float:right;"><%= scope.textFromUrl %></button>
|
||||
<td colspan="2" class="padding-small">
|
||||
<div id="slide-button-replace" style="width:100%;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -2848,7 +2848,12 @@ define([
|
|||
}),
|
||||
new Common.UI.MenuItem({
|
||||
caption : this.textFromUrl
|
||||
}).on('click', _.bind(me.onInsertImageUrl, me, false))
|
||||
}).on('click', _.bind(me.onInsertImageUrl, me, false)),
|
||||
new Common.UI.MenuItem({
|
||||
caption : this.textFromStorage
|
||||
}).on('click', function(item) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'change');
|
||||
})
|
||||
]
|
||||
})
|
||||
});
|
||||
|
|
@ -3357,7 +3362,8 @@ define([
|
|||
menuImgReplace.setVisible(isimage && (pluginGuid===null || pluginGuid===undefined));
|
||||
if (menuImgReplace.isVisible())
|
||||
menuImgReplace.setDisabled(disabled || pluginGuid===null);
|
||||
|
||||
menuImgReplace.menu.items[2].setVisible(me.mode.canRequestInsertImage || me.mode.fileChoiceUrl && me.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
me.menuImgCrop.setVisible(me.api.asc_canEditCrop());
|
||||
if (me.menuImgCrop.isVisible())
|
||||
me.menuImgCrop.setDisabled(disabled);
|
||||
|
|
@ -3811,7 +3817,8 @@ define([
|
|||
txtPrintSelection: 'Print Selection',
|
||||
addToLayoutText: 'Add to Layout',
|
||||
txtResetLayout: 'Reset Slide',
|
||||
mniCustomTable: 'Insert Custom Table'
|
||||
mniCustomTable: 'Insert Custom Table',
|
||||
textFromStorage: 'From Storage'
|
||||
|
||||
}, PE.Views.DocumentHolder || {}));
|
||||
});
|
||||
|
|
@ -97,9 +97,14 @@ define([
|
|||
if (this.api) {
|
||||
this.api.asc_registerCallback('asc_ChangeCropState', _.bind(this._changeCropState, this));
|
||||
}
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
},
|
||||
|
||||
updateMetricUnit: function() {
|
||||
var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
|
||||
this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
|
||||
|
|
@ -114,15 +119,24 @@ define([
|
|||
});
|
||||
this.lockedControls.push(this.btnOriginalSize);
|
||||
|
||||
this.btnInsertFromFile = new Common.UI.Button({
|
||||
el: $('#image-button-from-file')
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#image-button-replace'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textInsert,
|
||||
style: "width:100%;",
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 194px;',
|
||||
maxHeight: 200,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.lockedControls.push(this.btnInsertFromFile);
|
||||
|
||||
this.btnInsertFromUrl = new Common.UI.Button({
|
||||
el: $('#image-button-from-url')
|
||||
});
|
||||
this.lockedControls.push(this.btnInsertFromUrl);
|
||||
this.lockedControls.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
this.btnEditObject = new Common.UI.Button({
|
||||
el: $('#image-button-edit-object')
|
||||
|
|
@ -130,14 +144,6 @@ define([
|
|||
this.lockedControls.push(this.btnEditObject);
|
||||
|
||||
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||
if (this._isFromFile) return;
|
||||
this._isFromFile = true;
|
||||
if (this.api) this.api.ChangeImageFromFile();
|
||||
this.fireEvent('editcomplete', this);
|
||||
this._isFromFile = false;
|
||||
}, this));
|
||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
this.btnEditObject.on('click', _.bind(function(btn){
|
||||
if (this.api) this.api.asc_startEditCurrentOleObject();
|
||||
this.fireEvent('editcomplete', this);
|
||||
|
|
@ -228,7 +234,6 @@ define([
|
|||
this.lockedControls.push(this.btnFlipH);
|
||||
|
||||
this.linkAdvanced = $('#image-advanced-link');
|
||||
this.lblReplace = $('#image-lbl-replace');
|
||||
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
|
||||
},
|
||||
|
||||
|
|
@ -264,10 +269,8 @@ define([
|
|||
var pluginGuid = props.asc_getPluginGuid();
|
||||
value = (pluginGuid !== null && pluginGuid !== undefined); // undefined - only images are selected, null - selected images and ole-objects
|
||||
if (this._state.isOleObject!==value) {
|
||||
this.btnInsertFromUrl.setVisible(!value);
|
||||
this.btnInsertFromFile.setVisible(!value);
|
||||
this.btnSelectImage.setVisible(!value);
|
||||
this.btnEditObject.setVisible(value);
|
||||
this.lblReplace.text(value ? this.textEditObject : this.textInsert);
|
||||
this.btnRotate270.setDisabled(value);
|
||||
this.btnRotate90.setDisabled(value);
|
||||
this.btnFlipV.setDisabled(value);
|
||||
|
|
@ -279,8 +282,7 @@ define([
|
|||
var plugin = PE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
|
||||
this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
|
||||
} else {
|
||||
this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
|
||||
this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
|
||||
this.btnSelectImage.setDisabled(pluginGuid===null || this._locked);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -303,25 +305,45 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
var props = new Asc.asc_CImgProperty();
|
||||
props.put_ImageUrl(checkUrl);
|
||||
me.api.ImgApply(props);
|
||||
}
|
||||
}
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
})).show();
|
||||
setImageUrl: function(url, token) {
|
||||
var props = new Asc.asc_CImgProperty();
|
||||
props.put_ImageUrl(url, token);
|
||||
this.api.ImgApply(props);
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && data.c=='change') {
|
||||
this.setImageUrl(data.url, data.token);
|
||||
}
|
||||
},
|
||||
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.setImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'change');
|
||||
} else {
|
||||
if (this._isFromFile) return;
|
||||
this._isFromFile = true;
|
||||
if (this.api) this.api.ChangeImageFromFile();
|
||||
this.fireEvent('editcomplete', this);
|
||||
this._isFromFile = false;
|
||||
}
|
||||
},
|
||||
|
||||
openAdvancedSettings: function(e) {
|
||||
if (this.linkAdvanced.hasClass('disabled')) return;
|
||||
|
||||
|
|
@ -448,7 +470,7 @@ define([
|
|||
textCrop: 'Crop',
|
||||
textCropFill: 'Fill',
|
||||
textCropFit: 'Fit',
|
||||
textFitSlide: 'Fit to Slide'
|
||||
|
||||
textFitSlide: 'Fit to Slide',
|
||||
textFromStorage: 'From Storage'
|
||||
}, PE.Views.ImageSettings || {}));
|
||||
});
|
||||
|
|
@ -228,7 +228,9 @@ define([
|
|||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
|
||||
this.imageSettings && this.imageSettings.setMode(mode);
|
||||
this.shapeSettings && this.shapeSettings.setMode(mode);
|
||||
this.slideSettings && this.slideSettings.setMode(mode);
|
||||
},
|
||||
|
||||
onBtnMenuClick: function(btn, e) {
|
||||
|
|
|
|||
|
|
@ -146,9 +146,14 @@ define([
|
|||
this.api.asc_setInterfaceDrawImagePlaceShape('shape-texture-img');
|
||||
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
|
||||
}
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
},
|
||||
|
||||
onFillSrcSelect: function(combo, record) {
|
||||
this.ShowHideElem(record.value);
|
||||
switch (record.value){
|
||||
|
|
@ -630,31 +635,48 @@ define([
|
|||
this.fireEvent('editcomplete', this);
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
if (me.BlipFillType !== null) {
|
||||
var props = new Asc.asc_CShapeProperty();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.put_fill( new Asc.asc_CFillBlip());
|
||||
fill.get_fill().put_type(me.BlipFillType);
|
||||
fill.get_fill().put_url(checkUrl);
|
||||
setImageUrl: function(url, token) {
|
||||
if (this.BlipFillType !== null) {
|
||||
var props = new Asc.asc_CShapeProperty();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.put_fill( new Asc.asc_CFillBlip());
|
||||
fill.get_fill().put_type(this.BlipFillType);
|
||||
fill.get_fill().put_url(url, token);
|
||||
|
||||
props.put_fill(fill);
|
||||
me.api.ShapeApply(props);
|
||||
props.put_fill(fill);
|
||||
this.api.ShapeApply(props);
|
||||
}
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && data.c=='fill') {
|
||||
this.setImageUrl(data.url, data.token);
|
||||
}
|
||||
},
|
||||
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.setImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
})).show();
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'fill');
|
||||
} else {
|
||||
if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType);
|
||||
this.fireEvent('editcomplete', this);
|
||||
}
|
||||
},
|
||||
|
||||
openAdvancedSettings: function(e) {
|
||||
|
|
@ -1119,21 +1141,24 @@ define([
|
|||
});
|
||||
this.fillControls.push(this.cmbPattern);
|
||||
|
||||
this.btnInsertFromFile = new Common.UI.Button({
|
||||
el: $('#shape-button-from-file')
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#shape-button-replace'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textSelectImage,
|
||||
style: "width:100%;",
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 194px;',
|
||||
maxHeight: 200,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.fillControls.push(this.btnInsertFromFile);
|
||||
|
||||
this.btnInsertFromUrl = new Common.UI.Button({
|
||||
el: $('#shape-button-from-url')
|
||||
});
|
||||
this.fillControls.push(this.btnInsertFromUrl);
|
||||
|
||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||
if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType);
|
||||
this.fireEvent('editcomplete', this);
|
||||
}, this));
|
||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
this.fillControls.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
this._arrFillType = [
|
||||
{displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH},
|
||||
|
|
@ -1712,6 +1737,8 @@ define([
|
|||
textHint90: 'Rotate 90° Clockwise',
|
||||
textHintFlipV: 'Flip Vertically',
|
||||
textHintFlipH: 'Flip Horizontally',
|
||||
strShadow: 'Show shadow'
|
||||
strShadow: 'Show shadow',
|
||||
textFromStorage: 'From Storage',
|
||||
textSelectImage: 'Select Picture'
|
||||
}, PE.Views.ShapeSettings || {}));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -292,9 +292,14 @@ define([
|
|||
this.api.SetInterfaceDrawImagePlaceSlide('slide-texture-img');
|
||||
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
|
||||
}
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
},
|
||||
|
||||
onFillSrcSelect: function(combo, record) {
|
||||
this.ShowHideElem(record.value);
|
||||
switch (record.value){
|
||||
|
|
@ -640,31 +645,48 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
if (me.BlipFillType !== null) {
|
||||
var props = new Asc.CAscSlideProps();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.put_fill( new Asc.asc_CFillBlip());
|
||||
fill.get_fill().put_type(me.BlipFillType);
|
||||
fill.get_fill().put_url(checkUrl);
|
||||
setImageUrl: function(url, token) {
|
||||
if (this.BlipFillType !== null) {
|
||||
var props = new Asc.CAscSlideProps();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.put_type(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.put_fill( new Asc.asc_CFillBlip());
|
||||
fill.get_fill().put_type(this.BlipFillType);
|
||||
fill.get_fill().put_url(url, token);
|
||||
|
||||
props.put_background(fill);
|
||||
me.api.SetSlideProps(props);
|
||||
props.put_background(fill);
|
||||
this.api.SetSlideProps(props);
|
||||
}
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && data.c=='slide') {
|
||||
this.setImageUrl(data.url, data.token);
|
||||
}
|
||||
},
|
||||
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.setImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
me.fireEvent('editcomplete', me);
|
||||
}
|
||||
})).show();
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'slide');
|
||||
} else {
|
||||
if (this.api) this.api.ChangeSlideImageFromFile(this.BlipFillType);
|
||||
this.fireEvent('editcomplete', this);
|
||||
}
|
||||
},
|
||||
|
||||
createDelayedControls: function() {
|
||||
|
|
@ -692,20 +714,24 @@ define([
|
|||
this.cmbPattern.on('click', _.bind(this.onPatternSelect, this));
|
||||
this.FillItems.push(this.cmbPattern);
|
||||
|
||||
this.btnInsertFromFile = new Common.UI.Button({
|
||||
el: $('#slide-button-from-file')
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#slide-button-replace'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textSelectImage,
|
||||
style: "width:100%;",
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 194px;',
|
||||
maxHeight: 200,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||
if (this.api) this.api.ChangeSlideImageFromFile(this.BlipFillType);
|
||||
this.fireEvent('editcomplete', this);
|
||||
}, this));
|
||||
this.FillItems.push(this.btnInsertFromFile);
|
||||
|
||||
this.btnInsertFromUrl = new Common.UI.Button({
|
||||
el: $('#slide-button-from-url')
|
||||
});
|
||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
this.FillItems.push(this.btnInsertFromUrl);
|
||||
this.FillItems.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
this._arrFillType = [
|
||||
{displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH},
|
||||
|
|
@ -1534,6 +1560,8 @@ define([
|
|||
textGradient: 'Gradient',
|
||||
textSec: 's',
|
||||
strSlideNum: 'Show Slide Number',
|
||||
strDateTime: 'Show Date and Time'
|
||||
strDateTime: 'Show Date and Time',
|
||||
textFromStorage: 'From Storage',
|
||||
textSelectImage: 'Select Picture'
|
||||
}, PE.Views.SlideSettings || {}));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1156,6 +1156,7 @@
|
|||
"PE.Views.DocumentHolder.txtUnderbar": "Bar under text",
|
||||
"PE.Views.DocumentHolder.txtUngroup": "Ungroup",
|
||||
"PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
|
||||
"PE.Views.DocumentHolder.textFromStorage": "From Storage",
|
||||
"PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
|
||||
"PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
|
||||
"PE.Views.DocumentPreview.txtClose": "Close slideshow",
|
||||
|
|
@ -1313,6 +1314,7 @@
|
|||
"PE.Views.ImageSettings.textRotation": "Rotation",
|
||||
"PE.Views.ImageSettings.textSize": "Size",
|
||||
"PE.Views.ImageSettings.textWidth": "Width",
|
||||
"PE.Views.ImageSettings.textFromStorage": "From Storage",
|
||||
"PE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
|
||||
"PE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
|
||||
"PE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
|
||||
|
|
@ -1445,6 +1447,8 @@
|
|||
"PE.Views.ShapeSettings.txtNoBorders": "No Line",
|
||||
"PE.Views.ShapeSettings.txtPapyrus": "Papyrus",
|
||||
"PE.Views.ShapeSettings.txtWood": "Wood",
|
||||
"PE.Views.ShapeSettings.textFromStorage": "From Storage",
|
||||
"PE.Views.ShapeSettings.textSelectImage": "Select Picture",
|
||||
"PE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
|
||||
"PE.Views.ShapeSettingsAdvanced.strMargins": "Text Padding",
|
||||
"PE.Views.ShapeSettingsAdvanced.textAlt": "Alternative Text",
|
||||
|
|
@ -1572,6 +1576,8 @@
|
|||
"PE.Views.SlideSettings.txtLeather": "Leather",
|
||||
"PE.Views.SlideSettings.txtPapyrus": "Papyrus",
|
||||
"PE.Views.SlideSettings.txtWood": "Wood",
|
||||
"PE.Views.SlideSettings.textFromStorage": "From Storage",
|
||||
"PE.Views.SlideSettings.textSelectImage": "Select Picture",
|
||||
"PE.Views.SlideshowSettings.textLoop": "Loop continuously until 'Esc' is pressed",
|
||||
"PE.Views.SlideshowSettings.textTitle": "Show Settings",
|
||||
"PE.Views.SlideSizeSettings.strLandscape": "Landscape",
|
||||
|
|
|
|||
|
|
@ -6403,6 +6403,9 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
margin-left: 20px;
|
||||
color: #212121;
|
||||
}
|
||||
.page-change {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
.page-change .block-description {
|
||||
background-color: #fff;
|
||||
padding-top: 15px;
|
||||
|
|
@ -6433,28 +6436,51 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
}
|
||||
.page-change .block-btn,
|
||||
.page-change .content-block.block-btn:first-child {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
margin: 26px 0;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 44px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.page-change .block-btn #btn-next-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 #btn-goto-change,
|
||||
.page-change .content-block.block-btn:first-child #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.page-change .block-btn .right-buttons,
|
||||
.page-change .content-block.block-btn:first-child .right-buttons {
|
||||
.page-change .block-btn .change-buttons,
|
||||
.page-change .content-block.block-btn:first-child .change-buttons,
|
||||
.page-change .block-btn .accept-reject,
|
||||
.page-change .content-block.block-btn:first-child .accept-reject {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .next-prev,
|
||||
.page-change .content-block.block-btn:first-child .next-prev {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .next-prev .link,
|
||||
.page-change .content-block.block-btn:first-child .next-prev .link {
|
||||
width: 44px;
|
||||
}
|
||||
.page-change .block-btn .link,
|
||||
.page-change .content-block.block-btn:first-child .link {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 17px;
|
||||
height: 44px;
|
||||
min-width: 44px;
|
||||
}
|
||||
.page-change #no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
.navbar .center-collaboration {
|
||||
display: flex;
|
||||
|
|
@ -6467,6 +6493,13 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-title {
|
||||
font-weight: normal;
|
||||
}
|
||||
.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-subtitle {
|
||||
font-size: 14px;
|
||||
color: #8e8e93;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
|
@ -7448,6 +7481,11 @@ i.icon.icon-collaboration {
|
|||
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");
|
||||
}
|
||||
i.icon.icon-users {
|
||||
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%22M16%207C16%209.34102%2015.4162%2011.1346%2014.6143%2012.3121C13.8071%2013.4974%2012.8337%2014%2012%2014C11.1663%2014%2010.1929%2013.4974%209.38574%2012.3121C8.5838%2011.1346%208%209.34102%208%207C8%204.61508%209.97853%203%2012%203C14.0215%203%2016%204.61508%2016%207ZM15.1891%2013.2201C14.2865%2014.375%2013.1451%2015%2012%2015C10.8549%2015%209.71347%2014.375%208.81092%2013.2201C7.40473%2013.7844%206.21268%2014.3488%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.7873%2014.3488%2016.5953%2013.7844%2015.1891%2013.2201ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -5986,7 +5986,7 @@ html.phone .document-menu .list-block .item-link {
|
|||
word-wrap: break-word;
|
||||
}
|
||||
.page-change #user-name {
|
||||
font-size: 17px;
|
||||
font-size: 16px;
|
||||
line-height: 22px;
|
||||
color: #000000;
|
||||
margin: 0;
|
||||
|
|
@ -6006,25 +6006,54 @@ html.phone .document-menu .list-block .item-link {
|
|||
margin-top: 10px;
|
||||
}
|
||||
.page-change .block-btn {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
padding: 26px 0;
|
||||
background-color: #EFEFF4;
|
||||
width: 100%;
|
||||
height: 56px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.page-change .block-btn #btn-next-change,
|
||||
.page-change .block-btn #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
margin-left: 15px;
|
||||
}
|
||||
.page-change .block-btn #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.page-change .block-btn .right-buttons {
|
||||
.page-change .block-btn .change-buttons,
|
||||
.page-change .block-btn .accept-reject,
|
||||
.page-change .block-btn .next-prev {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .link {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 14px;
|
||||
text-transform: uppercase;
|
||||
font-weight: 500;
|
||||
height: 56px;
|
||||
min-width: 48px;
|
||||
}
|
||||
.page-change .header-change {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
padding-right: 16px;
|
||||
}
|
||||
.page-change .header-change .initials-change {
|
||||
height: 40px;
|
||||
width: 40px;
|
||||
border-radius: 50px;
|
||||
color: #FFFFFF;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 16px;
|
||||
font-size: 18px;
|
||||
}
|
||||
.page-change #no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
.container-collaboration .navbar .right.close-collaboration {
|
||||
position: absolute;
|
||||
|
|
@ -6033,6 +6062,10 @@ html.phone .document-menu .list-block .item-link {
|
|||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.page-display-mode .list-block .item-subtitle {
|
||||
font-size: 14px;
|
||||
color: #9e9e9e;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
|
@ -7034,6 +7067,11 @@ i.icon.icon-collaboration {
|
|||
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");
|
||||
}
|
||||
i.icon.icon-users {
|
||||
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%22M15.5%207C15.5%209.26153%2014.9357%2010.9518%2014.201%2012.0307C13.4584%2013.121%2012.6234%2013.5%2012%2013.5C11.3766%2013.5%2010.5416%2013.121%209.79901%2012.0307C9.0643%2010.9518%208.5%209.26153%208.5%207C8.5%204.92262%2010.2222%203.5%2012%203.5C13.7778%203.5%2015.5%204.92262%2015.5%207ZM14.8461%2013.6216C14.006%2014.5191%2013.0044%2015%2012%2015C10.9956%2015%209.99399%2014.5191%209.15395%2013.6216C7.69714%2014.1996%206.4782%2014.7725%205.52945%2015.3496C3.82884%2016.3839%203.5%2017.1203%203.5%2017.5C3.5%2018.0104%203.76355%2018.6977%205.04703%2019.3409C6.37522%2020.0065%208.60909%2020.4999%2012%2020.5C15.3909%2020.5%2017.6248%2020.0065%2018.953%2019.3409C20.2364%2018.6977%2020.5%2018.0104%2020.5%2017.5C20.5%2017.1203%2020.1712%2016.3839%2018.4705%2015.3496C17.5218%2014.7725%2016.3029%2014.1996%2014.8461%2013.6216ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -410,6 +410,11 @@ i.icon {
|
|||
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-users {
|
||||
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="M16 7C16 9.34102 15.4162 11.1346 14.6143 12.3121C13.8071 13.4974 12.8337 14 12 14C11.1663 14 10.1929 13.4974 9.38574 12.3121C8.5838 11.1346 8 9.34102 8 7C8 4.61508 9.97853 3 12 3C14.0215 3 16 4.61508 16 7ZM15.1891 13.2201C14.2865 14.375 13.1451 15 12 15C10.8549 15 9.71347 14.375 8.81092 13.2201C7.40473 13.7844 6.21268 14.3488 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.7873 14.3488 16.5953 13.7844 15.1891 13.2201ZM15.7544 12.37C16.5137 11.0279 17 9.20917 17 7C17 4 14.5088 2 12 2C9.49121 2 7 4 7 7C7 9.20917 7.48633 11.0279 8.24563 12.37C4.38973 13.9392 2 15.579 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.579 19.6103 13.9392 15.7544 12.37Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -370,6 +370,11 @@ i.icon {
|
|||
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-users {
|
||||
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="M15.5 7C15.5 9.26153 14.9357 10.9518 14.201 12.0307C13.4584 13.121 12.6234 13.5 12 13.5C11.3766 13.5 10.5416 13.121 9.79901 12.0307C9.0643 10.9518 8.5 9.26153 8.5 7C8.5 4.92262 10.2222 3.5 12 3.5C13.7778 3.5 15.5 4.92262 15.5 7ZM14.8461 13.6216C14.006 14.5191 13.0044 15 12 15C10.9956 15 9.99399 14.5191 9.15395 13.6216C7.69714 14.1996 6.4782 14.7725 5.52945 15.3496C3.82884 16.3839 3.5 17.1203 3.5 17.5C3.5 18.0104 3.76355 18.6977 5.04703 19.3409C6.37522 20.0065 8.60909 20.4999 12 20.5C15.3909 20.5 17.6248 20.0065 18.953 19.3409C20.2364 18.6977 20.5 18.0104 20.5 17.5C20.5 17.1203 20.1712 16.3839 18.4705 15.3496C17.5218 14.7725 16.3029 14.1996 14.8461 13.6216ZM15.7544 12.37C16.5137 11.0279 17 9.20917 17 7C17 4 14.5088 2 12 2C9.49121 2 7 4 7 7C7 9.20917 7.48633 11.0279 8.24563 12.37C4.38973 13.9392 2 15.579 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.579 19.6103 13.9392 15.7544 12.37Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ define([
|
|||
},
|
||||
|
||||
onApiSelectionChanged: function(info) {
|
||||
var seltype = info.asc_getFlags().asc_getSelectionType(),
|
||||
var seltype = info.asc_getSelectionType(),
|
||||
coauth_disable = (!this.mode.isEditMailMerge && !this.mode.isEditDiagram) ? (info.asc_getLocked() === true || info.asc_getLockedTable() === true || info.asc_getLockedPivotTable()===true) : false;
|
||||
|
||||
var is_chart_text = seltype == Asc.c_oAscSelectionType.RangeChartText,
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ define([
|
|||
|
||||
// special disable conditions
|
||||
Common.Utils.lockControls(SSE.enumLock.multiselectCols, info.asc_getSelectedColsCount()>1, {array: [this.view.btnTextToColumns]});
|
||||
Common.Utils.lockControls(SSE.enumLock.multiselect, info.asc_getFlags().asc_getMultiselect(), {array: [this.view.btnTextToColumns]});
|
||||
Common.Utils.lockControls(SSE.enumLock.multiselect, info.asc_getMultiselect(), {array: [this.view.btnTextToColumns]});
|
||||
},
|
||||
|
||||
onUngroup: function(type) {
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ define([
|
|||
|
||||
onInsertEntire: function(item) {
|
||||
if (this.api) {
|
||||
switch (this.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType()) {
|
||||
switch (this.api.asc_getCellInfo().asc_getSelectionType()) {
|
||||
case Asc.c_oAscSelectionType.RangeRow:
|
||||
this.api.asc_insertCells(Asc.c_oAscInsertOptions.InsertRows);
|
||||
break;
|
||||
|
|
@ -376,7 +376,7 @@ define([
|
|||
|
||||
onDeleteEntire: function(item) {
|
||||
if (this.api) {
|
||||
switch (this.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType()) {
|
||||
switch (this.api.asc_getCellInfo().asc_getSelectionType()) {
|
||||
case Asc.c_oAscSelectionType.RangeRow:
|
||||
this.api.asc_deleteCells(Asc.c_oAscDeleteOptions.DeleteRows);
|
||||
break;
|
||||
|
|
@ -545,7 +545,7 @@ define([
|
|||
currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()),
|
||||
props : props,
|
||||
text : cell.asc_getText(),
|
||||
isLock : cell.asc_getFlags().asc_getLockText(),
|
||||
isLock : cell.asc_getLockText(),
|
||||
allowInternal: item.options.inCell
|
||||
});
|
||||
}
|
||||
|
|
@ -1567,7 +1567,7 @@ define([
|
|||
fillMenuProps: function(cellinfo, showMenu, event){
|
||||
var iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu, isimageonly,
|
||||
documentHolder = this.documentHolder,
|
||||
seltype = cellinfo.asc_getFlags().asc_getSelectionType(),
|
||||
seltype = cellinfo.asc_getSelectionType(),
|
||||
isCellLocked = cellinfo.asc_getLocked(),
|
||||
isTableLocked = cellinfo.asc_getLockedTable()===true,
|
||||
isObjLocked = false,
|
||||
|
|
@ -1649,6 +1649,7 @@ define([
|
|||
var pluginGuid = (documentHolder.mnuImgAdvanced.imageInfo) ? documentHolder.mnuImgAdvanced.imageInfo.asc_getPluginGuid() : null;
|
||||
documentHolder.menuImgReplace.setVisible(isimageonly && (pluginGuid===null || pluginGuid===undefined));
|
||||
documentHolder.menuImgReplace.setDisabled(isObjLocked || pluginGuid===null);
|
||||
documentHolder.menuImgReplace.menu.items[2].setVisible(this.permissions.canRequestInsertImage || this.permissions.fileChoiceUrl && this.permissions.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
documentHolder.menuImageArrange.setDisabled(isObjLocked);
|
||||
|
||||
documentHolder.menuImgRotate.setVisible(!ischartmenu && (pluginGuid===null || pluginGuid===undefined));
|
||||
|
|
@ -1739,7 +1740,7 @@ define([
|
|||
formatTableInfo = cellinfo.asc_getFormatTableInfo(),
|
||||
isinsparkline = (cellinfo.asc_getSparklineInfo()!==null),
|
||||
isintable = (formatTableInfo !== null),
|
||||
ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect();
|
||||
ismultiselect = cellinfo.asc_getMultiselect();
|
||||
documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null;
|
||||
documentHolder.ssMenu.cellColor = cellinfo.asc_getFillColor();
|
||||
documentHolder.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor();
|
||||
|
|
@ -1862,7 +1863,7 @@ define([
|
|||
|
||||
fillViewMenuProps: function(cellinfo, showMenu, event){
|
||||
var documentHolder = this.documentHolder,
|
||||
seltype = cellinfo.asc_getFlags().asc_getSelectionType(),
|
||||
seltype = cellinfo.asc_getSelectionType(),
|
||||
isCellLocked = cellinfo.asc_getLocked(),
|
||||
isTableLocked = cellinfo.asc_getLockedTable()===true,
|
||||
commentsController = this.getApplication().getController('Common.Controllers.Comments'),
|
||||
|
|
@ -3211,6 +3212,8 @@ define([
|
|||
if (me.api) me.api.asc_changeImageFromFile();
|
||||
Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
|
||||
}, 10);
|
||||
} else if (item.value == 'storage') {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'change');
|
||||
} else {
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
|
|
|
|||
|
|
@ -529,7 +529,7 @@ define([
|
|||
},
|
||||
|
||||
onSelectionChanged: function(info){
|
||||
if (!this._isChartDataReady && info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart) {
|
||||
if (!this._isChartDataReady && info.asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart) {
|
||||
this._isChartDataReady = true;
|
||||
Common.Gateway.internalMessage('chartDataReady');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -380,8 +380,7 @@ define([
|
|||
onSelectionChanged: function(info) {
|
||||
if (this.rangeSelectionMode || !this.appConfig.isEdit || !this.view) return;
|
||||
|
||||
var selectType = info.asc_getFlags().asc_getSelectionType(),
|
||||
pivotInfo = info.asc_getPivotTableInfo();
|
||||
var pivotInfo = info.asc_getPivotTableInfo();
|
||||
|
||||
Common.Utils.lockControls(SSE.enumLock.noPivot, !pivotInfo, {array: this.view.lockedControls});
|
||||
Common.Utils.lockControls(SSE.enumLock.editPivot, !!pivotInfo, {array: [this.view.btnAddPivot]});
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ define([
|
|||
if (this.rangeSelectionMode) return;
|
||||
|
||||
var SelectedObjects = [],
|
||||
selectType = info.asc_getFlags().asc_getSelectionType(),
|
||||
selectType = info.asc_getSelectionType(),
|
||||
formatTableInfo = info.asc_getFormatTableInfo(),
|
||||
sparkLineInfo = info.asc_getSparklineInfo(),
|
||||
cellInfo = info,
|
||||
|
|
|
|||
|
|
@ -401,6 +401,8 @@ define([
|
|||
this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
|
||||
this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this));
|
||||
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
|
||||
Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this));
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
}
|
||||
this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this));
|
||||
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
|
||||
|
|
@ -750,7 +752,7 @@ define([
|
|||
}
|
||||
|
||||
if (me.api) {
|
||||
var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge();
|
||||
var merged = me.api.asc_getCellInfo().asc_getMerge();
|
||||
if ((merged !== Asc.c_oAscMergeOptions.Merge) && me.api.asc_mergeCellsDataLost(item.value)) {
|
||||
Common.UI.warning({
|
||||
msg: me.warnMergeLostData,
|
||||
|
|
@ -785,7 +787,7 @@ define([
|
|||
},
|
||||
|
||||
onTextOrientationMenu: function(menu, item) {
|
||||
if (this.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeShapeText) {
|
||||
if (this.api.asc_getCellInfo().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeShapeText) {
|
||||
var angle = Asc.c_oAscVertDrawingText.normal;
|
||||
switch (item.value) {
|
||||
case 'rotateup': angle = Asc.c_oAscVertDrawingText.vert270; break;
|
||||
|
|
@ -854,26 +856,36 @@ define([
|
|||
}
|
||||
})).show();
|
||||
} else if (item.value === 'storage') {
|
||||
if (this.toolbar.mode.canRequestInsertImage) {
|
||||
Common.Gateway.requestInsertImage();
|
||||
} else {
|
||||
(new Common.Views.SelectFileDlg({
|
||||
fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
|
||||
})).on('selectfile', function(obj, file){
|
||||
me.insertImage(file);
|
||||
}).show();
|
||||
}
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'add');
|
||||
}
|
||||
},
|
||||
|
||||
insertImage: function(data) {
|
||||
if (data && data.url) {
|
||||
openImageFromStorage: function(type) {
|
||||
var me = this;
|
||||
if (this.toolbar.mode.canRequestInsertImage) {
|
||||
Common.Gateway.requestInsertImage(type);
|
||||
} else {
|
||||
(new Common.Views.SelectFileDlg({
|
||||
fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
|
||||
})).on('selectfile', function(obj, file){
|
||||
file && (file.c = type);
|
||||
me.insertImage(file);
|
||||
}).show();
|
||||
}
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && (!data.c || data.c=='add')) {
|
||||
this.toolbar.fireEvent('insertimage', this.toolbar);
|
||||
this.api.asc_addImageDrawingObject(data.url, undefined, data.token);// for loading from storage
|
||||
Common.component.Analytics.trackEvent('ToolBar', 'Image');
|
||||
}
|
||||
},
|
||||
|
||||
insertImage: function(data) { // gateway
|
||||
Common.NotificationCenter.trigger('storage:image-insert', data);
|
||||
},
|
||||
|
||||
onHyperlink: function(btn) {
|
||||
var me = this;
|
||||
var win,
|
||||
|
|
@ -898,7 +910,7 @@ define([
|
|||
};
|
||||
|
||||
var cell = me.api.asc_getCellInfo(),
|
||||
seltype = cell.asc_getFlags().asc_getSelectionType();
|
||||
seltype = cell.asc_getSelectionType();
|
||||
props = cell.asc_getHyperlink();
|
||||
win = new SSE.Views.HyperlinkSettingsDialog({
|
||||
api: me.api,
|
||||
|
|
@ -913,7 +925,7 @@ define([
|
|||
currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()),
|
||||
props : props,
|
||||
text : cell.asc_getText(),
|
||||
isLock : cell.asc_getFlags().asc_getLockText(),
|
||||
isLock : cell.asc_getLockText(),
|
||||
allowInternal: (seltype!==Asc.c_oAscSelectionType.RangeImage && seltype!==Asc.c_oAscSelectionType.RangeShape &&
|
||||
seltype!==Asc.c_oAscSelectionType.RangeShapeText && seltype!==Asc.c_oAscSelectionType.RangeChart &&
|
||||
seltype!==Asc.c_oAscSelectionType.RangeChartText)
|
||||
|
|
@ -926,7 +938,8 @@ define([
|
|||
onEditChart: function(btn) {
|
||||
if (!this.editMode) return;
|
||||
var me = this, info = me.api.asc_getCellInfo();
|
||||
if (info.asc_getFlags().asc_getSelectionType()!=Asc.c_oAscSelectionType.RangeImage) {
|
||||
var selectType = info.asc_getSelectionType();
|
||||
if (selectType !== Asc.c_oAscSelectionType.RangeImage) {
|
||||
var win, props;
|
||||
if (me.api){
|
||||
props = me.api.asc_getChartObject();
|
||||
|
|
@ -940,7 +953,7 @@ define([
|
|||
}
|
||||
}
|
||||
if (props) {
|
||||
var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText);
|
||||
var ischartedit = ( me.toolbar.mode.isEditDiagram || selectType === Asc.c_oAscSelectionType.RangeChart || selectType === Asc.c_oAscSelectionType.RangeChartText);
|
||||
|
||||
(new SSE.Views.ChartSettingsDlg(
|
||||
{
|
||||
|
|
@ -968,7 +981,7 @@ define([
|
|||
if (!this.editMode) return;
|
||||
var me = this,
|
||||
info = me.api.asc_getCellInfo(),
|
||||
seltype = info.asc_getFlags().asc_getSelectionType(),
|
||||
seltype = info.asc_getSelectionType(),
|
||||
isSpark = (group == 'menu-chart-group-sparkcolumn' || group == 'menu-chart-group-sparkline' || group == 'menu-chart-group-sparkwin');
|
||||
|
||||
if (me.api) {
|
||||
|
|
@ -1517,7 +1530,7 @@ define([
|
|||
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect && !me._state.inpivot &&
|
||||
!me.getApplication().getController('LeftMenu').leftMenu.menuFile.isVisible()) {
|
||||
var cellinfo = me.api.asc_getCellInfo(),
|
||||
selectionType = cellinfo.asc_getFlags().asc_getSelectionType();
|
||||
selectionType = cellinfo.asc_getSelectionType();
|
||||
if (selectionType !== Asc.c_oAscSelectionType.RangeShapeText || me.api.asc_canAddShapeHyperlink()!==false)
|
||||
me.onHyperlink();
|
||||
}
|
||||
|
|
@ -2059,7 +2072,7 @@ define([
|
|||
if ( this.toolbar.mode.isEditMailMerge )
|
||||
return this.onApiSelectionChanged_MailMergeEditor(info);
|
||||
|
||||
var selectionType = info.asc_getFlags().asc_getSelectionType(),
|
||||
var selectionType = info.asc_getSelectionType(),
|
||||
coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true || info.asc_getLockedTable()===true || info.asc_getLockedPivotTable()===true) : false,
|
||||
editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable),
|
||||
me = this,
|
||||
|
|
@ -2275,7 +2288,7 @@ define([
|
|||
}
|
||||
}
|
||||
|
||||
need_disable = (fontparam == AscCommon.align_Justify || selectionType == Asc.c_oAscSelectionType.RangeShapeText);
|
||||
need_disable = (fontparam == AscCommon.align_Justify || selectionType == Asc.c_oAscSelectionType.RangeShapeText || selectionType == Asc.c_oAscSelectionType.RangeShape);
|
||||
toolbar.btnTextOrient.menu.items[1].setDisabled(need_disable);
|
||||
toolbar.btnTextOrient.menu.items[2].setDisabled(need_disable);
|
||||
|
||||
|
|
@ -2292,18 +2305,16 @@ define([
|
|||
case Asc.c_oAscVAlign.Bottom: index = 2; align = 'btn-valign-bottom'; break;
|
||||
}
|
||||
|
||||
if (index > -1) {
|
||||
toolbar.btnAlignTop.toggle(index===0, true);
|
||||
toolbar.btnAlignMiddle.toggle(index===1, true);
|
||||
toolbar.btnAlignBottom.toggle(index===2, true);
|
||||
}
|
||||
toolbar.btnAlignTop.toggle(index===0, true);
|
||||
toolbar.btnAlignMiddle.toggle(index===1, true);
|
||||
toolbar.btnAlignBottom.toggle(index===2, true);
|
||||
}
|
||||
|
||||
need_disable = this._state.controlsdisabled.filters || formatTableInfo!==null || filterInfo && filterInfo.asc_getIsAutoFilter()===null;
|
||||
// (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable);
|
||||
toolbar.lockToolbar(SSE.enumLock.ruleMerge, need_disable, {array:[toolbar.btnMerge, toolbar.btnInsertTable]});
|
||||
|
||||
val = info.asc_getFlags().asc_getMerge();
|
||||
val = info.asc_getMerge();
|
||||
if (this._state.merge !== val) {
|
||||
toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true);
|
||||
this._state.merge = val;
|
||||
|
|
@ -2311,7 +2322,7 @@ define([
|
|||
|
||||
/* read cell text wrapping */
|
||||
if (!toolbar.btnWrap.isDisabled()) {
|
||||
val = info.asc_getFlags().asc_getWrapText();
|
||||
val = info.asc_getWrapText();
|
||||
if (this._state.wrap !== val) {
|
||||
toolbar.btnWrap.toggle(val===true, true);
|
||||
this._state.wrap = val;
|
||||
|
|
@ -2352,7 +2363,7 @@ define([
|
|||
if (this._state.tablename !== old_name || this._state.filterapplied !== old_applied)
|
||||
this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable);
|
||||
|
||||
this._state.multiselect = info.asc_getFlags().asc_getMultiselect();
|
||||
this._state.multiselect = info.asc_getMultiselect();
|
||||
toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink, toolbar.btnInsertTable]});
|
||||
|
||||
this._state.inpivot = !!info.asc_getPivotTableInfo();
|
||||
|
|
@ -2376,23 +2387,15 @@ define([
|
|||
}
|
||||
}
|
||||
|
||||
if (selectionType == Asc.c_oAscSelectionType.RangeShapeText) {
|
||||
var SelectedObjects = this.api.asc_getGraphicObjectProps();
|
||||
for (var i=0; i<SelectedObjects.length; ++i)
|
||||
{
|
||||
if (SelectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image)
|
||||
val = SelectedObjects[i].asc_getObjectValue().asc_getVert();
|
||||
}
|
||||
} else
|
||||
val = info.asc_getAngle();
|
||||
val = info.asc_getAngle();
|
||||
if (this._state.angle !== val) {
|
||||
toolbar.btnTextOrient.menu.clearAll();
|
||||
switch(val) {
|
||||
case 45: toolbar.btnTextOrient.menu.items[1].setChecked(true, true); break;
|
||||
case -45: toolbar.btnTextOrient.menu.items[2].setChecked(true, true); break;
|
||||
case 90: case Asc.c_oAscVertDrawingText.vert270: toolbar.btnTextOrient.menu.items[3].setChecked(true, true); break;
|
||||
case -90: case Asc.c_oAscVertDrawingText.vert: toolbar.btnTextOrient.menu.items[4].setChecked(true, true); break;
|
||||
default: toolbar.btnTextOrient.menu.items[0].setChecked(true, true); break;
|
||||
case 90: toolbar.btnTextOrient.menu.items[3].setChecked(true, true); break;
|
||||
case -90: toolbar.btnTextOrient.menu.items[4].setChecked(true, true); break;
|
||||
case 0: toolbar.btnTextOrient.menu.items[0].setChecked(true, true); break;
|
||||
}
|
||||
this._state.angle = val;
|
||||
}
|
||||
|
|
@ -2447,7 +2450,7 @@ define([
|
|||
},
|
||||
|
||||
onApiSelectionChangedRestricted: function(info) {
|
||||
var selectionType = info.asc_getFlags().asc_getSelectionType();
|
||||
var selectionType = info.asc_getSelectionType();
|
||||
this.toolbar.lockToolbar(SSE.enumLock.commentLock, (selectionType == Asc.c_oAscSelectionType.RangeCells) && (info.asc_getComments().length>0 || info.asc_getLocked()) ||
|
||||
this.appConfig && this.appConfig.compatibleFeatures && (selectionType != Asc.c_oAscSelectionType.RangeCells),
|
||||
{ array: this.btnsComment });
|
||||
|
|
@ -2497,7 +2500,7 @@ define([
|
|||
return is_image;
|
||||
};
|
||||
|
||||
var selectionType = info.asc_getFlags().asc_getSelectionType(),
|
||||
var selectionType = info.asc_getSelectionType(),
|
||||
coauth_disable = false;
|
||||
|
||||
if ( _disableEditOptions(selectionType, coauth_disable) ) return;
|
||||
|
|
@ -2547,7 +2550,7 @@ define([
|
|||
return is_image;
|
||||
};
|
||||
|
||||
var selectionType = info.asc_getFlags().asc_getSelectionType(),
|
||||
var selectionType = info.asc_getSelectionType(),
|
||||
coauth_disable = false,
|
||||
editOptionsDisabled = _disableEditOptions(selectionType, coauth_disable),
|
||||
val, need_disable = false;
|
||||
|
|
@ -3089,14 +3092,14 @@ define([
|
|||
win.show();
|
||||
win.setSettings({
|
||||
api : me.api,
|
||||
selectionType: me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType()
|
||||
selectionType: me.api.asc_getCellInfo().asc_getSelectionType()
|
||||
});
|
||||
} else {
|
||||
me._state.filter = undefined;
|
||||
if (me._state.tablename)
|
||||
me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.style, fmtname);
|
||||
else {
|
||||
var selectionType = me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType();
|
||||
var selectionType = me.api.asc_getCellInfo().asc_getSelectionType();
|
||||
if (selectionType == Asc.c_oAscSelectionType.RangeMax || selectionType == Asc.c_oAscSelectionType.RangeRow ||
|
||||
selectionType == Asc.c_oAscSelectionType.RangeCol)
|
||||
Common.UI.warning({
|
||||
|
|
@ -3305,7 +3308,7 @@ define([
|
|||
this.btnsComment.forEach(function (btn) {
|
||||
btn.updateHint( _comments.textHintAddComment );
|
||||
btn.on('click', function (btn, e) {
|
||||
Common.NotificationCenter.trigger('app:comment:add', 'toolbar', me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType() != Asc.c_oAscSelectionType.RangeCells);
|
||||
Common.NotificationCenter.trigger('app:comment:add', 'toolbar', me.api.asc_getCellInfo().asc_getSelectionType() != Asc.c_oAscSelectionType.RangeCells);
|
||||
});
|
||||
if (btn.cmpEl.closest('#review-changes-panel').length>0)
|
||||
btn.setCaption(me.toolbar.capBtnAddComment);
|
||||
|
|
|
|||
|
|
@ -62,20 +62,12 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td colspan=2>
|
||||
<label class="header" id="image-lbl-replace"><%= scope.textInsert %></label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="image-button-from-file" style="width:85px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="image-button-from-url" style="width:85px;"><%= scope.textFromUrl %></button>
|
||||
<div id="image-button-replace" style="width:100%;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="padding-small" colspan=2>
|
||||
<button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100px;"><%= scope.textEdit %></button>
|
||||
<button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100%;"><%= scope.textEditObject %></button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -17,11 +17,8 @@
|
|||
<div id="shape-panel-image-fill" class="settings-hidden padding-small" style="width: 100%;">
|
||||
<table cols="2" style="width: 100%;">
|
||||
<tr>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="shape-button-from-file" style="width:90px;"><%= scope.textFromFile %></button>
|
||||
</td>
|
||||
<td class="padding-small" width="50%">
|
||||
<button type="button" class="btn btn-text-default" id="shape-button-from-url" style="width:90px;float:right;"><%= scope.textFromUrl %></button>
|
||||
<td colspan="2" class="padding-small">
|
||||
<div id="shape-button-replace" style="width:100%;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -600,7 +600,8 @@ define([
|
|||
menuAlign: 'tl-tr',
|
||||
items: [
|
||||
new Common.UI.MenuItem({caption : this.textFromFile, value: 'file'}),
|
||||
new Common.UI.MenuItem({caption : this.textFromUrl, value: 'url'})
|
||||
new Common.UI.MenuItem({caption : this.textFromUrl, value: 'url'}),
|
||||
new Common.UI.MenuItem({caption : this.textFromStorage, value: 'storage'})
|
||||
]
|
||||
})
|
||||
});
|
||||
|
|
@ -1098,7 +1099,8 @@ define([
|
|||
textCrop: 'Crop',
|
||||
textCropFill: 'Fill',
|
||||
textCropFit: 'Fit',
|
||||
textListSettings: 'List Settings'
|
||||
textListSettings: 'List Settings',
|
||||
textFromStorage: 'From Storage'
|
||||
|
||||
}, SSE.Views.DocumentHolder || {}));
|
||||
});
|
||||
|
|
@ -101,9 +101,14 @@ define([
|
|||
if (this.api) {
|
||||
this.api.asc_registerCallback('asc_ChangeCropState', _.bind(this._changeCropState, this));
|
||||
}
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
},
|
||||
|
||||
updateMetricUnit: function() {
|
||||
if (this.spinners) {
|
||||
for (var i=0; i<this.spinners.length; i++) {
|
||||
|
|
@ -166,15 +171,24 @@ define([
|
|||
});
|
||||
this.lockedControls.push(this.btnOriginalSize);
|
||||
|
||||
this.btnInsertFromFile = new Common.UI.Button({
|
||||
el: $('#image-button-from-file')
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#image-button-replace'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textInsert,
|
||||
style: "width:100%;",
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 194px;',
|
||||
maxHeight: 200,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.lockedControls.push(this.btnInsertFromFile);
|
||||
|
||||
this.btnInsertFromUrl = new Common.UI.Button({
|
||||
el: $('#image-button-from-url')
|
||||
});
|
||||
this.lockedControls.push(this.btnInsertFromUrl);
|
||||
this.lockedControls.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
this.btnEditObject = new Common.UI.Button({
|
||||
el: $('#image-button-edit-object')
|
||||
|
|
@ -186,20 +200,10 @@ define([
|
|||
this.spnWidth.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
|
||||
this.spnHeight.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
|
||||
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||
if (this._isFromFile) return;
|
||||
this._isFromFile = true;
|
||||
if (this.api) this.api.asc_changeImageFromFile();
|
||||
Common.NotificationCenter.trigger('edit:complete', this);
|
||||
this._isFromFile = false;
|
||||
}, this));
|
||||
this.btnEditObject.on('click', _.bind(function(btn){
|
||||
if (this.api) this.api.asc_startEditCurrentOleObject();
|
||||
Common.NotificationCenter.trigger('edit:complete', this);
|
||||
}, this));
|
||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
|
||||
this.lblReplace = $('#image-lbl-replace');
|
||||
|
||||
var w = this.btnOriginalSize.cmpEl.outerWidth();
|
||||
this.btnCrop = new Common.UI.Button({
|
||||
|
|
@ -355,10 +359,8 @@ define([
|
|||
var pluginGuid = props.asc_getPluginGuid();
|
||||
value = (pluginGuid !== null && pluginGuid !== undefined);
|
||||
if (this._state.isOleObject!==value) {
|
||||
this.btnInsertFromUrl.setVisible(!value);
|
||||
this.btnInsertFromFile.setVisible(!value);
|
||||
this.btnSelectImage.setVisible(!value);
|
||||
this.btnEditObject.setVisible(value);
|
||||
this.lblReplace.text(value ? this.textEditObject : this.textInsert);
|
||||
this.btnRotate270.setDisabled(value);
|
||||
this.btnRotate90.setDisabled(value);
|
||||
this.btnFlipV.setDisabled(value);
|
||||
|
|
@ -370,8 +372,7 @@ define([
|
|||
var plugin = SSE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
|
||||
this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked);
|
||||
} else {
|
||||
this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked);
|
||||
this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked);
|
||||
this.btnSelectImage.setDisabled(pluginGuid===null || this._locked);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -430,23 +431,43 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
var props = new Asc.asc_CImgProperty();
|
||||
props.asc_putImageUrl(checkUrl);
|
||||
me.api.asc_setGraphicObjectProps(props);
|
||||
setImageUrl: function(url, token) {
|
||||
var props = new Asc.asc_CImgProperty();
|
||||
props.asc_putImageUrl(url, token);
|
||||
this.api.asc_setGraphicObjectProps(props);
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && data.c=='change') {
|
||||
this.setImageUrl(data.url, data.token);
|
||||
}
|
||||
},
|
||||
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.setImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
Common.NotificationCenter.trigger('edit:complete', me);
|
||||
}
|
||||
Common.NotificationCenter.trigger('edit:complete', me);
|
||||
}
|
||||
})).show();
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'change');
|
||||
} else {
|
||||
if (this._isFromFile) return;
|
||||
this._isFromFile = true;
|
||||
if (this.api) this.api.asc_changeImageFromFile();
|
||||
Common.NotificationCenter.trigger('edit:complete', this);
|
||||
this._isFromFile = false;
|
||||
}
|
||||
},
|
||||
|
||||
_changeCropState: function(state) {
|
||||
|
|
@ -531,6 +552,7 @@ define([
|
|||
textHintFlipH: 'Flip Horizontally',
|
||||
textCrop: 'Crop',
|
||||
textCropFill: 'Fill',
|
||||
textCropFit: 'Fit'
|
||||
textCropFit: 'Fit',
|
||||
textFromStorage: 'From Storage'
|
||||
}, SSE.Views.ImageSettings || {}));
|
||||
});
|
||||
|
|
@ -183,7 +183,7 @@ define([
|
|||
iconCls: 'toolbar__icon btn-add-pivot',
|
||||
caption: this.txtCreate,
|
||||
disabled : false,
|
||||
lock : [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit]
|
||||
lock : [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage]
|
||||
});
|
||||
|
||||
this.btnPivotLayout = new Common.UI.Button({
|
||||
|
|
|
|||
|
|
@ -250,6 +250,8 @@ define([
|
|||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
this.imageSettings && this.imageSettings.setMode(mode);
|
||||
this.shapeSettings && this.shapeSettings.setMode(mode);
|
||||
return this;
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -147,9 +147,14 @@ define([
|
|||
this.api.asc_setInterfaceDrawImagePlaceShape('shape-texture-img');
|
||||
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
|
||||
}
|
||||
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
|
||||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
this.mode = mode;
|
||||
},
|
||||
|
||||
onFillSrcSelect: function(combo, record) {
|
||||
this.ShowHideElem(record.value);
|
||||
switch (record.value){
|
||||
|
|
@ -649,32 +654,49 @@ define([
|
|||
Common.NotificationCenter.trigger('edit:complete', this);
|
||||
},
|
||||
|
||||
insertFromUrl: function() {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
if (me.BlipFillType !== null) {
|
||||
var props = new Asc.asc_CShapeProperty();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.asc_putFill( new Asc.asc_CFillBlip());
|
||||
fill.asc_getFill().asc_putType(me.BlipFillType);
|
||||
fill.asc_getFill().asc_putUrl(checkUrl);
|
||||
setImageUrl: function(url, token) {
|
||||
if (this.BlipFillType !== null) {
|
||||
var props = new Asc.asc_CShapeProperty();
|
||||
var fill = new Asc.asc_CShapeFill();
|
||||
fill.asc_putType(Asc.c_oAscFill.FILL_TYPE_BLIP);
|
||||
fill.asc_putFill( new Asc.asc_CFillBlip());
|
||||
fill.asc_getFill().asc_putType(this.BlipFillType);
|
||||
fill.asc_getFill().asc_putUrl(url, token);
|
||||
|
||||
props.asc_putFill(fill);
|
||||
me.imgprops.asc_putShapeProperties(props);
|
||||
me.api.asc_setGraphicObjectProps(me.imgprops);
|
||||
props.asc_putFill(fill);
|
||||
this.imgprops.asc_putShapeProperties(props);
|
||||
this.api.asc_setGraphicObjectProps(this.imgprops);
|
||||
}
|
||||
},
|
||||
|
||||
insertImageFromStorage: function(data) {
|
||||
if (data && data.url && data.c=='fill') {
|
||||
this.setImageUrl(data.url, data.token);
|
||||
}
|
||||
},
|
||||
|
||||
onImageSelect: function(menu, item) {
|
||||
if (item.value==1) {
|
||||
var me = this;
|
||||
(new Common.Views.ImageFromUrlDialog({
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
var checkUrl = value.replace(/ /g, '');
|
||||
if (!_.isEmpty(checkUrl)) {
|
||||
me.setImageUrl(checkUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
Common.NotificationCenter.trigger('edit:complete', me);
|
||||
}
|
||||
Common.NotificationCenter.trigger('edit:complete', me);
|
||||
}
|
||||
})).show();
|
||||
})).show();
|
||||
} else if (item.value==2) {
|
||||
Common.NotificationCenter.trigger('storage:image-load', 'fill');
|
||||
} else {
|
||||
if (this.api) this.api.asc_changeShapeImageFromFile(this.BlipFillType);
|
||||
Common.NotificationCenter.trigger('edit:complete', this);
|
||||
}
|
||||
},
|
||||
|
||||
openAdvancedSettings: function(e) {
|
||||
|
|
@ -1143,21 +1165,24 @@ define([
|
|||
});
|
||||
this.fillControls.push(this.cmbPattern);
|
||||
|
||||
this.btnInsertFromFile = new Common.UI.Button({
|
||||
el: $('#shape-button-from-file')
|
||||
this.btnSelectImage = new Common.UI.Button({
|
||||
parentEl: $('#shape-button-replace'),
|
||||
cls: 'btn-text-menu-default',
|
||||
caption: this.textSelectImage,
|
||||
style: "width:100%;",
|
||||
menu: new Common.UI.Menu({
|
||||
style: 'min-width: 194px;',
|
||||
maxHeight: 200,
|
||||
items: [
|
||||
{caption: this.textFromFile, value: 0},
|
||||
{caption: this.textFromUrl, value: 1},
|
||||
{caption: this.textFromStorage, value: 2}
|
||||
]
|
||||
})
|
||||
});
|
||||
this.fillControls.push(this.btnInsertFromFile);
|
||||
|
||||
this.btnInsertFromUrl = new Common.UI.Button({
|
||||
el: $('#shape-button-from-url')
|
||||
});
|
||||
this.fillControls.push(this.btnInsertFromUrl);
|
||||
|
||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||
if (this.api) this.api.asc_changeShapeImageFromFile(this.BlipFillType);
|
||||
Common.NotificationCenter.trigger('edit:complete', this);
|
||||
}, this));
|
||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||
this.fillControls.push(this.btnSelectImage);
|
||||
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
|
||||
this.btnSelectImage.menu.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
|
||||
|
||||
this._arrFillType = [
|
||||
{displayValue: this.textStretch, value: Asc.c_oAscFillBlipType.STRETCH},
|
||||
|
|
@ -1740,6 +1765,8 @@ define([
|
|||
textHint90: 'Rotate 90° Clockwise',
|
||||
textHintFlipV: 'Flip Vertically',
|
||||
textHintFlipH: 'Flip Horizontally',
|
||||
strShadow: 'Show shadow'
|
||||
strShadow: 'Show shadow',
|
||||
textFromStorage: 'From Storage',
|
||||
textSelectImage: 'Select Picture'
|
||||
}, SSE.Views.ShapeSettings || {}));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -603,7 +603,7 @@ define([
|
|||
id : 'id-toolbar-rtn-textorient',
|
||||
cls : 'btn-toolbar',
|
||||
iconCls : 'toolbar__icon text-orient-ccw',
|
||||
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
|
||||
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
|
||||
menu : new Common.UI.Menu({
|
||||
items: [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1575,6 +1575,7 @@
|
|||
"SSE.Views.DocumentHolder.txtUngroup": "Ungroup",
|
||||
"SSE.Views.DocumentHolder.txtWidth": "Width",
|
||||
"SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
|
||||
"SSE.Views.DocumentHolder.textFromStorage": "From Storage",
|
||||
"SSE.Views.FieldSettingsDialog.textTitle": "Field Settings",
|
||||
"SSE.Views.FieldSettingsDialog.strSubtotals": "Subtotals",
|
||||
"SSE.Views.FieldSettingsDialog.strLayout": "Layout",
|
||||
|
|
@ -1831,6 +1832,7 @@
|
|||
"SSE.Views.ImageSettings.textRotation": "Rotation",
|
||||
"SSE.Views.ImageSettings.textSize": "Size",
|
||||
"SSE.Views.ImageSettings.textWidth": "Width",
|
||||
"SSE.Views.ImageSettings.textFromStorage": "From Storage",
|
||||
"SSE.Views.ImageSettingsAdvanced.textAbsolute": "Don't move or size with cells",
|
||||
"SSE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
|
||||
"SSE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
|
||||
|
|
@ -2173,6 +2175,8 @@
|
|||
"SSE.Views.ShapeSettings.txtNoBorders": "No Line",
|
||||
"SSE.Views.ShapeSettings.txtPapyrus": "Papyrus",
|
||||
"SSE.Views.ShapeSettings.txtWood": "Wood",
|
||||
"SSE.Views.ShapeSettings.textFromStorage": "From Storage",
|
||||
"SSE.Views.ShapeSettings.textSelectImage": "Select Picture",
|
||||
"SSE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
|
||||
"SSE.Views.ShapeSettingsAdvanced.strMargins": "Text Padding",
|
||||
"SSE.Views.ShapeSettingsAdvanced.textAbsolute": "Don't move or size with cells",
|
||||
|
|
|
|||
|
|
@ -219,10 +219,10 @@ define([
|
|||
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.None);
|
||||
break;
|
||||
case 'hide':
|
||||
me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns']();
|
||||
me.api[info.asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns']();
|
||||
break;
|
||||
case 'show':
|
||||
me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_showRows' : 'asc_showColumns']();
|
||||
me.api[info.asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_showRows' : 'asc_showColumns']();
|
||||
break;
|
||||
case 'addlink':
|
||||
me.view.hideMenu();
|
||||
|
|
@ -311,7 +311,7 @@ define([
|
|||
|
||||
var iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu;
|
||||
var iscelllocked = cellinfo.asc_getLocked(),
|
||||
seltype = cellinfo.asc_getFlags().asc_getSelectionType();
|
||||
seltype = cellinfo.asc_getSelectionType();
|
||||
|
||||
switch (seltype) {
|
||||
case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break;
|
||||
|
|
@ -407,20 +407,20 @@ define([
|
|||
event: 'edit'
|
||||
});
|
||||
|
||||
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.None) &&
|
||||
(cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.None) &&
|
||||
arrItems.push({
|
||||
caption: me.menuMerge,
|
||||
event: 'merge'
|
||||
});
|
||||
|
||||
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
|
||||
(cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
|
||||
arrItems.push({
|
||||
caption: me.menuUnmerge,
|
||||
event: 'unmerge'
|
||||
});
|
||||
|
||||
arrItems.push(
|
||||
cellinfo.asc_getFlags().asc_getWrapText() ?
|
||||
cellinfo.asc_getWrapText() ?
|
||||
{
|
||||
caption: me.menuUnwrap,
|
||||
event: 'unwrap'
|
||||
|
|
@ -430,13 +430,13 @@ define([
|
|||
event: 'wrap'
|
||||
});
|
||||
|
||||
if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect()) {
|
||||
if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect()) {
|
||||
arrItems.push({
|
||||
caption: me.menuOpenLink,
|
||||
event: 'openlink'
|
||||
});
|
||||
} else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() &&
|
||||
!cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText()) {
|
||||
} else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() &&
|
||||
!cellinfo.asc_getLockText() && !!cellinfo.asc_getText()) {
|
||||
arrItems.push({
|
||||
caption: me.menuAddLink,
|
||||
event: 'addlink'
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ define([
|
|||
if ( !info ) info = this.api.asc_getCellInfo();
|
||||
var islocked = false;
|
||||
|
||||
switch (info.asc_getFlags().asc_getSelectionType()) {
|
||||
switch (info.asc_getSelectionType()) {
|
||||
case Asc.c_oAscSelectionType.RangeChart:
|
||||
case Asc.c_oAscSelectionType.RangeImage:
|
||||
case Asc.c_oAscSelectionType.RangeShape:
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ define([
|
|||
|
||||
var cellinfo = me.api.asc_getCellInfo();
|
||||
var iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu,
|
||||
seltype = cellinfo.asc_getFlags().asc_getSelectionType(),
|
||||
seltype = cellinfo.asc_getSelectionType(),
|
||||
iscelllocked = cellinfo.asc_getLocked(),
|
||||
isTableLocked = cellinfo.asc_getLockedTable()===true;
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ define([
|
|||
var me = this,
|
||||
addViews = [];
|
||||
|
||||
// var seltype = this.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType();
|
||||
// var seltype = this.api.asc_getCellInfo().asc_getSelectionType();
|
||||
|
||||
if ( !options )
|
||||
addViews.push({
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@ define([
|
|||
var _view = view || this.getView();
|
||||
|
||||
var cell = this.api.asc_getCellInfo(),
|
||||
celltype = cell.asc_getFlags().asc_getSelectionType();
|
||||
celltype = cell.asc_getSelectionType();
|
||||
var allowinternal = (celltype!==Asc.c_oAscSelectionType.RangeImage && celltype!==Asc.c_oAscSelectionType.RangeShape &&
|
||||
celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart &&
|
||||
celltype!==Asc.c_oAscSelectionType.RangeChartText);
|
||||
|
||||
_view.optionDisplayText(cell.asc_getFlags().asc_getLockText() ? 'locked' : cell.asc_getText());
|
||||
_view.optionDisplayText(cell.asc_getLockText() ? 'locked' : cell.asc_getText());
|
||||
_view.optionAllowInternal(allowinternal);
|
||||
allowinternal && _view.optionLinkType( cfgLink.type );
|
||||
}
|
||||
|
|
@ -158,12 +158,12 @@ define([
|
|||
view.showPage(rootView, navbar);
|
||||
|
||||
var cell = me.api.asc_getCellInfo(),
|
||||
celltype = cell.asc_getFlags().asc_getSelectionType();
|
||||
celltype = cell.asc_getSelectionType();
|
||||
var allowinternal = (celltype!==Asc.c_oAscSelectionType.RangeImage && celltype!==Asc.c_oAscSelectionType.RangeShape &&
|
||||
celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart &&
|
||||
celltype!==Asc.c_oAscSelectionType.RangeChartText);
|
||||
|
||||
view.optionDisplayText(cell.asc_getFlags().asc_getLockText() ? 'locked' : cell.asc_getText());
|
||||
view.optionDisplayText(cell.asc_getLockText() ? 'locked' : cell.asc_getText());
|
||||
view.optionAllowInternal(allowinternal);
|
||||
allowinternal && view.optionLinkType( cfgLink.type );
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ define([
|
|||
isHideInsertComment: function() {
|
||||
var cellinfo = this.api.asc_getCellInfo();
|
||||
var iscelllocked = cellinfo.asc_getLocked(),
|
||||
seltype = cellinfo.asc_getFlags().asc_getSelectionType();
|
||||
seltype = cellinfo.asc_getSelectionType();
|
||||
if (seltype === Asc.c_oAscSelectionType.RangeCells && !iscelllocked) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ define([
|
|||
vAlign = me._cellInfo.asc_getVertAlign(),
|
||||
hAlignStr = 'left',
|
||||
vAlignStr = 'bottom',
|
||||
isWrapText = me._cellInfo.asc_getFlags().asc_getWrapText();
|
||||
isWrapText = me._cellInfo.asc_getWrapText();
|
||||
|
||||
if (vAlign == Asc.c_oAscVAlign.Top)
|
||||
vAlignStr = 'top';
|
||||
|
|
@ -316,7 +316,7 @@ define([
|
|||
}
|
||||
|
||||
var me = this,
|
||||
selectionType = cellInfo.asc_getFlags().asc_getSelectionType(),
|
||||
selectionType = cellInfo.asc_getSelectionType(),
|
||||
// coAuthDisable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (cellInfo.asc_getLocked()===true || cellInfo.asc_getLockedTable()===true) : false,
|
||||
// editOptionsDisabled = this._disableEditOptions(selectionType, coAuthDisable),
|
||||
_fontInfo = cellInfo.asc_getFont(),
|
||||
|
|
|
|||
|
|
@ -378,7 +378,7 @@ define([
|
|||
_settings = [];
|
||||
|
||||
var isCell, isRow, isCol, isAll, isChart, isImage, isTextShape, isShape, isTextChart,
|
||||
selType = cellInfo.asc_getFlags().asc_getSelectionType(),
|
||||
selType = cellInfo.asc_getSelectionType(),
|
||||
isCellLocked = cellInfo.asc_getLocked(),
|
||||
isTableLocked = cellInfo.asc_getLockedTable()===true,
|
||||
isObjLocked = false;
|
||||
|
|
@ -495,7 +495,7 @@ define([
|
|||
// formatTableInfo = cellInfo.asc_getFormatTableInfo(),
|
||||
// isinsparkline = (cellInfo.asc_getSparklineInfo()!==null),
|
||||
// isintable = (formatTableInfo !== null),
|
||||
// ismultiselect = cellInfo.asc_getFlags().asc_getMultiselect();
|
||||
// ismultiselect = cellInfo.asc_getMultiselect();
|
||||
// documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null;
|
||||
// documentHolder.ssMenu.cellColor = cellInfo.asc_getFill().asc_getColor();
|
||||
// documentHolder.ssMenu.fontColor = cellInfo.asc_getFont().asc_getColor();
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ define([
|
|||
|
||||
var cellInfo = me.api.asc_getCellInfo(),
|
||||
linkInfo = cellInfo.asc_getHyperlink(),
|
||||
isLock = cellInfo.asc_getFlags().asc_getLockText();
|
||||
isLock = cellInfo.asc_getLockText();
|
||||
|
||||
me.linkType = linkInfo.asc_getType();
|
||||
$('#edit-link-type .item-after').text((me.linkType == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink);
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ define([
|
|||
|
||||
var me = this,
|
||||
selectedObjects = [],
|
||||
selectType = info.asc_getFlags().asc_getSelectionType();
|
||||
selectType = info.asc_getSelectionType();
|
||||
|
||||
if (selectType == Asc.c_oAscSelectionType.RangeImage) {
|
||||
selectedObjects = me.api.asc_getGraphicObjectProps();
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ define([
|
|||
|
||||
var me = this,
|
||||
selectedObjects = [],
|
||||
selectType = info.asc_getFlags().asc_getSelectionType();
|
||||
selectType = info.asc_getSelectionType();
|
||||
|
||||
if (selectType == Asc.c_oAscSelectionType.RangeShape) {
|
||||
selectedObjects = me.api.asc_getGraphicObjectProps();
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ define([
|
|||
_cellInfo = info;
|
||||
_fontInfo = info.asc_getFont();
|
||||
|
||||
var selectType = info.asc_getFlags().asc_getSelectionType();
|
||||
var selectType = info.asc_getSelectionType();
|
||||
|
||||
switch (selectType) {
|
||||
case Asc.c_oAscSelectionType.RangeChartText: _textIn = TextType.inChart; break;
|
||||
|
|
|
|||
|
|
@ -6396,6 +6396,9 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
margin-left: 20px;
|
||||
color: #212121;
|
||||
}
|
||||
.page-change {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
.page-change .block-description {
|
||||
background-color: #fff;
|
||||
padding-top: 15px;
|
||||
|
|
@ -6426,28 +6429,51 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
}
|
||||
.page-change .block-btn,
|
||||
.page-change .content-block.block-btn:first-child {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
margin: 26px 0;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 44px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.page-change .block-btn #btn-next-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 #btn-goto-change,
|
||||
.page-change .content-block.block-btn:first-child #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.page-change .block-btn .right-buttons,
|
||||
.page-change .content-block.block-btn:first-child .right-buttons {
|
||||
.page-change .block-btn .change-buttons,
|
||||
.page-change .content-block.block-btn:first-child .change-buttons,
|
||||
.page-change .block-btn .accept-reject,
|
||||
.page-change .content-block.block-btn:first-child .accept-reject {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .next-prev,
|
||||
.page-change .content-block.block-btn:first-child .next-prev {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .next-prev .link,
|
||||
.page-change .content-block.block-btn:first-child .next-prev .link {
|
||||
width: 44px;
|
||||
}
|
||||
.page-change .block-btn .link,
|
||||
.page-change .content-block.block-btn:first-child .link {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 17px;
|
||||
height: 44px;
|
||||
min-width: 44px;
|
||||
}
|
||||
.page-change #no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
.navbar .center-collaboration {
|
||||
display: flex;
|
||||
|
|
@ -6460,6 +6486,13 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
|
|||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-title {
|
||||
font-weight: normal;
|
||||
}
|
||||
.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-subtitle {
|
||||
font-size: 14px;
|
||||
color: #8e8e93;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
|
@ -7327,6 +7360,11 @@ i.icon.icon-collaboration {
|
|||
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");
|
||||
}
|
||||
i.icon.icon-users {
|
||||
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%22M16%207C16%209.34102%2015.4162%2011.1346%2014.6143%2012.3121C13.8071%2013.4974%2012.8337%2014%2012%2014C11.1663%2014%2010.1929%2013.4974%209.38574%2012.3121C8.5838%2011.1346%208%209.34102%208%207C8%204.61508%209.97853%203%2012%203C14.0215%203%2016%204.61508%2016%207ZM15.1891%2013.2201C14.2865%2014.375%2013.1451%2015%2012%2015C10.8549%2015%209.71347%2014.375%208.81092%2013.2201C7.40473%2013.7844%206.21268%2014.3488%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.7873%2014.3488%2016.5953%2013.7844%2015.1891%2013.2201ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -5996,7 +5996,7 @@ html.phone .document-menu .list-block .item-link {
|
|||
word-wrap: break-word;
|
||||
}
|
||||
.page-change #user-name {
|
||||
font-size: 17px;
|
||||
font-size: 16px;
|
||||
line-height: 22px;
|
||||
color: #000000;
|
||||
margin: 0;
|
||||
|
|
@ -6016,25 +6016,54 @@ html.phone .document-menu .list-block .item-link {
|
|||
margin-top: 10px;
|
||||
}
|
||||
.page-change .block-btn {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
justify-content: space-between;
|
||||
margin: 0;
|
||||
padding: 26px 0;
|
||||
background-color: #EFEFF4;
|
||||
width: 100%;
|
||||
height: 56px;
|
||||
align-items: center;
|
||||
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.page-change .block-btn #btn-next-change,
|
||||
.page-change .block-btn #btn-reject-change {
|
||||
margin-left: 20px;
|
||||
margin-left: 15px;
|
||||
}
|
||||
.page-change .block-btn #btn-goto-change {
|
||||
margin-right: 20px;
|
||||
}
|
||||
.page-change .block-btn .right-buttons {
|
||||
.page-change .block-btn .change-buttons,
|
||||
.page-change .block-btn .accept-reject,
|
||||
.page-change .block-btn .next-prev {
|
||||
display: flex;
|
||||
}
|
||||
.page-change .block-btn .link {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 14px;
|
||||
text-transform: uppercase;
|
||||
font-weight: 500;
|
||||
height: 56px;
|
||||
min-width: 48px;
|
||||
}
|
||||
.page-change .header-change {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
padding-right: 16px;
|
||||
}
|
||||
.page-change .header-change .initials-change {
|
||||
height: 40px;
|
||||
width: 40px;
|
||||
border-radius: 50px;
|
||||
color: #FFFFFF;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 16px;
|
||||
font-size: 18px;
|
||||
}
|
||||
.page-change #no-changes {
|
||||
padding: 16px;
|
||||
}
|
||||
.container-collaboration .navbar .right.close-collaboration {
|
||||
position: absolute;
|
||||
|
|
@ -6043,6 +6072,10 @@ html.phone .document-menu .list-block .item-link {
|
|||
.container-collaboration .page-content .list-block:first-child {
|
||||
margin-top: -1px;
|
||||
}
|
||||
.page-display-mode .list-block .item-subtitle {
|
||||
font-size: 14px;
|
||||
color: #9e9e9e;
|
||||
}
|
||||
#user-list .item-content {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
|
@ -7033,6 +7066,11 @@ i.icon.icon-collaboration {
|
|||
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");
|
||||
}
|
||||
i.icon.icon-users {
|
||||
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%22M15.5%207C15.5%209.26153%2014.9357%2010.9518%2014.201%2012.0307C13.4584%2013.121%2012.6234%2013.5%2012%2013.5C11.3766%2013.5%2010.5416%2013.121%209.79901%2012.0307C9.0643%2010.9518%208.5%209.26153%208.5%207C8.5%204.92262%2010.2222%203.5%2012%203.5C13.7778%203.5%2015.5%204.92262%2015.5%207ZM14.8461%2013.6216C14.006%2014.5191%2013.0044%2015%2012%2015C10.9956%2015%209.99399%2014.5191%209.15395%2013.6216C7.69714%2014.1996%206.4782%2014.7725%205.52945%2015.3496C3.82884%2016.3839%203.5%2017.1203%203.5%2017.5C3.5%2018.0104%203.76355%2018.6977%205.04703%2019.3409C6.37522%2020.0065%208.60909%2020.4999%2012%2020.5C15.3909%2020.5%2017.6248%2020.0065%2018.953%2019.3409C20.2364%2018.6977%2020.5%2018.0104%2020.5%2017.5C20.5%2017.1203%2020.1712%2016.3839%2018.4705%2015.3496C17.5218%2014.7725%2016.3029%2014.1996%2014.8461%2013.6216ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E");
|
||||
}
|
||||
i.icon.icon-cut {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -363,6 +363,11 @@ i.icon {
|
|||
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-users {
|
||||
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="M16 7C16 9.34102 15.4162 11.1346 14.6143 12.3121C13.8071 13.4974 12.8337 14 12 14C11.1663 14 10.1929 13.4974 9.38574 12.3121C8.5838 11.1346 8 9.34102 8 7C8 4.61508 9.97853 3 12 3C14.0215 3 16 4.61508 16 7ZM15.1891 13.2201C14.2865 14.375 13.1451 15 12 15C10.8549 15 9.71347 14.375 8.81092 13.2201C7.40473 13.7844 6.21268 14.3488 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.7873 14.3488 16.5953 13.7844 15.1891 13.2201ZM15.7544 12.37C16.5137 11.0279 17 9.20917 17 7C17 4 14.5088 2 12 2C9.49121 2 7 4 7 7C7 9.20917 7.48633 11.0279 8.24563 12.37C4.38973 13.9392 2 15.579 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.579 19.6103 13.9392 15.7544 12.37Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-app-settings {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
|
|
@ -327,6 +327,11 @@ i.icon {
|
|||
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-users {
|
||||
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="M15.5 7C15.5 9.26153 14.9357 10.9518 14.201 12.0307C13.4584 13.121 12.6234 13.5 12 13.5C11.3766 13.5 10.5416 13.121 9.79901 12.0307C9.0643 10.9518 8.5 9.26153 8.5 7C8.5 4.92262 10.2222 3.5 12 3.5C13.7778 3.5 15.5 4.92262 15.5 7ZM14.8461 13.6216C14.006 14.5191 13.0044 15 12 15C10.9956 15 9.99399 14.5191 9.15395 13.6216C7.69714 14.1996 6.4782 14.7725 5.52945 15.3496C3.82884 16.3839 3.5 17.1203 3.5 17.5C3.5 18.0104 3.76355 18.6977 5.04703 19.3409C6.37522 20.0065 8.60909 20.4999 12 20.5C15.3909 20.5 17.6248 20.0065 18.953 19.3409C20.2364 18.6977 20.5 18.0104 20.5 17.5C20.5 17.1203 20.1712 16.3839 18.4705 15.3496C17.5218 14.7725 16.3029 14.1996 14.8461 13.6216ZM15.7544 12.37C16.5137 11.0279 17 9.20917 17 7C17 4 14.5088 2 12 2C9.49121 2 7 4 7 7C7 9.20917 7.48633 11.0279 8.24563 12.37C4.38973 13.9392 2 15.579 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.579 19.6103 13.9392 15.7544 12.37Z" fill="@{themeColor}"/></svg>');
|
||||
}
|
||||
&.icon-cut {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
|
|
|
|||
Loading…
Reference in a new issue