Skip to content

W
web-apps
Commit a18be3f5 authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

Merge branch 'develop' into refactor

parents 98c04632 bfd12d15
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 500 additions and 1203 deletions
LICENSE.txt
View file @ a18be3f5
...@@ -658,4 +658,4 @@ specific requirements. ...@@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school, You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary. if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>. <http://www.gnu.org/licenses/>.
\ No newline at end of file
apps/common/main/lib/component/DataView.js
View file @ a18be3f5
...@@ -536,7 +536,7 @@ define([ ...@@ -536,7 +536,7 @@ define([
var innerEl = $(this.el).find('.inner'), var innerEl = $(this.el).find('.inner'),
inner_top = innerEl.offset().top, inner_top = innerEl.offset().top,
idx = _.indexOf(this.store.models, record), idx = _.indexOf(this.store.models, record),
div = (idx>=0) ? $(this.dataViewItems[idx].el) : innerEl.find('#' + record.get('id')); div = (idx>=0 && this.dataViewItems.length>0) ? $(this.dataViewItems[idx].el) : innerEl.find('#' + record.get('id'));
if (div.length<=0) return; if (div.length<=0) return;
var div_top = div.offset().top; var div_top = div.offset().top;
......
apps/common/main/lib/component/ThemeColorPalette.js
View file @ a18be3f5
...@@ -47,10 +47,14 @@ define([ ...@@ -47,10 +47,14 @@ define([
], function () { ], function () {
'use strict'; 'use strict';
Common.UI.ThemeColorPalette = Common.UI.BaseView.extend({ Common.UI.ThemeColorPalette = Common.UI.BaseView.extend(_.extend({
options: { options: {
dynamiccolors: 10, dynamiccolors: 10,
standardcolors: 10,
themecolors: 10,
effects: 5,
allowReselect: true, allowReselect: true,
transparent: false,
value: '000000' value: '000000'
}, },
...@@ -96,12 +100,7 @@ define([ ...@@ -96,12 +100,7 @@ define([
var me = this, var me = this,
el = $(this.el); el = $(this.el);
this.colors = me.options.colors || [ this.colors = me.options.colors || this.generateColorData(me.options.themecolors, me.options.effects, me.options.standardcolors, me.options.transparent);
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-', '--', '-',
'000000', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39'
];
el.addClass('theme-colorpalette'); el.addClass('theme-colorpalette');
this.render(); this.render();
...@@ -372,7 +371,38 @@ define([ ...@@ -372,7 +371,38 @@ define([
clearSelection: function(suppressEvent) { clearSelection: function(suppressEvent) {
$(this.el).find('a.' + this.selectedCls).removeClass(this.selectedCls); $(this.el).find('a.' + this.selectedCls).removeClass(this.selectedCls);
this.value = undefined; this.value = undefined;
} },
generateColorData: function(themecolors, effects, standardcolors, transparent) {
var arr = [],
len = (themecolors>0 && effects>0) ? themecolors * effects : 0;
if (themecolors>0) {
arr = [this.textThemeColors, '-'];
for (var i=0; i<themecolors; i++)
arr.push({color: 'FFFFFF', effectId: 1});
if (effects>0) arr.push('-');
for (var i=0; i<len; i++)
arr.push({color: 'FFFFFF', effectId: 1});
if (standardcolors)
arr.push('-', '--', '-');
}
if (standardcolors) {
arr.push(this.textStandartColors, '-');
if (transparent) {
arr.push('transparent');
standardcolors--;
}
for (var i=0; i<standardcolors; i++)
arr.push('FFFFFF');
}
if (this.options.dynamiccolors && (themecolors || standardcolors))
arr.push('-', '--');
return arr;
},
}); textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors'
}, Common.UI.ThemeColorPalette || {}));
}); });
\ No newline at end of file
apps/common/main/lib/component/Window.js
View file @ a18be3f5
...@@ -150,7 +150,11 @@ define([ ...@@ -150,7 +150,11 @@ define([
title: 'Title', title: 'Title',
alias: 'Window', alias: 'Window',
cls: '', cls: '',
toolclose: 'close' toolclose: 'close',
maxwidth: undefined,
maxheight: undefined,
minwidth: 0,
minheight: 0
}; };
var template = '<div class="asc-window<%= modal?" modal":"" %><%= cls?" "+cls:"" %>" id="<%= id %>" style="width:<%= width %>px;">' + var template = '<div class="asc-window<%= modal?" modal":"" %><%= cls?" "+cls:"" %>" id="<%= id %>" style="width:<%= width %>px;">' +
...@@ -286,6 +290,81 @@ define([ ...@@ -286,6 +290,81 @@ define([
} }
} }
/* window resize functions */
function _resizestart(event) {
Common.UI.Menu.Manager.hideAll();
var el = $(event.target),
left = parseInt(this.$window.css('left')),
top = parseInt(this.$window.css('top'));
this.resizing.enabled = true;
this.resizing.initpage_x = event.pageX;
this.resizing.initpage_y = event.pageY;
this.resizing.initx = event.pageX - left;
this.resizing.inity = event.pageY - top;
this.resizing.initw = parseInt(this.$window.css("width"));
this.resizing.inith = parseInt(this.$window.css("height"));
this.resizing.type = [el.hasClass('left') ? -1 : (el.hasClass('right') ? 1 : 0), el.hasClass('top') ? -1 : (el.hasClass('bottom') ? 1 : 0)];
var main_width = (window.innerHeight == undefined) ? document.documentElement.offsetWidth : window.innerWidth,
main_height = (window.innerHeight == undefined) ? document.documentElement.offsetHeight : window.innerHeight,
maxwidth = (this.initConfig.maxwidth) ? this.initConfig.maxwidth : main_width,
maxheight = (this.initConfig.maxheight) ? this.initConfig.maxheight : main_height;
if (this.resizing.type[0]>0) {
this.resizing.maxx = Math.min(main_width, left+maxwidth);
this.resizing.minx = left+this.initConfig.minwidth;
} else if (this.resizing.type[0]<0) {
this.resizing.maxx = left+this.resizing.initw-this.initConfig.minwidth;
this.resizing.minx = Math.max(0, left+this.resizing.initw-maxwidth);
}
if (this.resizing.type[1]>0) {
this.resizing.maxy = Math.min(main_height, top+maxheight);
this.resizing.miny = top+this.initConfig.minheight;
} else if (this.resizing.type[1]<0) {
this.resizing.maxy = top+this.resizing.inith-this.initConfig.minheight;
this.resizing.miny = Math.max(0, top+this.resizing.inith-maxheight);
}
$(document.body).css('cursor', el.css('cursor'));
this.$window.find('.resize-border').addClass('resizing');
this.$window.find('.header').addClass('resizing');
$(document).on('mousemove', this.binding.resize);
$(document).on('mouseup', this.binding.resizeStop);
this.fireEvent('resize', [this, 'start']);
}
function _resize(event) {
if (this.resizing.enabled) {
var resized = false;
if (this.resizing.type[0] && event.pageX<this.resizing.maxx && event.pageX>this.resizing.minx) {
if (this.resizing.type[0]<0)
this.$window.css({left: event.pageX - this.resizing.initx});
this.setWidth(this.resizing.initw + (event.pageX - this.resizing.initpage_x) * this.resizing.type[0]);
resized = true;
}
if (this.resizing.type[1] && event.pageY<this.resizing.maxy && event.pageY>this.resizing.miny) {
if (this.resizing.type[1]<0)
this.$window.css({top: event.pageY - this.resizing.inity});
this.setHeight(this.resizing.inith + (event.pageY - this.resizing.initpage_y) * this.resizing.type[1]);
resized = true;
}
if (resized) this.fireEvent('resizing');
}
}
function _resizestop() {
$(document).off('mousemove', this.binding.resize);
$(document).off('mouseup', this.binding.resizeStop);
$(document.body).css('cursor', 'auto');
this.$window.find('.resize-border').removeClass('resizing');
this.$window.find('.header').removeClass('resizing');
this.resizing.enabled = false;
this.fireEvent('resize', [this, 'end']);
}
Common.UI.alert = function(options) { Common.UI.alert = function(options) {
var me = this.Window.prototype; var me = this.Window.prototype;
var arrBtns = {ok: me.okButtonText, cancel: me.cancelButtonText, var arrBtns = {ok: me.okButtonText, cancel: me.cancelButtonText,
...@@ -355,6 +434,10 @@ define([ ...@@ -355,6 +434,10 @@ define([
if (!options.dontshow) body.css('padding-bottom', '10px'); if (!options.dontshow) body.css('padding-bottom', '10px');
if (options.maxwidth && options.width=='auto') {
if ((text.position().left + text.width() + parseInt(text_cnt.css('padding-right'))) > options.maxwidth)
options.width = options.maxwidth;
}
if (options.width=='auto') { if (options.width=='auto') {
text_cnt.height(Math.max(text.height() + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0), icon.height())); text_cnt.height(Math.max(text.height() + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0), icon.height()));
body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height'))); body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
...@@ -450,6 +533,7 @@ define([ ...@@ -450,6 +533,7 @@ define([
$window : undefined, $window : undefined,
$lastmodal : undefined, $lastmodal : undefined,
dragging : {enabled: false}, dragging : {enabled: false},
resizing : {enabled: false},
initialize : function(options) { initialize : function(options) {
this.initConfig = {}; this.initConfig = {};
...@@ -503,6 +587,9 @@ define([ ...@@ -503,6 +587,9 @@ define([
this.$window.css('height',this.initConfig.height); this.$window.css('height',this.initConfig.height);
} }
if (this.initConfig.resizable)
this.setResizable(this.initConfig.resizable);
var me = this; var me = this;
Common.NotificationCenter.on('window:close', function() { Common.NotificationCenter.on('window:close', function() {
if (me.$window && me.isVisible()) me.close(); if (me.$window && me.isVisible()) me.close();
...@@ -683,6 +770,7 @@ define([ ...@@ -683,6 +770,7 @@ define([
if (width >= 0) { if (width >= 0) {
var min = parseInt(this.$window.css('min-width')); var min = parseInt(this.$window.css('min-width'));
width < min && (width = min); width < min && (width = min);
width -= (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width')));
this.$window.width(width); this.$window.width(width);
} }
}, },
...@@ -695,6 +783,7 @@ define([ ...@@ -695,6 +783,7 @@ define([
if (height >= 0) { if (height >= 0) {
var min = parseInt(this.$window.css('min-height')); var min = parseInt(this.$window.css('min-height'));
height < min && (height = min); height < min && (height = min);
height -= (parseInt(this.$window.css('border-bottom-width')) + parseInt(this.$window.css('border-top-width')));
this.$window.height(height); this.$window.height(height);
if (this.initConfig.header) if (this.initConfig.header)
...@@ -729,6 +818,40 @@ define([ ...@@ -729,6 +818,40 @@ define([
return this.$window && this.$window.is(':visible'); return this.$window && this.$window.is(':visible');
}, },
setResizable: function(resizable, minSize, maxSize) {
if (resizable !== this.resizable) {
if (resizable) {
var bordersTemplate = '<div class="resize-border left" style="top:' + ((this.initConfig.header) ? '33' : '5') + 'px; bottom: 5px; height: auto; border-right-style: solid; cursor: e-resize;"></div>' +
'<div class="resize-border left bottom" style="border-bottom-left-radius: 5px; cursor: sw-resize;"></div>' +
'<div class="resize-border bottom" style="left: 4px; right: 4px; width: auto; z-index: 2; border-top-style: solid; cursor: s-resize;"></div>' +
'<div class="resize-border right bottom" style="border-bottom-right-radius: 5px; cursor: se-resize;"></div>' +
'<div class="resize-border right" style="top:' + ((this.initConfig.header) ? '33' : '5') + 'px; bottom: 5px; height: auto; border-left-style: solid; cursor: w-resize;"></div>' +
'<div class="resize-border left top" style="border-top-left-radius: 5px; cursor: se-resize;"></div>' +
'<div class="resize-border top" style="left: 4px; right: 4px; width: auto; z-index: 2; border-bottom-style:' + ((this.initConfig.header) ? "none" : "solid") + '; cursor: s-resize;"></div>' +
'<div class="resize-border right top" style="border-top-right-radius: 5px; cursor: sw-resize;"></div>';
if (this.initConfig.header)
bordersTemplate += '<div class="resize-border left" style="top: 5px; height: 28px; cursor: e-resize;"></div>' +
'<div class="resize-border right" style="top: 5px; height: 28px; cursor: w-resize;"></div>';
this.$window.append(_.template(bordersTemplate));
this.binding.resize = _.bind(_resize, this);
this.binding.resizeStop = _.bind(_resizestop, this);
this.binding.resizeStart = _.bind(_resizestart, this);
(minSize && minSize.length>1) && (this.initConfig.minwidth = minSize[0]);
(minSize && minSize.length>1) && (this.initConfig.minheight = minSize[1]);
(maxSize && maxSize.length>1) && (this.initConfig.maxwidth = maxSize[0]);
(maxSize && maxSize.length>1) && (this.initConfig.maxheight = maxSize[1]);
this.$window.find('.resize-border').on('mousedown', this.binding.resizeStart);
} else {
this.$window.find('.resize-border').remove();
}
this.resizable = resizable;
}
},
onPrimary: function() {}, onPrimary: function() {},
cancelButtonText: 'Cancel', cancelButtonText: 'Cancel',
......
apps/common/main/lib/controller/Plugins.js
View file @ a18be3f5
...@@ -136,8 +136,7 @@ define([ ...@@ -136,8 +136,7 @@ define([
variation.set_UpdateOleOnResize(itemVar.get('isUpdateOleOnResize')); variation.set_UpdateOleOnResize(itemVar.get('isUpdateOleOnResize'));
variation.set_Buttons(itemVar.get('buttons')); variation.set_Buttons(itemVar.get('buttons'));
variation.set_Size(itemVar.get('size')); variation.set_Size(itemVar.get('size'));
variation.set_MaximumSize(itemVar.get('maximumSize')); variation.set_InitOnSelectionChanged(itemVar.get('initOnSelectionChanged'));
variation.set_MinimumSize(itemVar.get('minimumSize'));
variationsArr.push(variation); variationsArr.push(variation);
}); });
plugin.set_Variations(variationsArr); plugin.set_Variations(variationsArr);
...@@ -219,54 +218,61 @@ define([ ...@@ -219,54 +218,61 @@ define([
onPluginShow: function(plugin, variationIndex) { onPluginShow: function(plugin, variationIndex) {
var variation = plugin.get_Variations()[variationIndex]; var variation = plugin.get_Variations()[variationIndex];
if (!variation.get_Visual()) return; if (variation.get_Visual()) {
if (variation.get_InsideMode()) {
if (variation.get_InsideMode()) { this.panelPlugins.openInsideMode(plugin.get_Name(), ((plugin.get_BaseUrl().length == 0) ? this.panelPlugins.pluginsPath : plugin.get_BaseUrl()) + variation.get_Url());
this.panelPlugins.openInsideMode(plugin.get_Name(), ((plugin.get_BaseUrl().length == 0) ? this.panelPlugins.pluginsPath : plugin.get_BaseUrl()) + variation.get_Url()); } else {
} else { var me = this,
var me = this, arrBtns = variation.get_Buttons(),
arrBtns = variation.get_Buttons(), newBtns = {},
newBtns = {}, size = variation.get_Size();
size = variation.get_Size(); if (!size || size.length<2) size = [800, 600];
if (!size || size.length<2) size = [800, 600];
if (_.isArray(arrBtns)) { if (_.isArray(arrBtns)) {
_.each(arrBtns, function(b, index){ _.each(arrBtns, function(b, index){
newBtns[index] = {text: b.text, cls: 'custom' + ((b.primary) ? ' primary' : '')}; newBtns[index] = {text: b.text, cls: 'custom' + ((b.primary) ? ' primary' : '')};
});
}
var _baseUrl = (plugin.get_BaseUrl().length == 0) ? me.panelPlugins.pluginsPath : plugin.get_BaseUrl();
me.pluginDlg = new Common.Views.PluginDlg({
title: plugin.get_Name(),
width: size[0], // inner width
height: size[1], // inner height
url: _baseUrl + variation.get_Url(),
buttons: newBtns,
toolcallback: _.bind(this.onToolClose, this)
}); });
me.pluginDlg.on('render:after', function(obj){
obj.getChild('.footer .dlg-btn').on('click', _.bind(me.onDlgBtnClick, me));
me.pluginContainer = me.pluginDlg.$window.find('#id-plugin-container');
}).on('close', function(obj){
me.pluginDlg = undefined;
}).on('drag', function(args){
me.api.asc_pluginEnableMouseEvents(args[1]=='start');
}).on('resize', function(args){
me.api.asc_pluginEnableMouseEvents(args[1]=='start');
});
me.pluginDlg.show();
} }
} else
var _baseUrl = (plugin.get_BaseUrl().length == 0) ? me.panelPlugins.pluginsPath : plugin.get_BaseUrl(); this.panelPlugins.openNotVisualMode(plugin.get_Guid());
me.pluginDlg = new Common.Views.PluginDlg({
title: plugin.get_Name(),
width: size[0], // inner width
height: size[1], // inner height
url: _baseUrl + variation.get_Url(),
buttons: newBtns,
toolcallback: _.bind(this.onToolClose, this)
});
me.pluginDlg.on('render:after', function(obj){
obj.getChild('.footer .dlg-btn').on('click', _.bind(me.onDlgBtnClick, me));
me.pluginContainer = me.pluginDlg.$window.find('#id-plugin-container');
}).on('close', function(obj){
me.pluginDlg = undefined;
}).on('drag', function(args){
me.api.asc_pluginEnableMouseEvents(args[1]=='start');
});
me.pluginDlg.show();
}
}, },
onPluginClose: function() { onPluginClose: function() {
if (this.pluginDlg) if (this.pluginDlg)
this.pluginDlg.close(); this.pluginDlg.close();
else else if (this.panelPlugins.iframePlugin)
this.panelPlugins.closeInsideMode(); this.panelPlugins.closeInsideMode();
else
this.panelPlugins.closeNotVisualMode();
}, },
onPluginResize: function(width, height, callback) { onPluginResize: function(size, minSize, maxSize, callback ) {
if (this.pluginDlg) { if (this.pluginDlg) {
this.pluginDlg.setInnerSize(width, height); var resizable = (minSize && minSize.length>1 && maxSize && maxSize.length>1 && (maxSize[0] > minSize[0] || maxSize[1] > minSize[1] || maxSize[0]==0 || maxSize[1] == 0));
this.pluginDlg.setResizable(resizable, minSize, maxSize);
this.pluginDlg.setInnerSize(size[0], size[1]);
if (callback) if (callback)
callback.call(); callback.call();
} }
...@@ -283,7 +289,8 @@ define([ ...@@ -283,7 +289,8 @@ define([
onPluginMouseUp: function(x, y) { onPluginMouseUp: function(x, y) {
if (this.pluginDlg) { if (this.pluginDlg) {
this.pluginDlg.binding.dragStop(); if (this.pluginDlg.binding.dragStop) this.pluginDlg.binding.dragStop();
if (this.pluginDlg.binding.resizeStop) this.pluginDlg.binding.resizeStop();
} else } else
Common.NotificationCenter.trigger('frame:mouseup', jQuery.Event("mouseup", { pageX: x+this._moveOffset.x, pageY: y+this._moveOffset.y } )); Common.NotificationCenter.trigger('frame:mouseup', jQuery.Event("mouseup", { pageX: x+this._moveOffset.x, pageY: y+this._moveOffset.y } ));
}, },
...@@ -291,7 +298,8 @@ define([ ...@@ -291,7 +298,8 @@ define([
onPluginMouseMove: function(x, y) { onPluginMouseMove: function(x, y) {
if (this.pluginDlg) { if (this.pluginDlg) {
var offset = this.pluginContainer.offset(); var offset = this.pluginContainer.offset();
this.pluginDlg.binding.drag(jQuery.Event("mousemove", { pageX: x+offset.left, pageY: y+offset.top } )); if (this.pluginDlg.binding.drag) this.pluginDlg.binding.drag(jQuery.Event("mousemove", { pageX: x+offset.left, pageY: y+offset.top } ));
if (this.pluginDlg.binding.resize) this.pluginDlg.binding.resize(jQuery.Event("mousemove", { pageX: x+offset.left, pageY: y+offset.top } ));
} else } else
Common.NotificationCenter.trigger('frame:mousemove', jQuery.Event("mousemove", { pageX: x+this._moveOffset.x, pageY: y+this._moveOffset.y } )); Common.NotificationCenter.trigger('frame:mousemove', jQuery.Event("mousemove", { pageX: x+this._moveOffset.x, pageY: y+this._moveOffset.y } ));
} }
......
apps/common/main/lib/model/Plugin.js
View file @ a18be3f5
...@@ -65,8 +65,7 @@ define([ ...@@ -65,8 +65,7 @@ define([
isUpdateOleOnResize: false, isUpdateOleOnResize: false,
buttons: [], buttons: [],
size: [800, 600], size: [800, 600],
maximumSize: [], initOnSelectionChanged: false
minimumSize: []
} }
} }
}); });
......
apps/common/main/lib/view/Chat.js
View file @ a18be3f5
...@@ -227,22 +227,9 @@ define([ ...@@ -227,22 +227,9 @@ define([
_pickLink: function(message) { _pickLink: function(message) {
var arr = [], offset, len; var arr = [], offset, len;
message.replace(Common.Utils.emailStrongRe, function(subStr) {
var ref = (! /((^mailto:)\/\/)/i.test(subStr) ) ? ('mailto:' + subStr) : subStr;
offset = arguments[arguments.length-2];
arr.push({start: offset, end: subStr.length+offset, str: '<a href="' + ref + '">' + subStr + '</a>'});
return '';
});
message.replace(Common.Utils.ipStrongRe, function(subStr) { message.replace(Common.Utils.ipStrongRe, function(subStr) {
offset = arguments[arguments.length-2]; offset = arguments[arguments.length-2];
len = subStr.length; arr.push({start: offset, end: subStr.length+offset, str: '<a href="' + subStr + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
var elem = _.find(arr, function(item){
return ( (offset>=item.start) && (offset<item.end) ||
(offset<=item.start) && (offset+len>item.start));
});
if (!elem)
arr.push({start: offset, end: len+offset, str: '<a href="' + subStr + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
return ''; return '';
}); });
...@@ -259,6 +246,20 @@ define([ ...@@ -259,6 +246,20 @@ define([
arr.push({start: offset, end: len+offset, str: '<a href="' + ref + '" target="_blank" data-can-copy="true">' + subStr + '</a>'}); arr.push({start: offset, end: len+offset, str: '<a href="' + ref + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
return ''; return '';
}); });
message.replace(Common.Utils.emailStrongRe, function(subStr) {
var ref = (! /((^mailto:)\/\/)/i.test(subStr) ) ? ('mailto:' + subStr) : subStr;
offset = arguments[arguments.length-2];
len = subStr.length;
var elem = _.find(arr, function(item){
return ( (offset>=item.start) && (offset<item.end) ||
(offset<=item.start) && (offset+len>item.start));
});
if (!elem)
arr.push({start: offset, end: len+offset, str: '<a href="' + ref + '">' + subStr + '</a>'});
return '';
});
arr = _.sortBy(arr, function(item){ return item.start; }); arr = _.sortBy(arr, function(item){ return item.start; });
var str_res = (arr.length>0) ? ( message.substring(0, arr[0].start) + arr[0].str) : message; var str_res = (arr.length>0) ? ( message.substring(0, arr[0].start) + arr[0].str) : message;
......
apps/common/main/lib/view/Comments.js
View file @ a18be3f5
...@@ -1356,22 +1356,9 @@ define([ ...@@ -1356,22 +1356,9 @@ define([
var arr = [], offset, len; var arr = [], offset, len;
message = Common.Utils.String.htmlEncode(message); message = Common.Utils.String.htmlEncode(message);
message.replace(Common.Utils.emailStrongRe, function(subStr) {
var ref = (! /((^mailto:)\/\/)/i.test(subStr) ) ? ('mailto:' + subStr) : subStr;
offset = arguments[arguments.length-2];
arr.push({start: offset, end: subStr.length+offset, str: '<a href="' + ref + '">' + subStr + '</a>'});
return '';
});
message.replace(Common.Utils.ipStrongRe, function(subStr) { message.replace(Common.Utils.ipStrongRe, function(subStr) {
offset = arguments[arguments.length-2]; offset = arguments[arguments.length-2];
len = subStr.length; arr.push({start: offset, end: subStr.length+offset, str: '<a href="' + subStr + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
var elem = _.find(arr, function(item){
return ( (offset>=item.start) && (offset<item.end) ||
(offset<=item.start) && (offset+len>item.start));
});
if (!elem)
arr.push({start: offset, end: len+offset, str: '<a href="' + subStr + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
return ''; return '';
}); });
...@@ -1388,6 +1375,20 @@ define([ ...@@ -1388,6 +1375,20 @@ define([
arr.push({start: offset, end: len+offset, str: '<a href="' + ref + '" target="_blank" data-can-copy="true">' + subStr + '</a>'}); arr.push({start: offset, end: len+offset, str: '<a href="' + ref + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
return ''; return '';
}); });
message.replace(Common.Utils.emailStrongRe, function(subStr) {
var ref = (! /((^mailto:)\/\/)/i.test(subStr) ) ? ('mailto:' + subStr) : subStr;
offset = arguments[arguments.length-2];
len = subStr.length;
var elem = _.find(arr, function(item){
return ( (offset>=item.start) && (offset<item.end) ||
(offset<=item.start) && (offset+len>item.start));
});
if (!elem)
arr.push({start: offset, end: len+offset, str: '<a href="' + ref + '">' + subStr + '</a>'});
return '';
});
arr = _.sortBy(arr, function(item){ return item.start; }); arr = _.sortBy(arr, function(item){ return item.start; });
var str_res = (arr.length>0) ? ( message.substring(0, arr[0].start) + arr[0].str) : message; var str_res = (arr.length>0) ? ( message.substring(0, arr[0].start) + arr[0].str) : message;
......
apps/common/main/lib/view/OpenDialog.js
View file @ a18be3f5
...@@ -61,18 +61,24 @@ define([ ...@@ -61,18 +61,24 @@ define([
header : true, header : true,
cls : 'open-dlg', cls : 'open-dlg',
contentTemplate : '', contentTemplate : '',
title : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT') title : (options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? t.txtTitleProtected : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT')
}, options); }, options);
this.template = options.template || [ this.template = options.template || [
'<div class="box" style="height:' + (_options.height - 85) + 'px;">', '<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="content-panel" >', '<div class="content-panel" >',
'<% if (type == Asc.c_oAscAdvancedOptionsID.DRM) { %>',
'<label class="header">' + t.txtPassword + '</label>',
'<div id="id-password-txt" style="margin-bottom:15px;"></div>',
'<% } else { %>',
'<label class="header">' + t.txtEncoding + '</label>', '<label class="header">' + t.txtEncoding + '</label>',
'<div id="id-codepages-combo" class="input-group-nr" style="margin-bottom:15px;"></div>', '<div id="id-codepages-combo" class="input-group-nr" style="margin-bottom:15px;"></div>',
'<% if (type == Asc.c_oAscAdvancedOptionsID.CSV) { %>', '<% if (type == Asc.c_oAscAdvancedOptionsID.CSV) { %>',
'<label class="header">' + t.txtDelimiter + '</label>', '<label class="header">' + t.txtDelimiter + '</label>',
'<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 110px;"></div>', '<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 110px;"></div>',
'<% } %>', '<% } %>',
'<% } %>',
'</div>', '</div>',
'</div>', '</div>',
...@@ -97,13 +103,36 @@ define([ ...@@ -97,13 +103,36 @@ define([
if (this.$window) { if (this.$window) {
this.$window.find('.tool').hide(); this.$window.find('.tool').hide();
this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.initCodePages(); if (this.type == Asc.c_oAscAdvancedOptionsID.DRM) {
var me = this;
me.inputPwd = new Common.UI.InputField({
el: $('#id-password-txt'),
type: 'password',
allowBlank: false,
validateOnBlur: false
});
} else
this.initCodePages();
} }
}, },
show: function() {
Common.UI.Window.prototype.show.apply(this, arguments);
if (this.type == Asc.c_oAscAdvancedOptionsID.DRM) {
var me = this;
setTimeout(function(){
me.inputPwd.cmpEl.find('input').focus();
}, 500);
}
},
onBtnClick: function (event) { onBtnClick: function (event) {
if (this.handler && this.cmbEncoding) { if (this.handler) {
this.handler.call(this, this.cmbEncoding.getValue(), this.cmbDelimiter ? this.cmbDelimiter.getValue() : null); if (this.cmbEncoding)
this.handler.call(this, this.cmbEncoding.getValue(), this.cmbDelimiter ? this.cmbDelimiter.getValue() : null);
else
this.handler.call(this, this.inputPwd.getValue());
} }
this.close(); this.close();
...@@ -311,7 +340,9 @@ define([ ...@@ -311,7 +340,9 @@ define([
txtEncoding : "Encoding ", txtEncoding : "Encoding ",
txtSpace : "Space", txtSpace : "Space",
txtTab : "Tab", txtTab : "Tab",
txtTitle : "Choose %1 options" txtTitle : "Choose %1 options",
txtPassword : "Password",
txtTitleProtected : "Protected File"
}, Common.Views.OpenDialog || {})); }, Common.Views.OpenDialog || {}));
}); });
\ No newline at end of file
apps/common/main/lib/view/Plugins.js
View file @ a18be3f5
...@@ -172,6 +172,16 @@ define([ ...@@ -172,6 +172,16 @@ define([
this.pluginsPanel.toggleClass('hidden', false); this.pluginsPanel.toggleClass('hidden', false);
}, },
openNotVisualMode: function(pluginGuid) {
var rec = this.viewPluginsList.store.findWhere({guid: pluginGuid});
if (rec)
this.viewPluginsList.cmpEl.find('#' + rec.get('id')).parent().addClass('selected');
},
closeNotVisualMode: function() {
this.viewPluginsList.cmpEl.find('.selected').removeClass('selected');
},
_onLoad: function() { _onLoad: function() {
if (this.loadMask) if (this.loadMask)
this.loadMask.hide(); this.loadMask.hide();
...@@ -220,6 +230,10 @@ define([ ...@@ -220,6 +230,10 @@ define([
Common.UI.Window.prototype.render.call(this); Common.UI.Window.prototype.render.call(this);
this.$window.find('> .body').css({height: 'auto', overflow: 'hidden'}); this.$window.find('> .body').css({height: 'auto', overflow: 'hidden'});
this.boxEl = this.$window.find('.body > .box');
this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34;
this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
var iframe = document.createElement("iframe"); var iframe = document.createElement("iframe");
iframe.id = 'plugin_iframe'; iframe.id = 'plugin_iframe';
iframe.name = 'pluginFrameEditor', iframe.name = 'pluginFrameEditor',
...@@ -241,6 +255,10 @@ define([ ...@@ -241,6 +255,10 @@ define([
iframe.src = this.url; iframe.src = this.url;
$('#id-plugin-placeholder').append(iframe); $('#id-plugin-placeholder').append(iframe);
this.on('resizing', function(args){
me.boxEl.css('height', parseInt(me.$window.css('height')) - me._headerFooterHeight);
});
}, },
_onLoad: function() { _onLoad: function() {
...@@ -252,23 +270,19 @@ define([ ...@@ -252,23 +270,19 @@ define([
setInnerSize: function(width, height) { setInnerSize: function(width, height) {
var maxHeight = parseInt(window.innerHeight), var maxHeight = parseInt(window.innerHeight),
maxWidth = parseInt(window.innerWidth), maxWidth = parseInt(window.innerWidth),
header_footer = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34,
borders_height = (parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))),
borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))); borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width')));
if (maxHeight<height + header_footer + borders_height) if (maxHeight<height + this._headerFooterHeight)
height = maxHeight - header_footer - borders_height; height = maxHeight - this._headerFooterHeight;
if (maxWidth<width + borders_width) if (maxWidth<width + borders_width)
width = maxWidth - borders_width; width = maxWidth - borders_width;
var $window = this.getChild(); this.boxEl.css('height', height);
var boxEl = $window.find('.body > .box');
boxEl.css('height', height);
Common.UI.Window.prototype.setHeight.call(this, height + header_footer + borders_height); Common.UI.Window.prototype.setHeight.call(this, height + this._headerFooterHeight);
Common.UI.Window.prototype.setWidth.call(this, width + borders_width); Common.UI.Window.prototype.setWidth.call(this, width + borders_width);
this.$window.css('left',(maxWidth - width - borders_width) / 2); this.$window.css('left',(maxWidth - width - borders_width) / 2);
this.$window.css('top',((maxHeight - height - header_footer - borders_height) / 2) * 0.9); this.$window.css('top',((maxHeight - height - this._headerFooterHeight) / 2) * 0.9);
}, },
textLoading : 'Loading' textLoading : 'Loading'
......
apps/common/main/resources/less/plugins.less
View file @ a18be3f5
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
&:hover, &:hover,
&.over { &.over {
background-color: @secondary; background-color: @secondary;
}
.plugin-icon { &.selected {
.box-shadow(0 0 0 2px transparent); background-color: @primary;
} color: #fff;
} }
} }
......
apps/common/main/resources/less/window.less
View file @ a18be3f5
...@@ -80,6 +80,10 @@ ...@@ -80,6 +80,10 @@
} }
} }
} }
&.resizing {
cursor: inherit !important;
}
} }
> .body { > .body {
...@@ -185,6 +189,32 @@ ...@@ -185,6 +189,32 @@
-o-transform: none !important; -o-transform: none !important;
-o-transition: none !important; -o-transition: none !important;
} }
.resize-border {
position: absolute;
width: 5px;
height: 5px;
z-index: 1;
background: @gray-lighter;
border: 1px none @gray-dark;
&.left {
left: 0;
}
&.right {
right: 0;
}
&.top {
top: 0;
}
&.bottom {
bottom: 0;
}
&.resizing {
cursor: inherit !important;
}
}
} }
.modal-dlg { .modal-dlg {
......
apps/documenteditor/main/app/controller/Main.js
View file @ a18be3f5
...@@ -313,6 +313,7 @@ define([ ...@@ -313,6 +313,7 @@ define([
if (!old_rights) if (!old_rights)
Common.UI.warning({ Common.UI.warning({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
maxwidth: 600,
msg : _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, msg : _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message,
callback: function(){ callback: function(){
me._state.lostEditingRights = false; me._state.lostEditingRights = false;
...@@ -1591,14 +1592,14 @@ define([ ...@@ -1591,14 +1592,14 @@ define([
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(advOptions) {
var type = advOptions.asc_getOptionId(); var type = advOptions.asc_getOptionId(),
me = this, dlg;
if (type == Asc.c_oAscAdvancedOptionsID.TXT) { if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
var me = this; dlg = new Common.Views.OpenDialog({
var dlg = new Common.Views.OpenDialog({
type: type, type: type,
codepages: advOptions.asc_getOptions().asc_getCodePages(), codepages: advOptions.asc_getOptions().asc_getCodePages(),
settings: advOptions.asc_getOptions().asc_getRecommendedSettings(), settings: advOptions.asc_getOptions().asc_getRecommendedSettings(),
handler: function (encoding, delimiter) { handler: function (encoding) {
me.isShowOpenDialog = false; me.isShowOpenDialog = false;
if (me && me.api) { if (me && me.api) {
me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding));
...@@ -1606,11 +1607,22 @@ define([ ...@@ -1606,11 +1607,22 @@ define([
} }
} }
}); });
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
dlg = new Common.Views.OpenDialog({
type: type,
handler: function (value) {
me.isShowOpenDialog = false;
if (me && me.api) {
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value));
me.loadMask && me.loadMask.show();
}
}
});
}
if (dlg) {
this.isShowOpenDialog = true; this.isShowOpenDialog = true;
this.loadMask && this.loadMask.hide(); this.loadMask && this.loadMask.hide();
this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
dlg.show(); dlg.show();
} }
}, },
...@@ -1728,8 +1740,7 @@ define([ ...@@ -1728,8 +1740,7 @@ define([
isUpdateOleOnResize : itemVar.isUpdateOleOnResize, isUpdateOleOnResize : itemVar.isUpdateOleOnResize,
buttons: itemVar.buttons, buttons: itemVar.buttons,
size: itemVar.size, size: itemVar.size,
minimumSize: itemVar.minimumSize, initOnSelectionChanged: itemVar.initOnSelectionChanged
maximumSize: itemVar.maximumSize
})); }));
}); });
if (variationsArr.length>0) if (variationsArr.length>0)
......
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file @ a18be3f5
...@@ -171,26 +171,7 @@ define([ ...@@ -171,26 +171,7 @@ define([
this.btnBorderColor.on('render:after', function(btn) { this.btnBorderColor.on('render:after', function(btn) {
me.colorsBorder = new Common.UI.ThemeColorPalette({ me.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#drop-advanced-border-color-menu'), el: $('#drop-advanced-border-color-menu')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}) })
.on('select', _.bind(function(picker, color) { .on('select', _.bind(function(picker, color) {
me.btnBorderColor.setColor(color); me.btnBorderColor.setColor(color);
...@@ -216,25 +197,7 @@ define([ ...@@ -216,25 +197,7 @@ define([
this.btnBackColor.on('render:after', function(btn) { this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({ me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#drop-advanced-back-color-menu'), el: $('#drop-advanced-back-color-menu'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}) })
.on('select', _.bind(function(picker, color) { .on('select', _.bind(function(picker, color) {
var clr, border; var clr, border;
...@@ -1199,8 +1162,6 @@ define([ ...@@ -1199,8 +1162,6 @@ define([
txtNoBorders: 'No borders', txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color', textNewColor: 'Add New Custom Color',
textPosition: 'Position', textPosition: 'Position',
textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors',
textAlign: 'Alignment', textAlign: 'Alignment',
textTop: 'Top', textTop: 'Top',
textLeft: 'Left', textLeft: 'Left',
......
apps/documenteditor/main/app/view/ParagraphSettings.js
View file @ a18be3f5
...@@ -168,25 +168,7 @@ define([ ...@@ -168,25 +168,7 @@ define([
this.btnColor.on('render:after', function(btn) { this.btnColor.on('render:after', function(btn) {
me.mnuColorPicker = new Common.UI.ThemeColorPalette({ me.mnuColorPicker = new Common.UI.ThemeColorPalette({
el: $('#paragraph-color-menu'), el: $('#paragraph-color-menu'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.mnuColorPicker.on('select', _.bind(me.onColorPickerSelect, me)); me.mnuColorPicker.on('select', _.bind(me.onColorPickerSelect, me));
}); });
...@@ -514,8 +496,6 @@ define([ ...@@ -514,8 +496,6 @@ define([
textAdvanced: 'Show advanced settings', textAdvanced: 'Show advanced settings',
textAt: 'At', textAt: 'At',
txtAutoText: 'Auto', txtAutoText: 'Auto',
textThemeColors: 'Theme Colors',
textStandartColors: 'Standart Colors',
textBackColor: 'Background color', textBackColor: 'Background color',
textNewColor: 'Add New Custom Color' textNewColor: 'Add New Custom Color'
}, DE.Views.ParagraphSettings || {})); }, DE.Views.ParagraphSettings || {}));
......
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file @ a18be3f5
...@@ -220,26 +220,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem ...@@ -220,26 +220,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.btnBorderColor.on('render:after', function(btn) { this.btnBorderColor.on('render:after', function(btn) {
me.colorsBorder = new Common.UI.ThemeColorPalette({ me.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#paragraphadv-border-color-menu'), el: $('#paragraphadv-border-color-menu')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me)); me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me));
}); });
...@@ -294,25 +275,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem ...@@ -294,25 +275,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.btnBackColor.on('render:after', function(btn) { this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({ me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#paragraphadv-back-color-menu'), el: $('#paragraphadv-back-color-menu'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me)); me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me));
}); });
...@@ -1179,8 +1142,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem ...@@ -1179,8 +1142,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
strSubscript: 'Subscript', strSubscript: 'Subscript',
strSmallCaps: 'Small caps', strSmallCaps: 'Small caps',
strAllCaps: 'All caps', strAllCaps: 'All caps',
textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors',
strOrphan: 'Orphan control', strOrphan: 'Orphan control',
strKeepNext: 'Keep with next', strKeepNext: 'Keep with next',
strTabs: 'Tab', strTabs: 'Tab',
......
apps/documenteditor/main/app/view/TableSettings.js
View file @ a18be3f5
...@@ -235,26 +235,7 @@ define([ ...@@ -235,26 +235,7 @@ define([
this.btnBorderColor.on('render:after', function(btn) { this.btnBorderColor.on('render:after', function(btn) {
me.borderColor = new Common.UI.ThemeColorPalette({ me.borderColor = new Common.UI.ThemeColorPalette({
el: $('#table-border-color-menu'), el: $('#table-border-color-menu')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.borderColor.on('select', _.bind(me.onColorsBorderSelect, me)); me.borderColor.on('select', _.bind(me.onColorsBorderSelect, me));
}); });
...@@ -276,25 +257,7 @@ define([ ...@@ -276,25 +257,7 @@ define([
this.btnBackColor.on('render:after', function(btn) { this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({ me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#table-back-color-menu'), el: $('#table-back-color-menu'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me)); me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me));
}); });
...@@ -840,8 +803,6 @@ define([ ...@@ -840,8 +803,6 @@ define([
textLast : 'Last', textLast : 'Last',
textEmptyTemplate : 'No templates', textEmptyTemplate : 'No templates',
strRepeatRow : 'Repeat as header row at the top of each page', strRepeatRow : 'Repeat as header row at the top of each page',
textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors',
tipTop: 'Set Outer Top Border Only', tipTop: 'Set Outer Top Border Only',
tipLeft: 'Set Outer Left Border Only', tipLeft: 'Set Outer Left Border Only',
tipBottom: 'Set Outer Bottom Border Only', tipBottom: 'Set Outer Bottom Border Only',
......
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
View file @ a18be3f5
...@@ -889,26 +889,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -889,26 +889,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.btnBorderColor.on('render:after', function(btn) { this.btnBorderColor.on('render:after', function(btn) {
me.colorsBorder = new Common.UI.ThemeColorPalette({ me.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#tableadv-border-color-menu'), el: $('#tableadv-border-color-menu')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me)); me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me));
}); });
...@@ -929,25 +910,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -929,25 +910,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.btnBackColor.on('render:after', function(btn) { this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({ me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#tableadv-back-color-menu'), el: $('#tableadv-back-color-menu'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me)); me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me));
}); });
...@@ -967,25 +930,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -967,25 +930,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.btnTableBackColor.on('render:after', function(btn) { this.btnTableBackColor.on('render:after', function(btn) {
me.colorsTableBack = new Common.UI.ThemeColorPalette({ me.colorsTableBack = new Common.UI.ThemeColorPalette({
el: $('#tableadv-table-back-color-menu'), el: $('#tableadv-table-back-color-menu'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsTableBack.on('select', _.bind(me.onColorsTableBackSelect, me)); me.colorsTableBack.on('select', _.bind(me.onColorsTableBackSelect, me));
}); });
...@@ -1253,7 +1198,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -1253,7 +1198,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
if (cellWidth !== null) if (cellWidth !== null)
this.nfPrefWidth.setValue(cellWidth>0 ? Common.Utils.Metric.fnRecalcFromMM(cellWidth) : -cellWidth , true); this.nfPrefWidth.setValue(cellWidth>0 ? Common.Utils.Metric.fnRecalcFromMM(cellWidth) : -cellWidth , true);
this.chPrefWidth.setValue(cellWidth !== null, true); this.chPrefWidth.setValue((props.get_CellsWidthNotEqual()) ? 'indeterminate' : (cellWidth !== null), true);
value = (this.chPrefWidth.getValue()!=='checked'); value = (this.chPrefWidth.getValue()!=='checked');
this.nfPrefWidth.setDisabled(value); this.nfPrefWidth.setDisabled(value);
this.cmbPrefWidthUnit.setDisabled(value); this.cmbPrefWidthUnit.setDisabled(value);
...@@ -2141,8 +2086,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -2141,8 +2086,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
okButtonText: 'Ok', okButtonText: 'Ok',
txtNoBorders: 'No borders', txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color', textNewColor: 'Add New Custom Color',
textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors',
textCenter: 'Center', textCenter: 'Center',
textMargin: 'Margin', textMargin: 'Margin',
textPage: 'Page', textPage: 'Page',
......
apps/documenteditor/main/app/view/TextArtSettings.js
View file @ a18be3f5
...@@ -158,26 +158,8 @@ define([ ...@@ -158,26 +158,8 @@ define([
this.btnBackColor.on('render:after', function(btn) { this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({ me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#textart-back-color-menu'), el: $('#textart-back-color-menu'),
dynamiccolors: 10,
value: 'transparent', value: 'transparent',
colors: [ transparent: true
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me)); me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me));
}); });
...@@ -279,26 +261,7 @@ define([ ...@@ -279,26 +261,7 @@ define([
this.btnGradColor.on('render:after', function(btn) { this.btnGradColor.on('render:after', function(btn) {
me.colorsGrad = new Common.UI.ThemeColorPalette({ me.colorsGrad = new Common.UI.ThemeColorPalette({
el: $('#textart-gradient-color-menu'), el: $('#textart-gradient-color-menu'),
dynamiccolors: 10, value: '000000'
value: '000000',
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsGrad.on('select', _.bind(me.onColorsGradientSelect, me)); me.colorsGrad.on('select', _.bind(me.onColorsGradientSelect, me));
}); });
...@@ -354,26 +317,7 @@ define([ ...@@ -354,26 +317,7 @@ define([
this.btnBorderColor.on('render:after', function(btn) { this.btnBorderColor.on('render:after', function(btn) {
me.colorsBorder = new Common.UI.ThemeColorPalette({ me.colorsBorder = new Common.UI.ThemeColorPalette({
el: $('#textart-border-color-menu'), el: $('#textart-border-color-menu'),
dynamiccolors: 10, value: '000000'
value: '000000',
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me)); me.colorsBorder.on('select', _.bind(me.onColorsBorderSelect, me));
}); });
...@@ -1203,8 +1147,6 @@ define([ ...@@ -1203,8 +1147,6 @@ define([
strFill : 'Fill', strFill : 'Fill',
textColor : 'Color Fill', textColor : 'Color Fill',
textNewColor : 'Add New Custom Color', textNewColor : 'Add New Custom Color',
textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors',
strTransparency : 'Opacity', strTransparency : 'Opacity',
textNoFill : 'No Fill', textNoFill : 'No Fill',
textSelectTexture : 'Select', textSelectTexture : 'Select',
......
apps/documenteditor/main/app/view/Toolbar.js
View file @ a18be3f5
...@@ -814,26 +814,7 @@ define([ ...@@ -814,26 +814,7 @@ define([
colorVal.css('background-color', btn.currentColor || 'transparent'); colorVal.css('background-color', btn.currentColor || 'transparent');
me.mnuFontColorPicker = new Common.UI.ThemeColorPalette({ me.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-fontcolor'), el: $('#id-toolbar-menu-fontcolor')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
}); });
...@@ -844,25 +825,7 @@ define([ ...@@ -844,25 +825,7 @@ define([
me.mnuParagraphColorPicker = new Common.UI.ThemeColorPalette({ me.mnuParagraphColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-paracolor'), el: $('#id-toolbar-menu-paracolor'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
}); });
...@@ -1847,8 +1810,6 @@ define([ ...@@ -1847,8 +1810,6 @@ define([
textPie: 'Pie Chart', textPie: 'Pie Chart',
textPoint: 'Point Chart', textPoint: 'Point Chart',
textStock: 'Stock Chart', textStock: 'Stock Chart',
textThemeColors: 'Theme Colors',
textStandartColors: 'Standart Colors',
tipColorSchemas: 'Change Color Scheme', tipColorSchemas: 'Change Color Scheme',
tipInsertText: 'Insert Text', tipInsertText: 'Insert Text',
tipHAligh: 'Horizontal Align', tipHAligh: 'Horizontal Align',
......
apps/documenteditor/main/locale/en.json
View file @ a18be3f5
...@@ -86,6 +86,8 @@ ...@@ -86,6 +86,8 @@
"Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All", "Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All",
"Common.UI.SynchronizeTip.textDontShow": "Don't show this message again", "Common.UI.SynchronizeTip.textDontShow": "Don't show this message again",
"Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br/>Please click to save your changes and reload the updates.", "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br/>Please click to save your changes and reload the updates.",
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No", "Common.UI.Window.noButtonText": "No",
...@@ -157,6 +159,8 @@ ...@@ -157,6 +159,8 @@
"Common.Views.OpenDialog.okButtonText": "OK", "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtTitleProtected": "Protected File",
"Common.Views.Plugins.strPlugins": "Add-ons", "Common.Views.Plugins.strPlugins": "Add-ons",
"Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start", "Common.Views.Plugins.textStart": "Start",
...@@ -842,8 +846,8 @@ ...@@ -842,8 +846,8 @@
"DE.Views.DropcapSettingsAdvanced.textRelative": "Relative to", "DE.Views.DropcapSettingsAdvanced.textRelative": "Relative to",
"DE.Views.DropcapSettingsAdvanced.textRight": "Right", "DE.Views.DropcapSettingsAdvanced.textRight": "Right",
"DE.Views.DropcapSettingsAdvanced.textRowHeight": "Height in rows", "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Height in rows",
"DE.Views.DropcapSettingsAdvanced.textStandartColors": "Standard Colors", "del_DE.Views.DropcapSettingsAdvanced.textStandartColors": "Standard Colors",
"DE.Views.DropcapSettingsAdvanced.textThemeColors": "Theme Colors", "del_DE.Views.DropcapSettingsAdvanced.textThemeColors": "Theme Colors",
"DE.Views.DropcapSettingsAdvanced.textTitle": "Drop Cap - Advanced Settings", "DE.Views.DropcapSettingsAdvanced.textTitle": "Drop Cap - Advanced Settings",
"DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Frame - Advanced Settings", "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Frame - Advanced Settings",
"DE.Views.DropcapSettingsAdvanced.textTop": "Top", "DE.Views.DropcapSettingsAdvanced.textTop": "Top",
...@@ -1115,8 +1119,8 @@ ...@@ -1115,8 +1119,8 @@
"DE.Views.ParagraphSettings.textBackColor": "Background color", "DE.Views.ParagraphSettings.textBackColor": "Background color",
"DE.Views.ParagraphSettings.textExact": "Exactly", "DE.Views.ParagraphSettings.textExact": "Exactly",
"DE.Views.ParagraphSettings.textNewColor": "Add New Custom Color", "DE.Views.ParagraphSettings.textNewColor": "Add New Custom Color",
"DE.Views.ParagraphSettings.textStandartColors": "Standard Colors", "del_DE.Views.ParagraphSettings.textStandartColors": "Standard Colors",
"DE.Views.ParagraphSettings.textThemeColors": "Theme Colors", "del_DE.Views.ParagraphSettings.textThemeColors": "Theme Colors",
"DE.Views.ParagraphSettings.txtAutoText": "Auto", "DE.Views.ParagraphSettings.txtAutoText": "Auto",
"DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancel", "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancel",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "The specified tabs will appear in this field", "DE.Views.ParagraphSettingsAdvanced.noTabs": "The specified tabs will appear in this field",
...@@ -1157,12 +1161,12 @@ ...@@ -1157,12 +1161,12 @@
"DE.Views.ParagraphSettingsAdvanced.textRight": "Right", "DE.Views.ParagraphSettingsAdvanced.textRight": "Right",
"DE.Views.ParagraphSettingsAdvanced.textSet": "Specify", "DE.Views.ParagraphSettingsAdvanced.textSet": "Specify",
"DE.Views.ParagraphSettingsAdvanced.textSpacing": "Spacing", "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Spacing",
"DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Standard Colors", "del_DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Standard Colors",
"DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Center", "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Center",
"DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Left", "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Left",
"DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab Position", "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab Position",
"DE.Views.ParagraphSettingsAdvanced.textTabRight": "Right", "DE.Views.ParagraphSettingsAdvanced.textTabRight": "Right",
"DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Theme Colors", "del_DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Theme Colors",
"DE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced Settings", "DE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced Settings",
"DE.Views.ParagraphSettingsAdvanced.textTop": "Top", "DE.Views.ParagraphSettingsAdvanced.textTop": "Top",
"DE.Views.ParagraphSettingsAdvanced.tipAll": "Set Outer Border and All Inner Lines", "DE.Views.ParagraphSettingsAdvanced.tipAll": "Set Outer Border and All Inner Lines",
...@@ -1208,11 +1212,11 @@ ...@@ -1208,11 +1212,11 @@
"DE.Views.ShapeSettings.textPatternFill": "Pattern", "DE.Views.ShapeSettings.textPatternFill": "Pattern",
"DE.Views.ShapeSettings.textRadial": "Radial", "DE.Views.ShapeSettings.textRadial": "Radial",
"DE.Views.ShapeSettings.textSelectTexture": "Select", "DE.Views.ShapeSettings.textSelectTexture": "Select",
"DE.Views.ShapeSettings.textStandartColors": "Standard Colors", "del_DE.Views.ShapeSettings.textStandartColors": "Standard Colors",
"DE.Views.ShapeSettings.textStretch": "Stretch", "DE.Views.ShapeSettings.textStretch": "Stretch",
"DE.Views.ShapeSettings.textStyle": "Style", "DE.Views.ShapeSettings.textStyle": "Style",
"DE.Views.ShapeSettings.textTexture": "From Texture", "DE.Views.ShapeSettings.textTexture": "From Texture",
"DE.Views.ShapeSettings.textThemeColors": "Theme Colors", "del_DE.Views.ShapeSettings.textThemeColors": "Theme Colors",
"DE.Views.ShapeSettings.textTile": "Tile", "DE.Views.ShapeSettings.textTile": "Tile",
"DE.Views.ShapeSettings.textWrap": "Wrapping Style", "DE.Views.ShapeSettings.textWrap": "Wrapping Style",
"DE.Views.ShapeSettings.txtBehind": "Behind", "DE.Views.ShapeSettings.txtBehind": "Behind",
...@@ -1293,9 +1297,9 @@ ...@@ -1293,9 +1297,9 @@
"DE.Views.TableSettings.textOK": "OK", "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Rows", "DE.Views.TableSettings.textRows": "Rows",
"DE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above", "DE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above",
"DE.Views.TableSettings.textStandartColors": "Standard Colors", "del_DE.Views.TableSettings.textStandartColors": "Standard Colors",
"DE.Views.TableSettings.textTemplate": "Select From Template", "DE.Views.TableSettings.textTemplate": "Select From Template",
"DE.Views.TableSettings.textThemeColors": "Theme Colors", "del_DE.Views.TableSettings.textThemeColors": "Theme Colors",
"DE.Views.TableSettings.textTotal": "Total", "DE.Views.TableSettings.textTotal": "Total",
"DE.Views.TableSettings.textWrap": "Text Wrapping", "DE.Views.TableSettings.textWrap": "Text Wrapping",
"DE.Views.TableSettings.textWrapNoneTooltip": "Inline table", "DE.Views.TableSettings.textWrapNoneTooltip": "Inline table",
...@@ -1353,12 +1357,12 @@ ...@@ -1353,12 +1357,12 @@
"DE.Views.TableSettingsAdvanced.textRight": "Right", "DE.Views.TableSettingsAdvanced.textRight": "Right",
"DE.Views.TableSettingsAdvanced.textRightOf": "to the right of", "DE.Views.TableSettingsAdvanced.textRightOf": "to the right of",
"DE.Views.TableSettingsAdvanced.textRightTooltip": "Right", "DE.Views.TableSettingsAdvanced.textRightTooltip": "Right",
"DE.Views.TableSettingsAdvanced.textStandartColors": "Standard Colors", "del_DE.Views.TableSettingsAdvanced.textStandartColors": "Standard Colors",
"DE.Views.TableSettingsAdvanced.textTable": "Table", "DE.Views.TableSettingsAdvanced.textTable": "Table",
"DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background", "DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position", "DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position",
"DE.Views.TableSettingsAdvanced.textTableSize": "Table Size", "DE.Views.TableSettingsAdvanced.textTableSize": "Table Size",
"DE.Views.TableSettingsAdvanced.textThemeColors": "Theme Colors", "del_DE.Views.TableSettingsAdvanced.textThemeColors": "Theme Colors",
"DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings", "DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings",
"DE.Views.TableSettingsAdvanced.textTop": "Top", "DE.Views.TableSettingsAdvanced.textTop": "Top",
"DE.Views.TableSettingsAdvanced.textVertical": "Vertical", "DE.Views.TableSettingsAdvanced.textVertical": "Vertical",
...@@ -1400,10 +1404,10 @@ ...@@ -1400,10 +1404,10 @@
"DE.Views.TextArtSettings.textNoFill": "No Fill", "DE.Views.TextArtSettings.textNoFill": "No Fill",
"DE.Views.TextArtSettings.textRadial": "Radial", "DE.Views.TextArtSettings.textRadial": "Radial",
"DE.Views.TextArtSettings.textSelectTexture": "Select", "DE.Views.TextArtSettings.textSelectTexture": "Select",
"DE.Views.TextArtSettings.textStandartColors": "Standard Colors", "del_DE.Views.TextArtSettings.textStandartColors": "Standard Colors",
"DE.Views.TextArtSettings.textStyle": "Style", "DE.Views.TextArtSettings.textStyle": "Style",
"DE.Views.TextArtSettings.textTemplate": "Template", "DE.Views.TextArtSettings.textTemplate": "Template",
"DE.Views.TextArtSettings.textThemeColors": "Theme Colors", "del_DE.Views.TextArtSettings.textThemeColors": "Theme Colors",
"DE.Views.TextArtSettings.textTransform": "Transform", "DE.Views.TextArtSettings.textTransform": "Transform",
"DE.Views.TextArtSettings.txtNoBorders": "No Line", "DE.Views.TextArtSettings.txtNoBorders": "No Line",
"DE.Views.Toolbar.mniCustomTable": "Insert Custom Table", "DE.Views.Toolbar.mniCustomTable": "Insert Custom Table",
...@@ -1462,7 +1466,7 @@ ...@@ -1462,7 +1466,7 @@
"DE.Views.Toolbar.textPoint": "Point Chart", "DE.Views.Toolbar.textPoint": "Point Chart",
"DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textPortrait": "Portrait",
"DE.Views.Toolbar.textRight": "Right: ", "DE.Views.Toolbar.textRight": "Right: ",
"DE.Views.Toolbar.textStandartColors": "Standard Colors", "del_DE.Views.Toolbar.textStandartColors": "Standard Colors",
"DE.Views.Toolbar.textStock": "Stock Chart", "DE.Views.Toolbar.textStock": "Stock Chart",
"DE.Views.Toolbar.textStrikeout": "Strikeout", "DE.Views.Toolbar.textStrikeout": "Strikeout",
"DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
...@@ -1473,7 +1477,7 @@ ...@@ -1473,7 +1477,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
"DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSubscript": "Subscript",
"DE.Views.Toolbar.textSuperscript": "Superscript", "DE.Views.Toolbar.textSuperscript": "Superscript",
"DE.Views.Toolbar.textThemeColors": "Theme Colors", "del_DE.Views.Toolbar.textThemeColors": "Theme Colors",
"DE.Views.Toolbar.textTitleError": "Error", "DE.Views.Toolbar.textTitleError": "Error",
"DE.Views.Toolbar.textToCurrent": "To current position", "DE.Views.Toolbar.textToCurrent": "To current position",
"DE.Views.Toolbar.textTop": "Top: ", "DE.Views.Toolbar.textTop": "Top: ",
......
apps/presentationeditor/main/app/controller/Main.js
View file @ a18be3f5
...@@ -294,6 +294,7 @@ define([ ...@@ -294,6 +294,7 @@ define([
if (!old_rights) if (!old_rights)
Common.UI.warning({ Common.UI.warning({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
maxwidth: 600,
msg : _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, msg : _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message,
callback: function(){ callback: function(){
me._state.lostEditingRights = false; me._state.lostEditingRights = false;
...@@ -1494,7 +1495,7 @@ define([ ...@@ -1494,7 +1495,7 @@ define([
variations.forEach(function(itemVar){ variations.forEach(function(itemVar){
var isSupported = false; var isSupported = false;
for (var i=0; i<itemVar.EditorsSupport.length; i++){ for (var i=0; i<itemVar.EditorsSupport.length; i++){
if (itemVar.EditorsSupport[i]=='word') { if (itemVar.EditorsSupport[i]=='slide') {
isSupported = true; break; isSupported = true; break;
} }
} }
...@@ -1514,8 +1515,7 @@ define([ ...@@ -1514,8 +1515,7 @@ define([
isUpdateOleOnResize : itemVar.isUpdateOleOnResize, isUpdateOleOnResize : itemVar.isUpdateOleOnResize,
buttons: itemVar.buttons, buttons: itemVar.buttons,
size: itemVar.size, size: itemVar.size,
minimumSize: itemVar.minimumSize, initOnSelectionChanged: itemVar.initOnSelectionChanged
maximumSize: itemVar.maximumSize
})); }));
}); });
if (variationsArr.length>0) if (variationsArr.length>0)
......
apps/presentationeditor/main/app/view/ImageSettings.js
View file @ a18be3f5
...@@ -111,8 +111,8 @@ define([ ...@@ -111,8 +111,8 @@ define([
}, this)); }, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
this.btnEditObject.on('click', _.bind(function(btn){ this.btnEditObject.on('click', _.bind(function(btn){
// if (this.api) this.api.asc_pluginRun(this._originalProps.asc_getPluginGuid(), 0, this._originalProps.asc_getPluginData()); if (this.api) this.api.asc_pluginRun(this._originalProps.asc_getPluginGuid(), 0, this._originalProps.asc_getPluginData());
// this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
}, this)); }, this));
$(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this)); $(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
}, },
...@@ -180,9 +180,8 @@ define([ ...@@ -180,9 +180,8 @@ define([
} }
if (this._state.isOleObject) { if (this._state.isOleObject) {
// var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); var plugin = PE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
// this.btnEditObject.setDisabled(plugin===null || plugin ===undefined); this.btnEditObject.setDisabled(plugin===null || plugin ===undefined);
this.btnEditObject.setDisabled(true);
} else { } else {
this.btnInsertFromUrl.setDisabled(pluginGuid===null); this.btnInsertFromUrl.setDisabled(pluginGuid===null);
this.btnInsertFromFile.setDisabled(pluginGuid===null); this.btnInsertFromFile.setDisabled(pluginGuid===null);
......
apps/presentationeditor/main/app/view/TableSettings.js
View file @ a18be3f5
...@@ -203,26 +203,7 @@ define([ ...@@ -203,26 +203,7 @@ define([
this.btnBorderColor.on('render:after', function(btn) { this.btnBorderColor.on('render:after', function(btn) {
me.borderColor = new Common.UI.ThemeColorPalette({ me.borderColor = new Common.UI.ThemeColorPalette({
el: $('#table-border-color-menu'), el: $('#table-border-color-menu')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.borderColor.on('select', _.bind(me.onColorsBorderSelect, me)); me.borderColor.on('select', _.bind(me.onColorsBorderSelect, me));
}); });
...@@ -244,25 +225,7 @@ define([ ...@@ -244,25 +225,7 @@ define([
this.btnBackColor.on('render:after', function(btn) { this.btnBackColor.on('render:after', function(btn) {
me.colorsBack = new Common.UI.ThemeColorPalette({ me.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#table-back-color-menu'), el: $('#table-back-color-menu'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me)); me.colorsBack.on('select', _.bind(me.onColorsBackSelect, me));
}); });
...@@ -724,8 +687,6 @@ define([ ...@@ -724,8 +687,6 @@ define([
textFirst : 'First', textFirst : 'First',
textLast : 'Last', textLast : 'Last',
textEmptyTemplate : 'No templates', textEmptyTemplate : 'No templates',
textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors',
tipTop: 'Set Outer Top Border Only', tipTop: 'Set Outer Top Border Only',
tipLeft: 'Set Outer Left Border Only', tipLeft: 'Set Outer Left Border Only',
tipBottom: 'Set Outer Bottom Border Only', tipBottom: 'Set Outer Bottom Border Only',
......
apps/presentationeditor/main/app/view/Toolbar.js
View file @ a18be3f5
...@@ -410,26 +410,7 @@ define([ ...@@ -410,26 +410,7 @@ define([
colorVal.css('background-color', btn.currentColor || 'transparent'); colorVal.css('background-color', btn.currentColor || 'transparent');
me.mnuFontColorPicker = new Common.UI.ThemeColorPalette({ me.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-fontcolor'), el: $('#id-toolbar-menu-fontcolor')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
}); });
me.paragraphControls.push(me.btnFontColor); me.paragraphControls.push(me.btnFontColor);
...@@ -1158,7 +1139,7 @@ define([ ...@@ -1158,7 +1139,7 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
var value = Common.localStorage.getItem('pe-compact-toolbar'); var value = Common.localStorage.getItem('pe-compact-toolbar');
var valueCompact = (mode.isLightVersion || value!==null && parseInt(value) == 1); var valueCompact = (value!==null && parseInt(value) == 1);
value = Common.localStorage.getItem('pe-hidden-title'); value = Common.localStorage.getItem('pe-hidden-title');
var valueTitle = (value!==null && parseInt(value) == 1); var valueTitle = (value!==null && parseInt(value) == 1);
...@@ -1169,7 +1150,6 @@ define([ ...@@ -1169,7 +1150,6 @@ define([
value = Common.localStorage.getItem("pe-hidden-rulers"); value = Common.localStorage.getItem("pe-hidden-rulers");
var valueRulers = (value !== null && parseInt(value) == 1); var valueRulers = (value !== null && parseInt(value) == 1);
me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
me.mnuitemCompactToolbar.setChecked(valueCompact); me.mnuitemCompactToolbar.setChecked(valueCompact);
me.mnuitemHideTitleBar.setChecked(valueTitle); me.mnuitemHideTitleBar.setChecked(valueTitle);
me.mnuitemHideStatusBar.setChecked(valueStatus); me.mnuitemHideStatusBar.setChecked(valueStatus);
...@@ -1596,8 +1576,6 @@ define([ ...@@ -1596,8 +1576,6 @@ define([
textCancel: 'Cancel', textCancel: 'Cancel',
tipColorSchemas: 'Change Color Scheme', tipColorSchemas: 'Change Color Scheme',
textNewColor: 'Add New Custom Color', textNewColor: 'Add New Custom Color',
textThemeColors: 'Theme Colors',
textStandartColors: 'Standart Colors',
mniSlideStandard: 'Standard (4:3)', mniSlideStandard: 'Standard (4:3)',
mniSlideWide: 'Widescreen (16:9)', mniSlideWide: 'Widescreen (16:9)',
mniSlideAdvanced: 'Advanced Settings', mniSlideAdvanced: 'Advanced Settings',
......
apps/presentationeditor/main/locale/en.json
View file @ a18be3f5
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
"Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All", "Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All",
"Common.UI.SynchronizeTip.textDontShow": "Don't show this message again", "Common.UI.SynchronizeTip.textDontShow": "Don't show this message again",
"Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br/>Please click to save your changes and reload the updates.", "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br/>Please click to save your changes and reload the updates.",
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No", "Common.UI.Window.noButtonText": "No",
...@@ -498,11 +500,11 @@ ...@@ -498,11 +500,11 @@
"PE.Views.ShapeSettings.textPatternFill": "Pattern", "PE.Views.ShapeSettings.textPatternFill": "Pattern",
"PE.Views.ShapeSettings.textRadial": "Radial", "PE.Views.ShapeSettings.textRadial": "Radial",
"PE.Views.ShapeSettings.textSelectTexture": "Select", "PE.Views.ShapeSettings.textSelectTexture": "Select",
"PE.Views.ShapeSettings.textStandartColors": "Standard Colors", "del_PE.Views.ShapeSettings.textStandartColors": "Standard Colors",
"PE.Views.ShapeSettings.textStretch": "Stretch", "PE.Views.ShapeSettings.textStretch": "Stretch",
"PE.Views.ShapeSettings.textStyle": "Style", "PE.Views.ShapeSettings.textStyle": "Style",
"PE.Views.ShapeSettings.textTexture": "From Texture", "PE.Views.ShapeSettings.textTexture": "From Texture",
"PE.Views.ShapeSettings.textThemeColors": "Theme Colors", "del_PE.Views.ShapeSettings.textThemeColors": "Theme Colors",
"PE.Views.ShapeSettings.textTile": "Tile", "PE.Views.ShapeSettings.textTile": "Tile",
"PE.Views.ShapeSettings.txtBrownPaper": "Brown Paper", "PE.Views.ShapeSettings.txtBrownPaper": "Brown Paper",
"PE.Views.ShapeSettings.txtCanvas": "Canvas", "PE.Views.ShapeSettings.txtCanvas": "Canvas",
...@@ -588,11 +590,11 @@ ...@@ -588,11 +590,11 @@
"PE.Views.SlideSettings.textSelectTexture": "Select", "PE.Views.SlideSettings.textSelectTexture": "Select",
"PE.Views.SlideSettings.textSmoothly": "Smoothly", "PE.Views.SlideSettings.textSmoothly": "Smoothly",
"PE.Views.SlideSettings.textSplit": "Split", "PE.Views.SlideSettings.textSplit": "Split",
"PE.Views.SlideSettings.textStandartColors": "Standard Colors", "del_PE.Views.SlideSettings.textStandartColors": "Standard Colors",
"PE.Views.SlideSettings.textStretch": "Stretch", "PE.Views.SlideSettings.textStretch": "Stretch",
"PE.Views.SlideSettings.textStyle": "Style", "PE.Views.SlideSettings.textStyle": "Style",
"PE.Views.SlideSettings.textTexture": "From Texture", "PE.Views.SlideSettings.textTexture": "From Texture",
"PE.Views.SlideSettings.textThemeColors": "Theme Colors", "del_PE.Views.SlideSettings.textThemeColors": "Theme Colors",
"PE.Views.SlideSettings.textTile": "Tile", "PE.Views.SlideSettings.textTile": "Tile",
"PE.Views.SlideSettings.textTop": "Top", "PE.Views.SlideSettings.textTop": "Top",
"PE.Views.SlideSettings.textTopLeft": "Top Left", "PE.Views.SlideSettings.textTopLeft": "Top Left",
...@@ -686,9 +688,9 @@ ...@@ -686,9 +688,9 @@
"PE.Views.TableSettings.textNewColor": "Custom Color", "PE.Views.TableSettings.textNewColor": "Custom Color",
"PE.Views.TableSettings.textRows": "Rows", "PE.Views.TableSettings.textRows": "Rows",
"PE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above", "PE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above",
"PE.Views.TableSettings.textStandartColors": "Standard Colors", "del_PE.Views.TableSettings.textStandartColors": "Standard Colors",
"PE.Views.TableSettings.textTemplate": "Select From Template", "PE.Views.TableSettings.textTemplate": "Select From Template",
"PE.Views.TableSettings.textThemeColors": "Theme Colors", "del_PE.Views.TableSettings.textThemeColors": "Theme Colors",
"PE.Views.TableSettings.textTotal": "Total", "PE.Views.TableSettings.textTotal": "Total",
"PE.Views.TableSettings.tipAll": "Set Outer Border and All Inner Lines", "PE.Views.TableSettings.tipAll": "Set Outer Border and All Inner Lines",
"PE.Views.TableSettings.tipBottom": "Set Outer Bottom Border Only", "PE.Views.TableSettings.tipBottom": "Set Outer Bottom Border Only",
...@@ -736,12 +738,12 @@ ...@@ -736,12 +738,12 @@
"PE.Views.TextArtSettings.textPatternFill": "Pattern", "PE.Views.TextArtSettings.textPatternFill": "Pattern",
"PE.Views.TextArtSettings.textRadial": "Radial", "PE.Views.TextArtSettings.textRadial": "Radial",
"PE.Views.TextArtSettings.textSelectTexture": "Select", "PE.Views.TextArtSettings.textSelectTexture": "Select",
"PE.Views.TextArtSettings.textStandartColors": "Standard Colors", "del_PE.Views.TextArtSettings.textStandartColors": "Standard Colors",
"PE.Views.TextArtSettings.textStretch": "Stretch", "PE.Views.TextArtSettings.textStretch": "Stretch",
"PE.Views.TextArtSettings.textStyle": "Style", "PE.Views.TextArtSettings.textStyle": "Style",
"PE.Views.TextArtSettings.textTemplate": "Template", "PE.Views.TextArtSettings.textTemplate": "Template",
"PE.Views.TextArtSettings.textTexture": "From Texture", "PE.Views.TextArtSettings.textTexture": "From Texture",
"PE.Views.TextArtSettings.textThemeColors": "Theme Colors", "del_PE.Views.TextArtSettings.textThemeColors": "Theme Colors",
"PE.Views.TextArtSettings.textTile": "Tile", "PE.Views.TextArtSettings.textTile": "Tile",
"PE.Views.TextArtSettings.textTransform": "Transform", "PE.Views.TextArtSettings.textTransform": "Transform",
"PE.Views.TextArtSettings.txtBrownPaper": "Brown Paper", "PE.Views.TextArtSettings.txtBrownPaper": "Brown Paper",
...@@ -798,12 +800,12 @@ ...@@ -798,12 +800,12 @@
"PE.Views.Toolbar.textShapeAlignMiddle": "Align Middle", "PE.Views.Toolbar.textShapeAlignMiddle": "Align Middle",
"PE.Views.Toolbar.textShapeAlignRight": "Align Right", "PE.Views.Toolbar.textShapeAlignRight": "Align Right",
"PE.Views.Toolbar.textShapeAlignTop": "Align Top", "PE.Views.Toolbar.textShapeAlignTop": "Align Top",
"PE.Views.Toolbar.textStandartColors": "Standard Colors", "del_PE.Views.Toolbar.textStandartColors": "Standard Colors",
"PE.Views.Toolbar.textStock": "Stock Chart", "PE.Views.Toolbar.textStock": "Stock Chart",
"PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textStrikeout": "Strikeout",
"PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSubscript": "Subscript",
"PE.Views.Toolbar.textSuperscript": "Superscript", "PE.Views.Toolbar.textSuperscript": "Superscript",
"PE.Views.Toolbar.textThemeColors": "Theme Colors", "del_PE.Views.Toolbar.textThemeColors": "Theme Colors",
"PE.Views.Toolbar.textTitleError": "Error", "PE.Views.Toolbar.textTitleError": "Error",
"PE.Views.Toolbar.textUnderline": "Underline", "PE.Views.Toolbar.textUnderline": "Underline",
"PE.Views.Toolbar.textZoom": "Zoom", "PE.Views.Toolbar.textZoom": "Zoom",
......
apps/presentationeditor/sdk_dev_scripts.js
View file @ a18be3f5
...@@ -149,5 +149,6 @@ var sdk_dev_scrpipts = [ ...@@ -149,5 +149,6 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/common/Drawings/Format/DrawingContent.js", "../../../../sdkjs/common/Drawings/Format/DrawingContent.js",
"../../../../sdkjs/common/clipboard_base.js", "../../../../sdkjs/common/clipboard_base.js",
"../../../../sdkjs/common/plugins.js", "../../../../sdkjs/common/plugins.js",
"../../../../sdkjs/slide/apiBuilder.js",
"../../../../sdkjs/common/text_input.js" "../../../../sdkjs/common/text_input.js"
]; ];
\ No newline at end of file
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file @ a18be3f5
...@@ -960,7 +960,19 @@ define([ ...@@ -960,7 +960,19 @@ define([
}, },
onApiHyperlinkClick: function(url) { onApiHyperlinkClick: function(url) {
if (url && this.api.asc_getUrlType(url)>0) { if (!url) {
Common.UI.alert({
msg: this.errorInvalidLink,
title: this.notcriticalErrorTitle,
iconCls: 'warn',
buttons: ['ok'],
callback: _.bind(function(btn){
Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
}, this)
});
return;
}
if (this.api.asc_getUrlType(url)>0) {
var newDocumentPage = window.open(url, '_blank'); var newDocumentPage = window.open(url, '_blank');
if (newDocumentPage) if (newDocumentPage)
newDocumentPage.focus(); newDocumentPage.focus();
...@@ -1540,7 +1552,9 @@ define([ ...@@ -1540,7 +1552,9 @@ define([
textChangeRowHeight : 'Row Height {0} points ({1} pixels)', textChangeRowHeight : 'Row Height {0} points ({1} pixels)',
textInsertLeft : 'Insert Left', textInsertLeft : 'Insert Left',
textInsertTop : 'Insert Top', textInsertTop : 'Insert Top',
textSym : 'sym' textSym : 'sym',
notcriticalErrorTitle: 'Warning',
errorInvalidLink: 'The link reference does not exist. Please correct the link or delete it.'
}, SSE.Controllers.DocumentHolder || {})); }, SSE.Controllers.DocumentHolder || {}));
}); });
\ No newline at end of file
apps/spreadsheeteditor/main/app/controller/Main.js
View file @ a18be3f5
...@@ -325,6 +325,7 @@ define([ ...@@ -325,6 +325,7 @@ define([
if (!old_rights) if (!old_rights)
Common.UI.warning({ Common.UI.warning({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
maxwidth: 600,
msg : _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message, msg : _.isEmpty(data.message) ? this.warnProcessRightsChange : data.message,
callback: function(){ callback: function(){
me._state.lostEditingRights = false; me._state.lostEditingRights = false;
...@@ -1303,10 +1304,10 @@ define([ ...@@ -1303,10 +1304,10 @@ define([
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(advOptions) {
var type = advOptions.asc_getOptionId(); var type = advOptions.asc_getOptionId(),
me = this, dlg;
if (type == Asc.c_oAscAdvancedOptionsID.CSV) { if (type == Asc.c_oAscAdvancedOptionsID.CSV) {
var me = this; dlg = new Common.Views.OpenDialog({
var dlg = new Common.Views.OpenDialog({
type: type, type: type,
codepages: advOptions.asc_getOptions().asc_getCodePages(), codepages: advOptions.asc_getOptions().asc_getCodePages(),
settings: advOptions.asc_getOptions().asc_getRecommendedSettings(), settings: advOptions.asc_getOptions().asc_getRecommendedSettings(),
...@@ -1318,11 +1319,22 @@ define([ ...@@ -1318,11 +1319,22 @@ define([
} }
} }
}); });
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
dlg = new Common.Views.OpenDialog({
type: type,
handler: function (value) {
me.isShowOpenDialog = false;
if (me && me.api) {
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value));
me.loadMask && me.loadMask.show();
}
}
});
}
if (dlg) {
this.isShowOpenDialog = true; this.isShowOpenDialog = true;
this.loadMask && this.loadMask.hide(); this.loadMask && this.loadMask.hide();
this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
dlg.show(); dlg.show();
} }
}, },
...@@ -1723,8 +1735,7 @@ define([ ...@@ -1723,8 +1735,7 @@ define([
isUpdateOleOnResize : itemVar.isUpdateOleOnResize, isUpdateOleOnResize : itemVar.isUpdateOleOnResize,
buttons: itemVar.buttons, buttons: itemVar.buttons,
size: itemVar.size, size: itemVar.size,
minimumSize: itemVar.minimumSize, initOnSelectionChanged: itemVar.initOnSelectionChanged
maximumSize: itemVar.maximumSize
})); }));
}); });
if (variationsArr.length>0) if (variationsArr.length>0)
......
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file @ a18be3f5
...@@ -292,25 +292,7 @@ define([ ...@@ -292,25 +292,7 @@ define([
me.mnuTabColor = new Common.UI.ThemeColorPalette({ me.mnuTabColor = new Common.UI.ThemeColorPalette({
el: $('#id-tab-menu-color'), el: $('#id-tab-menu-color'),
dynamiccolors: 10, transparent: true
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-', 'transparent',
'5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
me.mnuTabColor.on('select', function(picker, color) { me.mnuTabColor.on('select', function(picker, color) {
...@@ -637,8 +619,6 @@ define([ ...@@ -637,8 +619,6 @@ define([
itemHide : 'Hide', itemHide : 'Hide',
itemHidden : 'Hidden', itemHidden : 'Hidden',
itemTabColor : 'Tab Color', itemTabColor : 'Tab Color',
textThemeColors : 'Theme Colors',
textStandartColors : 'Standart Colors',
textNoColor : 'No Color', textNoColor : 'No Color',
textNewColor : 'Add New Custom Color', textNewColor : 'Add New Custom Color',
zoomText : 'Zoom {0}%', zoomText : 'Zoom {0}%',
......
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @ a18be3f5
...@@ -304,26 +304,7 @@ define([ ...@@ -304,26 +304,7 @@ define([
colorVal.css('background-color', btn.currentColor || 'transparent'); colorVal.css('background-color', btn.currentColor || 'transparent');
me.mnuTextColorPicker = new Common.UI.ThemeColorPalette({ me.mnuTextColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-fontcolor'), el: $('#id-toolbar-menu-fontcolor')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
}); });
...@@ -347,26 +328,7 @@ define([ ...@@ -347,26 +328,7 @@ define([
colorVal.css('background-color', btn.currentColor || 'transparent'); colorVal.css('background-color', btn.currentColor || 'transparent');
me.mnuBackColorPicker = new Common.UI.ThemeColorPalette({ me.mnuBackColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-paracolor'), el: $('#id-toolbar-menu-paracolor')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'transparent', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
}); });
...@@ -500,26 +462,7 @@ define([ ...@@ -500,26 +462,7 @@ define([
colorVal.css('background-color', btn.currentColor || 'transparent'); colorVal.css('background-color', btn.currentColor || 'transparent');
me.mnuBorderColorPicker = new Common.UI.ThemeColorPalette({ me.mnuBorderColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-bordercolor'), el: $('#id-toolbar-menu-bordercolor')
dynamiccolors: 10,
colors: [
me.textThemeColors, '-', {color: '3366FF', effectId: 1}, {color: '0000FF', effectId: 2}, {color: '000090', effectId: 3}, {color: '660066', effectId: 4}, {color: '800000', effectId: 5},
{color: 'FF0000', effectId: 1}, {color: 'FF6600', effectId: 1}, {color: 'FFFF00', effectId: 2}, {color: 'CCFFCC', effectId: 3}, {color: '008000', effectId: 4},
'-',
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2}, {color: '000000', effectId: 3}, {color: 'FFFFFF', effectId: 4}, {color: '000000', effectId: 5},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1}, {color: 'FFFFFF', effectId: 2},{color: '000000', effectId: 1},
'-', '--', '-', me.textStandartColors, '-',
'3D55FE', '5301B3', '980ABD', 'B2275F', 'F83D26', 'F86A1D', 'F7AC16', 'F7CA12', 'FAFF44', 'D6EF39',
'-', '--'
]
}); });
}); });
...@@ -1579,9 +1522,8 @@ define([ ...@@ -1579,9 +1522,8 @@ define([
JSON.parse(Common.localStorage.getItem('sse-hidden-title')) && (options.title = true); JSON.parse(Common.localStorage.getItem('sse-hidden-title')) && (options.title = true);
JSON.parse(Common.localStorage.getItem('sse-hidden-formula')) && (options.formula = true); JSON.parse(Common.localStorage.getItem('sse-hidden-formula')) && (options.formula = true);
JSON.parse(Common.localStorage.getItem('sse-hidden-headings')) && (options.headings = true); JSON.parse(Common.localStorage.getItem('sse-hidden-headings')) && (options.headings = true);
var isCompactView = mode.isLightVersion || !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact')); var isCompactView = !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact'));
me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
me.mnuitemCompactToolbar.setChecked(isCompactView); me.mnuitemCompactToolbar.setChecked(isCompactView);
me.mnuitemHideTitleBar.setChecked(!!options.title); me.mnuitemHideTitleBar.setChecked(!!options.title);
me.mnuitemHideFormulaBar.setChecked(!!options.formula); me.mnuitemHideFormulaBar.setChecked(!!options.formula);
...@@ -1968,8 +1910,6 @@ define([ ...@@ -1968,8 +1910,6 @@ define([
tipEditChart: 'Edit Chart', tipEditChart: 'Edit Chart',
textPrint: 'Print', textPrint: 'Print',
textPrintOptions: 'Print Options', textPrintOptions: 'Print Options',
textThemeColors: 'Theme Colors',
textStandartColors: 'Standart Colors',
tipColorSchemas: 'Change Color Scheme', tipColorSchemas: 'Change Color Scheme',
tipNewDocument: 'New Document', tipNewDocument: 'New Document',
tipOpenDocument: 'Open Document', tipOpenDocument: 'Open Document',
......
apps/spreadsheeteditor/main/locale/en.json
View file @ a18be3f5
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
"Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All", "Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All",
"Common.UI.SynchronizeTip.textDontShow": "Don't show this message again", "Common.UI.SynchronizeTip.textDontShow": "Don't show this message again",
"Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br/>Please click to save your changes and reload the updates.", "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br/>Please click to save your changes and reload the updates.",
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No", "Common.UI.Window.noButtonText": "No",
...@@ -84,6 +86,8 @@ ...@@ -84,6 +86,8 @@
"Common.Views.OpenDialog.txtSpace": "Space", "Common.Views.OpenDialog.txtSpace": "Space",
"Common.Views.OpenDialog.txtTab": "Tab", "Common.Views.OpenDialog.txtTab": "Tab",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtTitleProtected": "Protected File",
"Common.Views.Plugins.strPlugins": "Add-ons", "Common.Views.Plugins.strPlugins": "Add-ons",
"Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start", "Common.Views.Plugins.textStart": "Start",
...@@ -98,6 +102,8 @@ ...@@ -98,6 +102,8 @@
"SSE.Controllers.DocumentHolder.txtHeight": "Height", "SSE.Controllers.DocumentHolder.txtHeight": "Height",
"SSE.Controllers.DocumentHolder.txtRowHeight": "Row Height", "SSE.Controllers.DocumentHolder.txtRowHeight": "Row Height",
"SSE.Controllers.DocumentHolder.txtWidth": "Width", "SSE.Controllers.DocumentHolder.txtWidth": "Width",
"SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
"SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet",
"SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByColumns": "By columns",
"SSE.Controllers.LeftMenu.textByRows": "By rows", "SSE.Controllers.LeftMenu.textByRows": "By rows",
...@@ -802,11 +808,11 @@ ...@@ -802,11 +808,11 @@
"SSE.Views.ShapeSettings.textPatternFill": "Pattern", "SSE.Views.ShapeSettings.textPatternFill": "Pattern",
"SSE.Views.ShapeSettings.textRadial": "Radial", "SSE.Views.ShapeSettings.textRadial": "Radial",
"SSE.Views.ShapeSettings.textSelectTexture": "Select", "SSE.Views.ShapeSettings.textSelectTexture": "Select",
"SSE.Views.ShapeSettings.textStandartColors": "Standard Colors", "del_SSE.Views.ShapeSettings.textStandartColors": "Standard Colors",
"SSE.Views.ShapeSettings.textStretch": "Stretch", "SSE.Views.ShapeSettings.textStretch": "Stretch",
"SSE.Views.ShapeSettings.textStyle": "Style", "SSE.Views.ShapeSettings.textStyle": "Style",
"SSE.Views.ShapeSettings.textTexture": "From Texture", "SSE.Views.ShapeSettings.textTexture": "From Texture",
"SSE.Views.ShapeSettings.textThemeColors": "Theme Colors", "del_SSE.Views.ShapeSettings.textThemeColors": "Theme Colors",
"SSE.Views.ShapeSettings.textTile": "Tile", "SSE.Views.ShapeSettings.textTile": "Tile",
"SSE.Views.ShapeSettings.txtBrownPaper": "Brown Paper", "SSE.Views.ShapeSettings.txtBrownPaper": "Brown Paper",
"SSE.Views.ShapeSettings.txtCanvas": "Canvas", "SSE.Views.ShapeSettings.txtCanvas": "Canvas",
...@@ -865,9 +871,9 @@ ...@@ -865,9 +871,9 @@
"SSE.Views.Statusbar.textCount": "COUNT", "SSE.Views.Statusbar.textCount": "COUNT",
"SSE.Views.Statusbar.textNewColor": "Add New Custom Color", "SSE.Views.Statusbar.textNewColor": "Add New Custom Color",
"SSE.Views.Statusbar.textNoColor": "No Color", "SSE.Views.Statusbar.textNoColor": "No Color",
"SSE.Views.Statusbar.textStandartColors": "Standard Colors", "del_SSE.Views.Statusbar.textStandartColors": "Standard Colors",
"SSE.Views.Statusbar.textSum": "SUM", "SSE.Views.Statusbar.textSum": "SUM",
"SSE.Views.Statusbar.textThemeColors": "Theme Colors", "del_SSE.Views.Statusbar.textThemeColors": "Theme Colors",
"SSE.Views.Statusbar.tipAccessRights": "Manage document access rights", "SSE.Views.Statusbar.tipAccessRights": "Manage document access rights",
"SSE.Views.Statusbar.tipAddTab": "Add worksheet", "SSE.Views.Statusbar.tipAddTab": "Add worksheet",
"SSE.Views.Statusbar.tipFirst": "Scroll to First Sheet", "SSE.Views.Statusbar.tipFirst": "Scroll to First Sheet",
...@@ -945,12 +951,12 @@ ...@@ -945,12 +951,12 @@
"SSE.Views.TextArtSettings.textPatternFill": "Pattern", "SSE.Views.TextArtSettings.textPatternFill": "Pattern",
"SSE.Views.TextArtSettings.textRadial": "Radial", "SSE.Views.TextArtSettings.textRadial": "Radial",
"SSE.Views.TextArtSettings.textSelectTexture": "Select", "SSE.Views.TextArtSettings.textSelectTexture": "Select",
"SSE.Views.TextArtSettings.textStandartColors": "Standard Colors", "del_SSE.Views.TextArtSettings.textStandartColors": "Standard Colors",
"SSE.Views.TextArtSettings.textStretch": "Stretch", "SSE.Views.TextArtSettings.textStretch": "Stretch",
"SSE.Views.TextArtSettings.textStyle": "Style", "SSE.Views.TextArtSettings.textStyle": "Style",
"SSE.Views.TextArtSettings.textTemplate": "Template", "SSE.Views.TextArtSettings.textTemplate": "Template",
"SSE.Views.TextArtSettings.textTexture": "From Texture", "SSE.Views.TextArtSettings.textTexture": "From Texture",
"SSE.Views.TextArtSettings.textThemeColors": "Theme Colors", "del_SSE.Views.TextArtSettings.textThemeColors": "Theme Colors",
"SSE.Views.TextArtSettings.textTile": "Tile", "SSE.Views.TextArtSettings.textTile": "Tile",
"SSE.Views.TextArtSettings.textTransform": "Transform", "SSE.Views.TextArtSettings.textTransform": "Transform",
"SSE.Views.TextArtSettings.txtBrownPaper": "Brown Paper", "SSE.Views.TextArtSettings.txtBrownPaper": "Brown Paper",
...@@ -1010,8 +1016,8 @@ ...@@ -1010,8 +1016,8 @@
"SSE.Views.Toolbar.textRightBorders": "Right Borders", "SSE.Views.Toolbar.textRightBorders": "Right Borders",
"SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down",
"SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up",
"SSE.Views.Toolbar.textStandartColors": "Standard Colors", "del_SSE.Views.Toolbar.textStandartColors": "Standard Colors",
"SSE.Views.Toolbar.textThemeColors": "Theme Colors", "del_SSE.Views.Toolbar.textThemeColors": "Theme Colors",
"SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textTopBorders": "Top Borders",
"SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textUnderline": "Underline",
"SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.textZoom": "Zoom",
......
apps/spreadsheeteditor/main/locale/ru.json
View file @ a18be3f5
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
"SSE.Views.DocumentHolder.txtClearHyper": "Гиперссылки", "SSE.Views.DocumentHolder.txtClearHyper": "Гиперссылки",
"SSE.Views.DocumentHolder.txtClearText": "Текст", "SSE.Views.DocumentHolder.txtClearText": "Текст",
"SSE.Views.DocumentHolder.txtColumn": "Столбец", "SSE.Views.DocumentHolder.txtColumn": "Столбец",
"SSE.Views.DocumentHolder.txtColumnWidth": "Ширина столбца", "SSE.Views.DocumentHolder.txtColumnWidth": "Задать ширину столбца",
"SSE.Views.DocumentHolder.txtCopy": "Копировать", "SSE.Views.DocumentHolder.txtCopy": "Копировать",
"SSE.Views.DocumentHolder.txtCut": "Вырезать", "SSE.Views.DocumentHolder.txtCut": "Вырезать",
"SSE.Views.DocumentHolder.txtDelete": "Удалить", "SSE.Views.DocumentHolder.txtDelete": "Удалить",
...@@ -479,7 +479,7 @@ ...@@ -479,7 +479,7 @@
"SSE.Views.DocumentHolder.txtPaste": "Вставить", "SSE.Views.DocumentHolder.txtPaste": "Вставить",
"SSE.Views.DocumentHolder.txtReapply": "Применить повторно", "SSE.Views.DocumentHolder.txtReapply": "Применить повторно",
"SSE.Views.DocumentHolder.txtRow": "Строку", "SSE.Views.DocumentHolder.txtRow": "Строку",
"SSE.Views.DocumentHolder.txtRowHeight": "Высота строки", "SSE.Views.DocumentHolder.txtRowHeight": "Задать высоту строки",
"SSE.Views.DocumentHolder.txtSelect": "Выделить", "SSE.Views.DocumentHolder.txtSelect": "Выделить",
"SSE.Views.DocumentHolder.txtShiftDown": "Ячейки со сдвигом вниз", "SSE.Views.DocumentHolder.txtShiftDown": "Ячейки со сдвигом вниз",
"SSE.Views.DocumentHolder.txtShiftLeft": "Ячейки со сдвигом влево", "SSE.Views.DocumentHolder.txtShiftLeft": "Ячейки со сдвигом влево",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7