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

Merge branch 'develop' into hotfix/v4.3.5

Browse source
This commit is contained in:
Julia Radzhabova 2017-06-05 17:09:35 +03:00 committed by GitHub
parent c7a8f9efb8 80025b3516
commit fc82df5efa
471 changed files with 21397 additions and 20129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml Normal file
View file

@ -0,0 +1,10 @@
dist: trusty
language: node_js
node_js:
- '6'
before_install: npm install -g grunt-cli
before_script:
- cd build
script:
- npm install
- grunt --level=ADVANCED

18
apps/api/documents/api.js
View file

@ -328,7 +328,7 @@
if (type && typeof type[1] === 'string') {
if (!_config.document.permissions)
_config.document.permissions = {};
_config.document.permissions.edit = false;
_config.document.permissions.edit = _config.document.permissions.review = false;
_config.editorConfig.canUseHistory = false;
}
@ -411,21 +411,12 @@
});
};
var _showError = function(title, msg) {
_showMessage(title, msg, "error");
};
// severity could be one of: "error", "info" or "warning"
var _showMessage = function(title, msg, severity) {
if (typeof severity !== 'string') {
severity = "info";
}
var _showMessage = function(title, msg) {
msg = msg || title;
_sendCommand({
command: 'showMessage',
data: {
title: title,
msg: msg,
severity: severity
msg: msg
}
});
};
@ -542,7 +533,6 @@
};
return {
showError : _showError,
showMessage : _showMessage,
processSaveResult : _processSaveResult,
processRightsChange : _processRightsChange,

4
apps/common/embed/resources/less/common.less
View file

@ -563,6 +563,10 @@
background-position: 0 -22px;
}
}
a {
cursor: pointer;
}
}
.masked {

4
apps/common/main/lib/component/Button.js
View file

@ -487,12 +487,12 @@ define([
this.caption = caption;
if (this.rendered) {
var captionNode = this.cmpEl.find('button:first > .caption').andSelf().filter('button > .caption');
var captionNode = this.cmpEl.find('button:first > .caption').addBack().filter('button > .caption');
if (captionNode.length > 0) {
captionNode.text(caption);
} else {
this.cmpEl.find('button:first').andSelf().filter('button').text(caption);
this.cmpEl.find('button:first').addBack().filter('button').text(caption);
}
}
}

10
apps/common/main/lib/component/ComboBox.js
View file

@ -188,6 +188,11 @@ define([
title : me.options.hint,
placement : me.options.hintAnchor||'cursor'
});
var modalParents = el.closest('.asc-window');
if (modalParents.length > 0) {
el.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
}
}
el.on('show.bs.dropdown', _.bind(me.onBeforeShowMenu, me));
@ -227,6 +232,7 @@ define([
minScrollbarLength: 40,
scrollYMarginOffset: 30,
includePadding: true,
wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
}, this.options.scroller));
}
@ -251,6 +257,7 @@ define([
minScrollbarLength: 40,
scrollYMarginOffset: 30,
includePadding: true,
wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
}, this.options.scroller));
}
@ -547,7 +554,7 @@ define([
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
'<% }); %>'
].join(''), {
].join(''))({
items: this.store.toJSON(),
scope: this
}));
@ -562,6 +569,7 @@ define([
minScrollbarLength : 40,
scrollYMarginOffset: 30,
includePadding : true,
wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
}, this.options.scroller));
}

3
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -87,6 +87,7 @@ define([
Common.UI.ComboBox.prototype.initialize.call(this, _.extend(options, {
displayField: 'name',
scroller: {
wheelSpeed: 20,
alwaysVisibleY: true,
onChange: this.updateVisibleFontsTiles.bind(this)
}
@ -353,7 +354,7 @@ define([
'<li id="<%= item.id %>">',
'<a class="font-item" tabindex="-1" type="menuitem" style="vertical-align:middle; margin: 0 0 0 -10px; height:<%=scope.getListItemHeight()%>px;"/>',
'</li>'
].join(''), {
].join(''))({
item: item.attributes,
scope: this
}));

12
apps/common/main/lib/component/ComboDataView.js
View file

@ -59,7 +59,8 @@ define([
enableKeyEvents : false,
beforeOpenHandler : null,
additionalMenuItems : null,
showLast: true
showLast: true,
minWidth: -1
},
template: _.template([
@ -86,6 +87,7 @@ define([
this.rootHeight = 0;
this.rendered = false;
this.needFillComboView = false;
this.minWidth = this.options.minWidth;
this.fieldPicker = new Common.UI.DataView({
cls: 'field-picker',
@ -215,6 +217,8 @@ define([
width = this.cmpEl.width(),
height = this.cmpEl.height();
if (width < this.minWidth) return;
if (this.rootWidth != width || this.rootHeight != height) {
this.rootWidth = width;
this.rootHeight = height;
@ -420,7 +424,7 @@ define([
var indexRec = store.indexOf(record),
countRec = store.length,
maxViewCount = Math.floor((fieldPickerEl.width()) / (me.itemWidth + (me.itemMarginLeft || 0) + (me.itemMarginRight || 0) + (me.itemPaddingLeft || 0) + (me.itemPaddingRight || 0) +
maxViewCount = Math.floor(Math.max(fieldPickerEl.width(), me.minWidth) / (me.itemWidth + (me.itemMarginLeft || 0) + (me.itemMarginRight || 0) + (me.itemPaddingLeft || 0) + (me.itemPaddingRight || 0) +
(me.itemBorderLeft || 0) + (me.itemBorderRight || 0))),
newStyles = [];
@ -452,6 +456,10 @@ define([
}
},
clearComboView: function() {
this.fieldPicker.store.reset([]);
},
selectByIndex: function(index) {
if (index < 0)
this.fieldPicker.deselectAll();

16
apps/common/main/lib/component/DataView.js
View file

@ -297,7 +297,7 @@ define([
if (_.isUndefined(this.scroller) && this.allowScrollbar) {
this.scroller = new Common.UI.Scroller({
el: $(this.el).find('.inner').andSelf().filter('.inner'),
el: $(this.el).find('.inner').addBack().filter('.inner'),
useKeyboard: this.enableKeyEvents && !this.handleSelect,
minScrollbarLength : 40,
wheelSpeed: 10
@ -394,7 +394,7 @@ define([
});
if (view) {
var innerEl = $(this.el).find('.inner').andSelf().filter('.inner');
var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
if (this.groups && this.groups.length > 0) {
var group = this.groups.findWhere({id: record.get('group')});
@ -452,7 +452,7 @@ define([
}
if (this.store.length < 1 && this.emptyText.length > 0)
$(this.el).find('.inner').andSelf().filter('.inner').append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
$(this.el).find('.inner').addBack().filter('.inner').append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
_.each(this.dataViewItems, function(item) {
this.stopListening(item);
@ -464,7 +464,7 @@ define([
if (this.allowScrollbar) {
this.scroller = new Common.UI.Scroller({
el: $(this.el).find('.inner').andSelf().filter('.inner'),
el: $(this.el).find('.inner').addBack().filter('.inner'),
useKeyboard: this.enableKeyEvents && !this.handleSelect,
minScrollbarLength : 40,
wheelSpeed: 10
@ -487,7 +487,7 @@ define([
view.stopListening();
if (this.store.length < 1 && this.emptyText.length > 0) {
var el = $(this.el).find('.inner').andSelf().filter('.inner');
var el = $(this.el).find('.inner').addBack().filter('.inner');
if ( el.find('.empty-text').length<=0 )
el.append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
}
@ -653,7 +653,7 @@ define([
attachKeyEvents: function() {
if (this.enableKeyEvents && this.handleSelect) {
var el = $(this.el).find('.inner').andSelf().filter('.inner');
var el = $(this.el).find('.inner').addBack().filter('.inner');
el.addClass('canfocused');
el.attr('tabindex', '0');
el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keydown' : 'keydown', _.bind(this.onKeyDown, this));
@ -673,7 +673,7 @@ define([
setDisabled: function(disabled) {
this.disabled = disabled;
$(this.el).find('.inner').andSelf().filter('.inner').toggleClass('disabled', disabled);
$(this.el).find('.inner').addBack().filter('.inner').toggleClass('disabled', disabled);
},
isDisabled: function() {
@ -688,7 +688,7 @@ define([
var menuRoot = (this.parentMenu.cmpEl.attr('role') === 'menu')
? this.parentMenu.cmpEl
: this.parentMenu.cmpEl.find('[role=menu]'),
innerEl = $(this.el).find('.inner').andSelf().filter('.inner'),
innerEl = $(this.el).find('.inner').addBack().filter('.inner'),
docH = Common.Utils.innerHeight(),
menuH = menuRoot.outerHeight(),
top = parseInt(menuRoot.css('top'));

2
apps/common/main/lib/component/InputField.js
View file

@ -150,7 +150,7 @@ define([
if (!me.rendered) {
var el = this.cmpEl;
this._input = this.cmpEl.find('input').andSelf().filter('input');
this._input = this.cmpEl.find('input').addBack().filter('input');
if (this.editable) {
this._input.on('blur', _.bind(this.onInputChanged, this));

1
apps/common/main/lib/component/Menu.js
View file

@ -405,6 +405,7 @@ define([
item.off('click').off('toggle');
item.remove();
});
this.rendered && this.cmpEl.find('.menu-scroll').off('click').remove();
me.items = [];
},

12
apps/common/main/lib/component/MultiSliderGradient.js
View file

@ -150,6 +150,18 @@ define([
}
style = Common.Utils.String.format('linear-gradient(to right, {0} {1}%, {2} {3}%)', this.colorValues[0], this.getValue(0), this.colorValues[1], this.getValue(1));
this.trackEl.css('background', style);
},
sortThumbs: function() {
var recalc_indexes = Common.UI.MultiSlider.prototype.sortThumbs.call(this),
new_colors = [],
me = this;
_.each (recalc_indexes, function(recalc_index) {
new_colors.push(me.colorValues[recalc_index]);
});
this.colorValues = new_colors;
this.trigger('sortthumbs', me, recalc_indexes);
return recalc_indexes;
}
});
});

38
apps/common/main/lib/component/Slider.js
View file

@ -338,16 +338,21 @@ define([
e.preventDefault();
e.stopPropagation();
var index = e.data,
var index = e.data.index,
lastValue = me.thumbs[index].value,
minValue = (index-1<0) ? 0 : me.thumbs[index-1].position,
maxValue = (index+1<me.thumbs.length) ? me.thumbs[index+1].position : 100,
pos = Math.max(minValue, Math.min(maxValue, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100)))),
position = Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100),
need_sort = position < minValue || position > maxValue,
pos = Math.max(0, Math.min(100, position)),
value = pos/me.delta + me.minValue;
me.setThumbPosition(index, pos);
me.thumbs[index].value = value;
if (need_sort)
me.sortThumbs();
$(document).off('mouseup', onMouseUp);
$(document).off('mousemove', onMouseMove);
@ -362,16 +367,21 @@ define([
e.preventDefault();
e.stopPropagation();
var index = e.data,
var index = e.data.index,
lastValue = me.thumbs[index].value,
minValue = (index-1<0) ? 0 : me.thumbs[index-1].position,
maxValue = (index+1<me.thumbs.length) ? me.thumbs[index+1].position : 100,
pos = Math.max(minValue, Math.min(maxValue, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100)))),
position = Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100),
need_sort = position < minValue || position > maxValue,
pos = Math.max(0, Math.min(100, position)),
value = pos/me.delta + me.minValue;
me.setThumbPosition(index, pos);
me.thumbs[index].value = value;
if (need_sort)
me.sortThumbs();
if (Math.abs(value-lastValue)>0.001)
me.trigger('change', me, value, lastValue);
};
@ -379,7 +389,7 @@ define([
var onMouseDown = function (e) {
if ( me.disabled ) return;
var index = e.data,
var index = e.data.index,
thumb = me.thumbs[index].thumb;
me._dragstart = e.pageX*Common.Utils.zoom() - thumb.offset().left - thumb.width()/2;
@ -389,8 +399,8 @@ define([
(index == idx) ? item.thumb.css('z-index', 500) : item.thumb.css('z-index', '');
});
$(document).on('mouseup', null, index, onMouseUp);
$(document).on('mousemove', null, index, onMouseMove);
$(document).on('mouseup', null, e.data, onMouseUp);
$(document).on('mousemove', null, e.data, onMouseMove);
};
var onTrackMouseDown = function (e) {
@ -441,7 +451,7 @@ define([
index: index
});
me.setValue(index, me.options.values[index]);
thumb.on('mousedown', null, index, onMouseDown);
thumb.on('mousedown', null, me.thumbs[index], onMouseDown);
});
me.setActiveThumb(0, true);
@ -489,6 +499,18 @@ define([
if (disabled !== this.disabled)
this.cmpEl.toggleClass('disabled', disabled);
this.disabled = disabled;
},
sortThumbs: function() {
this.thumbs.sort(function(a, b) {
return (a.position - b.position);
});
var recalc_indexes = [];
_.each (this.thumbs, function(thumb, index) {
recalc_indexes.push(thumb.index);
thumb.index = index;
});
return recalc_indexes;
}
});
});

19
apps/common/main/lib/component/Window.js
View file

@ -421,7 +421,7 @@ define([
_.extend(options, {
cls: 'alert',
onprimary: onKeyDown,
tpl: _.template(template, options)
tpl: _.template(template)(options)
});
var win = new Common.UI.Window(options),
@ -433,7 +433,8 @@ define([
var footer = window.getChild('.footer');
var header = window.getChild('.header');
var body = window.getChild('.body');
var icon = window.getChild('.icon');
var icon = window.getChild('.icon'),
icon_height = (icon.length>0) ? icon.height() : 0;
var check = window.getChild('.info-box .dont-show-checkbox');
if (!options.dontshow) body.css('padding-bottom', '10px');
@ -443,19 +444,19 @@ define([
options.width = options.maxwidth;
}
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')));
window.setSize(text.position().left + text.width() + parseInt(text_cnt.css('padding-right')),
parseInt(body.css('height')) + parseInt(header.css('height')));
} else {
text.css('white-space', 'normal');
window.setWidth(options.width);
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')));
window.setHeight(parseInt(body.css('height')) + parseInt(header.css('height')));
}
if (text.height() < icon.height()-10)
text.css({'vertical-align': 'baseline', 'line-height': icon.height()+'px'});
if (text.height() < icon_height-10)
text.css({'vertical-align': 'baseline', 'line-height': icon_height+'px'});
}
function onBtnClick(event) {
@ -556,7 +557,7 @@ define([
render : function() {
var renderto = this.initConfig.renderTo || document.body;
$(renderto).append(
_.template(template, this.initConfig)
_.template(template)(this.initConfig)
);
this.$window = $('#' + this.initConfig.id);
@ -695,7 +696,7 @@ define([
hide_mask = true;
mask.attr('counter', parseInt(mask.attr('counter'))-1);
if (this.$lastmodal.size() > 0) {
if (this.$lastmodal.length > 0) {
this.$lastmodal.removeClass('dethrone');
hide_mask = !(this.$lastmodal.hasClass('modal') && this.$lastmodal.is(':visible'));
}
@ -736,7 +737,7 @@ define([
hide_mask = true;
mask.attr('counter', parseInt(mask.attr('counter'))-1);
if (this.$lastmodal.size() > 0) {
if (this.$lastmodal.length > 0) {
this.$lastmodal.removeClass('dethrone');
hide_mask = !(this.$lastmodal.hasClass('modal') && this.$lastmodal.is(':visible'));
}

4
apps/common/main/lib/controller/Comments.js
View file

@ -211,8 +211,8 @@ define([
ascComment.asc_putText(comment.get('comment'));
ascComment.asc_putQuoteText(comment.get('quote'));
ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time'))));
ascComment.asc_putUserId(t.currentUserId);
ascComment.asc_putUserName(t.currentUserName);
ascComment.asc_putUserId(comment.get('userid'));
ascComment.asc_putUserName(comment.get('username'));
ascComment.asc_putSolved(!comment.get('resolved'));
if (!_.isUndefined(ascComment.asc_putDocumentFlag)) {

7
apps/common/main/lib/extend/Bootstrap.js
View file

@ -81,8 +81,8 @@ function patchDropDownKeyDown(e) {
if (!isActive || (isActive && e.keyCode == 27)) {
if (e.which == 27) {
$items = $('[role=menu] li.dropdown-submenu.over:visible', $parent);
if ($items.size()) {
$items.eq($items.size()-1).removeClass('over');
if ($items.length) {
$items.eq($items.length-1).removeClass('over');
return false;
} else if ($parent.hasClass('dropdown-submenu') && $parent.hasClass('over')) {
$parent.removeClass('over');
@ -110,6 +110,7 @@ function patchDropDownKeyDown(e) {
_.delay(function() {
var mnu = $('> [role=menu]', li),
$subitems = mnu.find('> li:not(.divider):not(.disabled):visible > a'),
$dataviews = mnu.find('> li:not(.divider):not(.disabled):visible .dataview'),
focusIdx = 0;
if (mnu.find('> .menu-scroll').length>0) {
var offset = mnu.scrollTop();
@ -119,7 +120,7 @@ function patchDropDownKeyDown(e) {
}
}
}
if ($subitems.length>0)
if ($subitems.length>0 && $dataviews.length<1)
$subitems.eq(focusIdx).focus();
}, 250);
}

72
apps/common/main/lib/util/LanguageInfo.js
View file

@ -142,6 +142,8 @@ Common.util.LanguageInfo = new(function() {
0x0809 : ["en-GB", "English (United Kingdom)"],
0x0409 : ["en-US", "English (United States)"],
0x3009 : ["en-ZW", "English (Zimbabwe)"],
0x3c09 : ["en-HK", "English (Hong Kong)"],
0x3809 : ["en-ID", "English (Indonesia)"],
0x0025 : ["et", "Eesti"],
0x0425 : ["et-EE", "Eesti (Eesti)"],
0x0038 : ["fo", "Føroyskt"],
@ -157,6 +159,15 @@ Common.util.LanguageInfo = new(function() {
0x140C : ["fr-LU", "Français (Luxembourg)"],
0x180C : ["fr-MC", "Français (Principauté de Monaco)"],
0x100C : ["fr-CH", "Français (Suisse)"],
0x3c0c : ["fr-HT", "French (Haiti)"],
0x240c : ["fr-CG", "French (Congo)"],
0x300c : ["fr-CI", "French (Cote d'Ivoire)"],
0x2c0c : ["fr-CM", "French (Cameroon)"],
0x380c : ["fr-MA", "French (Morocco)"],
0x340c : ["fr-ML", "French (Mali)"],
0x200c : ["fr-RE", "French (Reunion)"],
0x280c : ["fr-SN", "French (Senegal)"],
0x1c0c : ["fr-West", "French"],
0x0062 : ["fy", "Frysk"],
0x0462 : ["fy-NL", "Frysk (Nederlân)"],
0x0056 : ["gl", "Galego"],
@ -284,10 +295,12 @@ Common.util.LanguageInfo = new(function() {
0x0C6B : ["quz-PE", "Runasimi (Piruw)"],
0x0018 : ["ro", "Română"],
0x0418 : ["ro-RO", "Română (România)"],
0x0818 : ["ro-MD", "Română (Moldova)"],
0x0017 : ["rm", "Rumantsch"],
0x0417 : ["rm-CH", "Rumantsch (Svizra)"],
0x0019 : ["ru", "Русский"],
0x0419 : ["ru-RU", "Русский (Россия)"],
0x0819 : ["ru-MD", "Русский (Молдавия)"],
0x703B : ["smn", "Sämikielâ"],
0x7C3B : ["smj", "Julevusámegiella"],
0x003B : ["se", "Davvisámegiella"],
@ -348,6 +361,7 @@ Common.util.LanguageInfo = new(function() {
0x540A : ["es-US", "Español (Estados Unidos)"],
0x380A : ["es-UY", "Español (Uruguay)"],
0x200A : ["es-VE", "Español (Republica Bolivariana de Venezuela)"],
0x040a : ["es-ES_tradnl", "Spanish"],
0x001D : ["sv", "Svenska"],
0x081D : ["sv-FI", "Svenska (Finland)"],
0x041D : ["sv-SE", "Svenska (Sverige)"],
@ -398,45 +412,31 @@ Common.util.LanguageInfo = new(function() {
0x0478 : ["ii-CN", "ꆈꌠꁱꂷ (ꍏꉸꏓꂱꇭꉼꇩ)"],
0x006A : ["yo", "Yoruba"],
0x046A : ["yo-NG", "Yoruba (Nigeria)"],
0x0851 : ["bo-BT", "Tibetan, Bhutan"],
0x0466 : ["bin-NG", "Bini, Nigeria"],
0x045c : ["chr-US", "Cherokee, United States"],
0x3c09 : ["en-HK", "English, Hong Kong"],
0x3809 : ["en-ID", "English, Indonesia"],
0x040a : ["es-ES_tradnl", "Spanish"],
0x3c0c : ["fr-HT", "French, Haiti"],
0x240c : ["fr-CG", "French, Congo"],
0x300c : ["fr-CI", "French, Cote d'Ivoire"],
0x2c0c : ["fr-CM", "French, Cameroon"],
0x380c : ["fr-MA", "French, Morocco"],
0x340c : ["fr-ML", "French, Mali"],
0x200c : ["fr-RE", "French, Reunion"],
0x280c : ["fr-SN", "French, Senegal"],
0x1c0c : ["fr-West", "French"],
0x0467 : ["fuv-NG", "Nigerian Fulfulde, Nigeria"],
0x0472 : ["gaz-ET", "West Central Oromo, Ethiopia"],
0x0474 : ["gn-PY", "Guarani, Paraguay"],
0x0475 : ["haw-US", "Hawaiian, UnitedStates"],
0x0469 : ["ibb-NG", "Ibibio, Nigeria"],
0x0471 : ["kr-NG", "Kanuri, Nigeria"],
0x0851 : ["bo-BT", "Tibetan (Bhutan)"],
0x0466 : ["bin-NG", "Bini (Nigeria)"],
0x045c : ["chr-US", "Cherokee (United States)"],
0x0467 : ["fuv-NG", "Nigerian Fulfulde (Nigeria)"],
0x0472 : ["gaz-ET", "West Central Oromo (Ethiopia)"],
0x0474 : ["gn-PY", "Guarani (Paraguay)"],
0x0475 : ["haw-US", "Hawaiian (United States)"],
0x0469 : ["ibb-NG", "Ibibio (Nigeria)"],
0x0471 : ["kr-NG", "Kanuri (Nigeria)"],
0x0458 : ["mni", "Manipuri"],
0x0455 : ["my-MM", "Burmese, Myanmar"],
0x0861 : ["ne-IN", "Nepali, India"],
0x0455 : ["my-MM", "Burmese (Myanmar)"],
0x0861 : ["ne-IN", "Nepali (India)"],
0x0479 : ["pap-AN", "Papiamento, Netherlands Antilles"],
0x0846 : ["pa-PK", "Panjabi, Pakistan"],
0x048d : ["plt-MG", "Plateau Malagasy, Madagascar"],
0x0818 : ["ro-MO", "Romanian, Macao"],
0x0819 : ["ru-MO", "Russian, Macao"],
0x0459 : ["sd-IN", "Sindhi, India"],
0x0859 : ["sd-PK", "Sindhi, Pakistan"],
0x0477 : ["so-SO", "Somali, Somalia"],
0x0430 : ["st-ZA", "Southern Sotho, South Africa"],
0x0473 : ["ti-ER", "Tigrinya, Eritrea"],
0x0873 : ["ti-ET", "Tigrinya, Ethiopia"],
0x0846 : ["pa-PK", "Panjabi (Pakistan)"],
0x048d : ["plt-MG", "Plateau Malagasy (Madagascar)"],
0x0459 : ["sd-IN", "Sindhi (India)"],
0x0859 : ["sd-PK", "Sindhi (Pakistan)"],
0x0477 : ["so-SO", "Somali (Somalia)"],
0x0430 : ["st-ZA", "Southern Sotho (South Africa)"],
0x0473 : ["ti-ER", "Tigrinya (Eritrea)"],
0x0873 : ["ti-ET", "Tigrinya (Ethiopia)"],
0x045f : ["tmz", "Tamanaku"],
0x0c5f : ["tmz-MA", "Tamanaku, Morocco"],
0x0431 : ["ts-ZA", "Tsonga, South Africa"],
0x0820 : ["ur-IN", "Urdu, India"],
0x0c5f : ["tmz-MA", "Tamanaku (Morocco)"],
0x0431 : ["ts-ZA", "Tsonga (South Africa)"],
0x0820 : ["ur-IN", "Urdu (India)"],
0x0433 : ["ven-ZA", "South Africa"]
};

7
apps/common/main/lib/util/LocalStorage.js
View file

@ -63,7 +63,12 @@ define(['gateway'], function () {
var _setItem = function(name, value, just) {
if (_lsAllowed) {
localStorage.setItem(name, value);
try
{
localStorage.setItem(name, value);
}
catch (error){}
} else {
_store[name] = value;

7
apps/common/main/lib/view/AdvancedSettingsWindow.js
View file

@ -71,7 +71,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this.toggleGroup = _options.toggleGroup;
@ -102,9 +102,10 @@ define([
btn.on('click', _.bind(me.onCategoryClick, me));
me.btnsCategory.push(btn);
});
var cnt_panel = $window.find('.content-panel');
var cnt_panel = $window.find('.content-panel'),
menu_panel = $window.find('.menu-panel');
cnt_panel.width(this.contentWidth);
$window.width($window.find('.menu-panel').width() + cnt_panel.outerWidth() + 2);
$window.width(((menu_panel.length>0) ? menu_panel.width() : 0) + cnt_panel.outerWidth() + 2);
this.content_panels = $window.find('.settings-panel');
if (this.btnsCategory.length>0)

8
apps/common/main/lib/view/Chat.js
View file

@ -67,7 +67,7 @@ define([
templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -82,7 +82,7 @@ define([
templateMsgList: _.template('<ul>' +
'<% _.each(messages, function(item) { %>' +
'<%= _.template(msgtpl, {msg: item, scope: scope}) %>' +
'<%= _.template(msgtpl)({msg: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -162,7 +162,7 @@ define([
_onAddUser: function(m, c, opts) {
if (this.panelUsers) {
this.panelUsers.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
this.panelUsers.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsers.scroller.update({minScrollbarLength : 25, alwaysVisibleY: true});
}
},
@ -186,7 +186,7 @@ define([
var content = this.panelMessages.find('ul');
if (content && content.length) {
this._prepareMessage(m);
content.append(_.template(this.tplMsg, {msg: m, scope: this}));
content.append(_.template(this.tplMsg)({msg: m, scope: this}));
// scroll to end

2
apps/common/main/lib/view/Comments.js
View file

@ -98,7 +98,7 @@ define([
this.store = options.store;
this.delegate = options.delegate;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.arrow = {margin: 20, width: 12, height: 34};
this.sdkBounds = {width: 0, height: 0, padding: 10, paddingTop: 20};

2
apps/common/main/lib/view/CopyWarningDialog.js
View file

@ -83,7 +83,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

4
apps/common/main/lib/view/DocumentAccessDialog.js
View file

@ -48,7 +48,7 @@ define([
var _options = {};
_.extend(_options, {
title: this.textTitle,
width: 850,
width: 600,
height: 536,
header: true
}, options);
@ -57,7 +57,7 @@ define([
'<div id="id-sharing-placeholder"></div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.settingsurl = options.settingsurl || '';
Common.UI.Window.prototype.initialize.call(this, _options);

2
apps/common/main/lib/view/ExternalDiagramEditor.js
View file

@ -66,7 +66,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._chartData = null;

2
apps/common/main/lib/view/ExternalMergeEditor.js
View file

@ -66,7 +66,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._mergeData = null;

2
apps/common/main/lib/view/ImageFromUrlDialog.js
View file

@ -65,7 +65,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

2
apps/common/main/lib/view/InsertTableDialog.js
View file

@ -73,7 +73,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

143
apps/common/main/lib/view/LanguageDialog.js Normal file
View file

@ -0,0 +1,143 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* LanguageDialog.js
*
* Created by Julia Radzhabova on 04/25/2017
* Copyright (c) 2017 Ascensio System SIA. All rights reserved.
*
*/
if (Common === undefined)
var Common = {};
define([
'common/main/lib/component/Window'
], function () { 'use strict';
Common.Views.LanguageDialog = Common.UI.Window.extend(_.extend({
options: {
header: false,
width: 350,
cls: 'modal-dlg'
},
template: '<div class="box">' +
'<div class="input-row">' +
'<label><%= label %></label>' +
'</div>' +
'<div class="input-row" id="id-document-language">' +
'</div>' +
'</div>' +
'<div class="footer right">' +
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;"><%= btns.ok %></button>'+
'<button class="btn normal dlg-btn" result="cancel"><%= btns.cancel %></button>'+
'</div>',
initialize : function(options) {
_.extend(this.options, options || {}, {
label: this.labelSelect,
btns: {ok: this.btnOk, cancel: this.btnCancel}
});
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
var $window = this.getChild();
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.cmbLanguage = new Common.UI.ComboBox({
el: $window.find('#id-document-language'),
cls: 'input-group-nr',
menuStyle: 'min-width: 318px; max-height: 300px;',
editable: false,
template: _.template([
'<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control">',
'<span class="input-lang-icon lang-flag" style="position: absolute;"></span>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>">',
'<a tabindex="-1" type="menuitem" style="padding-left: 26px !important;">',
'<span class="lang-item-icon lang-flag <%= item.value %>" style="position: absolute;margin-left:-21px;"></span>',
'<%= scope.getDisplayValue(item) %>',
'</a>',
'</li>',
'<% }); %>',
'</ul>',
'</span>'
].join('')),
data: this.options.languages
});
if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true});
this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this));
this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]);
this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord());
},
close: function(suppressevent) {
var $window = this.getChild();
if (!$window.find('.combobox.open').length) {
Common.UI.Window.prototype.close.call(this, arguments);
}
},
onBtnClick: function(event) {
if (this.options.handler) {
this.options.handler.call(this, event.currentTarget.attributes['result'].value, this.cmbLanguage.getValue());
}
this.close();
},
onLangSelect: function(cmb, rec, e) {
var icon = cmb.$el.find('.input-lang-icon'),
plang = icon.attr('lang');
if (plang) icon.removeClass(plang);
icon.addClass(rec.value).attr('lang',rec.value);
},
labelSelect : 'Select document language',
btnCancel : 'Cancel',
btnOk : 'Ok'
}, Common.Views.LanguageDialog || {}))
});

36
apps/common/main/lib/view/OpenDialog.js
View file

@ -76,7 +76,10 @@ define([
'<div id="id-codepages-combo" class="input-group-nr" style="margin-bottom:15px;"></div>',
'<% if (type == Asc.c_oAscAdvancedOptionsID.CSV) { %>',
'<label class="header">' + t.txtDelimiter + '</label>',
'<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 110px;"></div>',
'<div>',
'<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 110px;display: inline-block; vertical-align: middle;"></div>',
'<div id="id-delimiter-other" class="input-row" style="display: inline-block; vertical-align: middle;margin-left: 10px;"></div>',
'</div>',
'<% } %>',
'<% } %>',
'</div>',
@ -93,7 +96,7 @@ define([
this.codepages = options.codepages;
this.settings = options.settings;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
Common.UI.Window.prototype.initialize.call(this, _options);
},
@ -135,9 +138,12 @@ define([
onBtnClick: function (event) {
if (this.handler) {
if (this.cmbEncoding)
this.handler.call(this, this.cmbEncoding.getValue(), this.cmbDelimiter ? this.cmbDelimiter.getValue() : null);
else
if (this.cmbEncoding) {
var delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
(delimiter == -1) && (delimiter = null);
this.handler.call(this, this.cmbEncoding.getValue(), delimiter, delimiterChar);
} else
this.handler.call(this, this.inputPwd.getValue());
}
@ -337,14 +343,29 @@ define([
{value: 2, displayValue: ';'},
{value: 3, displayValue: ':'},
{value: 1, displayValue: this.txtTab},
{value: 5, displayValue: this.txtSpace}],
{value: 5, displayValue: this.txtSpace},
{value: -1, displayValue: this.txtOther}],
editable: false
});
this.cmbDelimiter.setValue( (this.settings && this.settings.asc_getDelimiter()) ? this.settings.asc_getDelimiter() : 4);
this.cmbDelimiter.on('selected', _.bind(this.onCmbDelimiterSelect, this));
this.inputDelimiter = new Common.UI.InputField({
el : $('#id-delimiter-other'),
style : 'width: 30px;',
maxLength: 1,
value: (this.settings && this.settings.asc_getDelimiterChar()) ? this.settings.asc_getDelimiterChar() : ''
});
this.inputDelimiter.setVisible(false);
}
}
},
onCmbDelimiterSelect: function(combo, record){
this.inputDelimiter.setVisible(record.value == -1);
},
okButtonText : "OK",
cancelButtonText : "Cancel",
txtDelimiter : "Delimiter",
@ -353,7 +374,8 @@ define([
txtTab : "Tab",
txtTitle : "Choose %1 options",
txtPassword : "Password",
txtTitleProtected : "Protected File"
txtTitleProtected : "Protected File",
txtOther: 'Other'
}, Common.Views.OpenDialog || {}));
});

2
apps/common/main/lib/view/Plugins.js
View file

@ -225,7 +225,7 @@ define([
'<% } %>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.url = options.url || '';
Common.UI.Window.prototype.initialize.call(this, _options);

2
apps/common/main/lib/view/RenameDialog.js
View file

@ -66,7 +66,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

4
apps/common/main/lib/view/ReviewChanges.js
View file

@ -80,7 +80,7 @@ define([
this.store = options.store;
this.delegate = options.delegate;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.arrow = {margin: 20, width: 12, height: 34};
this.sdkBounds = {width: 0, height: 0, padding: 10, paddingTop: 20};
@ -441,7 +441,7 @@ define([
var el = $(this.el),
me = this;
el.addClass('review-changes');
el.html(_.template(this.template, {
el.html(_.template(this.template)({
scope: this
}));

2
apps/common/main/lib/view/SearchDialog.js
View file

@ -105,7 +105,7 @@
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

BIN
apps/common/main/resources/img/controls/flags.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
apps/common/main/resources/img/controls/flags@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

16
apps/common/main/resources/less/asc-mixins.less
View file

@ -178,4 +178,20 @@
background-image: data-uri(%("%s",'@{common-image-path}/hsbcolorpicker/hsb-colorpicker@2x.png'));
background-size: @img-colorpicker-width auto;
}
}
@img-flags-width: 48px;
.lang-flag {
width: 16px;
height: 12px;
background-image: data-uri(%("%s",'@{common-image-path}/controls/flags.png'));
background-repeat: no-repeat;
@media
only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min-resolution: 2dppx),
only screen and (min-resolution: 192dpi) {
background-image: data-uri(%("%s",'@{common-image-path}/controls/flags@2x.png'));
background-size: @img-flags-width auto;
}
}

67
apps/common/main/resources/less/language-dialog.less Normal file
View file

@ -0,0 +1,67 @@
.combo-langs {
.dropdown-menu {
li .lang-item-icon {
margin-top: 1px;
}
}
.input-lang-icon {
position: absolute;
left: 5px;
top: 5px;
}
input {
padding-left: 25px !important;
}
}
.lang-flag {
background-position: -16px -108px;
&.ca, &.ca-ES {background-position: 0 0;}
&.cs, &.cs-CZ {background-position: -16px 0;}
&.da, &.da-DK {background-position: -32px 0;}
&.de, &.de-DE {background-position: 0 -12px;}
&.el, &.el-GR {background-position: -16px -12px;}
&.en, &.en-US {background-position: -32px -12px;}
&.fr, &.fr-FR {background-position: 0 -24px;}
&.hu, &.hu-HU {background-position: -16px -24px;}
&.it, &.it-IT {background-position: -32px -24px;}
&.ko, &.ko-KR {background-position: 0 -36px;}
&.nl, &.nl-NL {background-position: -16px -36px;}
&.nb, &.nb-NO {background-position: -32px -36px;}
&.pl, &.pl-PL {background-position: 0 -48px;}
&.pt, &.pt-BR {background-position: -16px -48px;}
&.ro, &.ro-RO {background-position: -32px -48px;}
&.ru, &.ru-RU {background-position: 0 -60px;}
&.sv, &.sv-SE {background-position: -32px -60px;}
&.tr, &.tr-TR {background-position: 0 -72px;}
&.uk, &.uk-UA {background-position: -16px -72px;}
&.lv, &.lv-LV {background-position: -32px -72px;}
&.lt, &.lt-LT {background-position: 0 -84px;}
&.vi, &.vi-VN {background-position: -16px -84px;}
&.de-CH {background-position: -32px -84px;}
&.nn, &.nn-NO {background-position: 0 -96px;}
&.pt-PT {background-position: -16px -96px;}
&.de-AT {background-position: -32px -96px;}
&.es, &.es-ES {background-position: 0 -108px;}
&.en-GB {background-position: -32px -108px;}
&.en-AU {background-position: 0 -120px;}
&.az-Latn-AZ {background-position: -16px -120px;}
&.id, &.id-ID {background-position: -32px -120px;}
&.bg, &.bg-BG {background-position: 0 -132px;}
&.ca-ES-valencia {background-position: -16px -132px;}
&.en-CA {background-position: -32px -132px;}
&.en-ZA {background-position: 0 -144px;}
&.eu, &.eu-ES {background-position: -16px -144px;}
&.gl, &.gl-ES {background-position: -32px -144px;}
&.hr, &.hr-HR {background-position: 0 -156px;}
&.lb, &.lb-LU {background-position: -16px -156px;}
&.mn, &.mn-MN {background-position: -32px -156px;}
&.sl, &.sl-SI {background-position: 0 -168px;}
&.sr, &.sr-Cyrl-RS, &.sr-Latn-RS {background-position: -16px -168px;}
&.sk, &.sk-SK {background-position: -32px -168px;}
&.kk, &.kk-KZ {background-position: 0 -180px;}
}

3
apps/documenteditor/embed/index.html
View file

@ -321,9 +321,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>

3
apps/documenteditor/embed/index.html.deploy
View file

@ -312,9 +312,6 @@
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
<!--sdk-->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>

8
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -402,14 +402,14 @@ var ApplicationController = new(function(){
Common.Analytics.trackEvent('Internal Error', id.toString());
}
function onExternalError(error) {
function onExternalMessage(error) {
if (error) {
hidePreloader();
$('#id-error-mask-title').text(error.title);
$('#id-error-mask-title').text('Error');
$('#id-error-mask-text').text(error.msg);
$('#id-error-mask').css('display', 'block');
Common.Analytics.trackEvent('External Error', error.title);
Common.Analytics.trackEvent('External Error');
}
}
@ -497,7 +497,7 @@ var ApplicationController = new(function(){
// Initialize api gateway
Common.Gateway.on('init', loadConfig);
Common.Gateway.on('opendocument', loadDocument);
Common.Gateway.on('showerror', onExternalError);
Common.Gateway.on('showmessage', onExternalMessage);
Common.Gateway.ready();
}

8
apps/documenteditor/embed/js/ApplicationView.js
View file

@ -41,10 +41,10 @@ var ApplicationView = new(function(){
$btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
$btnTools.parent().append(
'<ul class="dropdown-menu">' +
'<li><a id="idt-download" href="#"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
'<li><a id="idt-share" href="#" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
'<li><a id="idt-embed" href="#" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
'<li><a id="idt-fullscreen" href="#"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
'<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
'<li><a id="idt-share" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
'<li><a id="idt-embed" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
'<li><a id="idt-fullscreen"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
'</ul>');
}

4
apps/documenteditor/main/app.js
View file

@ -56,7 +56,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
@ -112,8 +111,7 @@ require.config({
'xregexp',
'sockjs',
'jszip',
'jsziputils',
'jsrsasign'
'jsziputils'
]
},
gateway: {

12
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -302,7 +302,8 @@ define([
}
value = Common.localStorage.getItem("de-settings-livecomment");
(!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments() : this.api.asc_hideComments();
var resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
(!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments();
/** coauthoring end **/
value = Common.localStorage.getItem("de-settings-fontrender");
@ -498,9 +499,12 @@ define([
},
commentsShowHide: function(mode) {
var value = Common.localStorage.getItem("de-settings-livecomment");
if (value !== null && 0 === parseInt(value)) {
(mode === 'show') ? this.api.asc_showComments() : this.api.asc_hideComments();
var value = Common.localStorage.getItem("de-settings-livecomment"),
resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
value = (value!==null && parseInt(value) == 0);
resolved = (resolved!==null && parseInt(resolved) == 0);
if (value || resolved) {
(mode === 'show') ? this.api.asc_showComments(true) : ((!value) ? this.api.asc_showComments(!resolved) : this.api.asc_hideComments());
}
if (mode === 'show') {

53
apps/documenteditor/main/app/controller/Main.js
View file

@ -105,7 +105,7 @@ define([
});
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
this.languages = null;
// Initialize viewport
if (!Common.Utils.isBrowserSupported()){
@ -141,6 +141,8 @@ define([
this.api.asc_registerCallback('asc_onDocumentName', _.bind(this.onDocumentName, this));
this.api.asc_registerCallback('asc_onPrintUrl', _.bind(this.onPrintUrl, this));
this.api.asc_registerCallback('asc_onMeta', _.bind(this.onMeta, this));
this.api.asc_registerCallback('asc_onSpellCheckInit', _.bind(this.loadLanguages, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
Common.NotificationCenter.on('goback', _.bind(this.goBack, this));
@ -202,13 +204,13 @@ define([
me.api.asc_enableKeyEvents(false);
},
'modal:close': function(dlg) {
if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
me.isModalShowed = false;
me.api.asc_enableKeyEvents(true);
}
},
'modal:hide': function(dlg) {
if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
me.isModalShowed = false;
me.api.asc_enableKeyEvents(true);
}
@ -231,6 +233,15 @@ define([
});
this.initNames(); //for shapes
Common.util.Shortcuts.delegateShortcuts({
shortcuts: {
'command+s,ctrl+s': _.bind(function (e) {
e.preventDefault();
e.stopPropagation();
}, this)
}
});
}
},
@ -734,7 +745,8 @@ define([
/** coauthoring begin **/
value = Common.localStorage.getItem("de-settings-livecomment");
this.isLiveCommenting = !(value!==null && parseInt(value) == 0);
this.isLiveCommenting ? this.api.asc_showComments() : this.api.asc_hideComments();
var resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
this.isLiveCommenting ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments();
/** coauthoring end **/
value = Common.localStorage.getItem("de-settings-zoom");
@ -859,7 +871,7 @@ define([
toolbarController.createDelayedElements();
documentHolderController.getView('DocumentHolder').createDelayedElements();
me.loadLanguages();
me.setLanguages();
var shapes = me.api.asc_getPropertyEditorShapes();
if (shapes)
@ -878,9 +890,11 @@ define([
Common.NotificationCenter.trigger('document:ready', 'main');
}
}, 50);
} else if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
} else {
documentHolderController.getView('DocumentHolder').createDelayedElementsViewer();
if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
}
if (this.appOptions.canAnalytics && false)
Common.component.Analytics.initialize('UA-12442749-13', 'Document Editor');
@ -1131,7 +1145,7 @@ define([
msg.msg = (msg.msg).toString();
this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]);
Common.component.Analytics.trackEvent('External Error', msg.title);
Common.component.Analytics.trackEvent('External Error');
}
},
@ -1646,15 +1660,15 @@ define([
}
},
loadLanguages: function() {
var apiLangs = this.api.asc_getSpellCheckLanguages(),
langs = [], info;
loadLanguages: function(apiLangs) {
var langs = [], info;
_.each(apiLangs, function(lang, index, list){
info = Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId());
lang = parseInt(lang);
info = Common.util.LanguageInfo.getLocalLanguageName(lang);
langs.push({
title: info[1],
tip: info[0],
code: lang.asc_getId()
code: lang
});
}, this);
@ -1664,8 +1678,15 @@ define([
return 0;
});
this.getApplication().getController('DocumentHolder').getView('DocumentHolder').setLanguages(langs);
this.getApplication().getController('Statusbar').setLanguages(langs);
this.languages = langs;
window.styles_loaded && this.setLanguages();
},
setLanguages: function() {
if (this.languages && this.languages.length>0) {
this.getApplication().getController('DocumentHolder').getView('DocumentHolder').setLanguages(this.languages);
this.getApplication().getController('Statusbar').setLanguages(this.languages);
}
},
onInsertTable: function() {

8
apps/documenteditor/main/app/controller/Statusbar.js
View file

@ -44,7 +44,8 @@ define([
'core',
'documenteditor/main/app/view/Statusbar',
'common/main/lib/util/LanguageInfo',
'common/main/lib/view/ReviewChanges'
'common/main/lib/view/ReviewChanges',
'common/main/lib/view/LanguageDialog'
], function () {
'use strict';
@ -141,9 +142,6 @@ define([
});
},
/*
* */
setLanguages: function(langs) {
this.langs = langs;
this.statusbar.reloadLanguages(langs);
@ -243,7 +241,7 @@ define([
});
var me = this;
(new DE.Views.Statusbar.LanguageDialog({
(new Common.Views.LanguageDialog({
languages: langs,
current: me.api.asc_getDefaultLanguage(),
handler: function(result, tip) {

9
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -733,7 +733,7 @@ define([
var styleRec = listStyle.menuPicker.store.findWhere({
title: name
});
this._state.prstyle = (listStyle.menuPicker.store.length>0) ? name : undefined;
this._state.prstyle = (listStyle.menuPicker.store.length>0 || window.styles_loaded) ? name : undefined;
listStyle.menuPicker.selectRecord(styleRec);
listStyle.resumeEvents();
@ -1892,7 +1892,7 @@ define([
me._state.prstyle = title;
style.put_Name(title);
characterStyle.put_Name(title + '_character');
style.put_Next(nextStyle.asc_getName());
style.put_Next((nextStyle) ? nextStyle.asc_getName() : null);
me.api.asc_AddNewStyle(style);
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
@ -2516,7 +2516,7 @@ define([
store: this.getApplication().getCollection('Common.Collections.TextArt'),
parentMenu: this.toolbar.mnuInsertTextArt.menu,
showLast: false,
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
});
this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
@ -2630,7 +2630,8 @@ define([
if (self._state.prstyle) styleRec = listStyles.menuPicker.store.findWhere({title: self._state.prstyle});
listStyles.fillComboView((styleRec) ? styleRec : listStyles.menuPicker.store.at(0), true);
Common.NotificationCenter.trigger('edit:complete', this);
}
} else if (listStyles.rendered)
listStyles.clearComboView();
window.styles_loaded = true;
},

2
apps/documenteditor/main/app/template/StatusBar.template
View file

@ -29,7 +29,7 @@
<div class="separator short el-edit"></div>
<div class="cnt-lang el-edit">
<div class="dropdown-toggle" data-toggle="dropdown" style="margin-right: 6px;">
<span class="icon-lang-flag img-toolbarmenu lang-flag" data-vertical-offset="10" />
<span class="icon-lang-flag lang-flag" data-vertical-offset="10" />
<label id="status-label-lang" class="status-label">English (United States)</label>
<div class="caret up img-commonctrl" />
</div>

175
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -81,7 +81,7 @@ define([
me._currentParaObjDisabled = false;
var showPopupMenu = function(menu, value, event, docElement, eOpts){
if (!_.isUndefined(menu) && menu !== null && me.mode.isEdit){
if (!_.isUndefined(menu) && menu !== null){
Common.UI.Menu.Manager.hideAll();
var showPoint = [event.get_X(), event.get_Y()],
@ -186,9 +186,33 @@ define([
return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
};
var fillViewMenuProps = function(selectedElements) {
if (!selectedElements || !_.isArray(selectedElements)) return;
var menu_props = {},
menu_to_show = me.viewModeMenu,
noobject = true;
for (var i = 0; i <selectedElements.length; i++) {
var elType = selectedElements[i].get_ObjectType();
var elValue = selectedElements[i].get_ObjectValue();
if (Asc.c_oAscTypeSelectElement.Image == elType) {
//image
menu_props.imgProps = {};
menu_props.imgProps.value = elValue;
noobject = false;
} else if (Asc.c_oAscTypeSelectElement.Paragraph == elType)
{
menu_props.paraProps = {};
menu_props.paraProps.value = elValue;
menu_props.paraProps.locked = (elValue) ? elValue.get_Locked() : false;
noobject = false;
}
}
return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
};
var showObjectMenu = function(event, docElement, eOpts){
if (me.api && me.mode.isEdit){
var obj = fillMenuProps(me.api.getSelectedElements());
if (me.api){
var obj = (me.mode.isEdit) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements());
if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts);
}
};
@ -204,8 +228,8 @@ define([
};
var onFocusObject = function(selectedElements) {
if (me.mode.isEdit && me.currentMenu && me.currentMenu.isVisible() && me.currentMenu !== me.hdrMenu){
var obj = fillMenuProps(selectedElements);
if (me.currentMenu && me.currentMenu.isVisible() && me.currentMenu !== me.hdrMenu){
var obj = (me.mode.isEdit) ? fillMenuProps(selectedElements) : fillViewMenuProps(selectedElements);
if (obj) {
if (obj.menu_to_show===me.currentMenu) {
me.currentMenu.options.initMenu(obj.menu_props);
@ -574,6 +598,65 @@ define([
/** coauthoring end **/
};
var onShowSpecialPasteOptions = function(specialPasteShowOptions) {
var coord = specialPasteShowOptions.asc_getCellCoord(),
pasteContainer = me.cmpEl.find('#special-paste-container'),
pasteItems = specialPasteShowOptions.asc_getOptions();
// Prepare menu container
if (pasteContainer.length < 1) {
me._arrSpecialPaste = [];
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = me.textPaste;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.keepTextOnly] = me.txtKeepTextOnly;
pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
me.cmpEl.append(pasteContainer);
me.btnSpecialPaste = new Common.UI.Button({
cls : 'btn-toolbar',
iconCls : 'btn-paste',
menu : new Common.UI.Menu({items: []})
});
me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
}
if (pasteItems.length>0) {
var menu = me.btnSpecialPaste.menu;
for (var i = 0; i < menu.items.length; i++) {
menu.removeItem(menu.items[i]);
i--;
}
var group_prev = -1;
_.each(pasteItems, function(menuItem, index) {
var mnu = new Common.UI.MenuItem({
caption: me._arrSpecialPaste[menuItem],
value: menuItem,
checkable: true,
toggleGroup : 'specialPasteGroup'
}).on('click', function(item, e) {
me.api.asc_SpecialPaste(item.value);
setTimeout(function(){menu.hide();}, 100);
});
menu.addItem(mnu);
});
(menu.items.length>0) && menu.items[0].setChecked(true, true);
}
if (coord.asc_getX()<0 || coord.asc_getY()<0) {
if (pasteContainer.is(':visible')) pasteContainer.hide();
} else {
var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3];
pasteContainer.css({left: showPoint[0], top : showPoint[1]});
pasteContainer.show();
}
};
var onHideSpecialPasteOptions = function() {
var pasteContainer = me.cmpEl.find('#special-paste-container');
if (pasteContainer.is(':visible'))
pasteContainer.hide();
};
var onDialogAddHyperlink = function() {
var win, props, text;
if (me.api && me.mode.isEdit){
@ -1438,6 +1521,9 @@ define([
this.api.asc_registerCallback('asc_onShowForeignCursorLabel', _.bind(onShowForeignCursorLabel, this));
this.api.asc_registerCallback('asc_onHideForeignCursorLabel', _.bind(onHideForeignCursorLabel, this));
this.api.asc_registerCallback('asc_onFocusObject', _.bind(onFocusObject, this));
this.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(onShowSpecialPasteOptions, this));
this.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(onHideSpecialPasteOptions, this));
}
return this;
@ -1707,6 +1793,58 @@ define([
me.fireEvent('editcomplete', me);
},
createDelayedElementsViewer: function() {
var me = this;
var menuViewCopy = new Common.UI.MenuItem({
caption: me.textCopy,
value: 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuViewUndo = new Common.UI.MenuItem({
caption: me.textUndo
}).on('click', function () {
me.api.Undo();
});
var menuViewCopySeparator = new Common.UI.MenuItem({
caption: '--'
});
var menuViewAddComment = new Common.UI.MenuItem({
caption: me.addCommentText
}).on('click', _.bind(me.addComment, me));
this.viewModeMenu = new Common.UI.Menu({
initMenu: function (value) {
var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties()));
menuViewUndo.setVisible(me.mode.isEdit);
menuViewCopySeparator.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && me.mode.isEdit);
menuViewAddComment.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && me.mode.isEdit);
menuViewAddComment.setDisabled(value.paraProps && value.paraProps.locked === true);
var cancopy = me.api && me.api.can_CopyCut();
menuViewCopy.setDisabled(!cancopy);
},
items: [
menuViewCopy,
menuViewUndo,
menuViewCopySeparator,
menuViewAddComment
]
}).on('hide:after', function (menu, e, isFromInputControl) {
if (me.suppressEditComplete) {
me.suppressEditComplete = false;
return;
}
if (!isFromInputControl) me.fireEvent('editcomplete', me);
me.currentMenu = null;
});
},
createDelayedElements: function() {
var me = this;
@ -2209,21 +2347,21 @@ define([
menuAlign: 'tl-tr',
items : [
me.menuTableCellTop = new Common.UI.MenuItem({
caption : me.topCellText,
caption : me.textShapeAlignTop,
toggleGroup : 'popuptablecellalign',
checkable : true,
checked : false,
valign : Asc.c_oAscVertAlignJc.Top
}).on('click', _.bind(tableCellsVAlign, me)),
me.menuTableCellCenter = new Common.UI.MenuItem({
caption : me.centerCellText,
caption : me.textShapeAlignMiddle,
toggleGroup : 'popuptablecellalign',
checkable : true,
checked : false,
valign : Asc.c_oAscVertAlignJc.Center
}).on('click', _.bind(tableCellsVAlign, me)),
me.menuTableCellBottom = new Common.UI.MenuItem({
caption : me.bottomCellText,
caption : me.textShapeAlignBottom,
toggleGroup : 'popuptablecellalign',
checkable : true,
checked : false,
@ -2725,21 +2863,21 @@ define([
menuAlign: 'tl-tr',
items : [
me.menuParagraphTop = new Common.UI.MenuItem({
caption : me.topCellText,
caption : me.textShapeAlignTop,
checkable : true,
checked : false,
toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Top
}).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText,
caption : me.textShapeAlignMiddle,
checkable : true,
checked : false,
toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Center
}).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText,
caption : me.textShapeAlignBottom,
checkable : true,
checked : false,
toggleGroup : 'popupparagraphvalign',
@ -3119,7 +3257,9 @@ define([
setLanguages: function(langs){
var me = this;
if (langs && langs.length > 0) {
if (langs && langs.length > 0 && me.langParaMenu && me.langTableMenu) {
me.langParaMenu.menu.removeAll();
me.langTableMenu.menu.removeAll();
_.each(langs, function(lang, index){
me.langParaMenu.menu.addItem(new Common.UI.MenuItem({
caption : lang.title,
@ -3217,9 +3357,6 @@ define([
/** coauthoring begin **/
addCommentText : 'Add Comment',
/** coauthoring end **/
topCellText: 'Align Top',
centerCellText: 'Align Center',
bottomCellText: 'Align Bottom',
cellAlignText: 'Cell Vertical Alignment',
txtInline: 'Inline',
txtSquare: 'Square',
@ -3265,8 +3402,8 @@ define([
textCut: 'Cut',
directionText: 'Text Direction',
directHText: 'Horizontal',
direct90Text: 'Rotate at 90°',
direct270Text: 'Rotate at 270°',
direct90Text: 'Rotate Text Down',
direct270Text: 'Rotate Text Up°',
txtRemoveAccentChar: 'Remove accent character',
txtBorderProps: 'Borders property',
txtHideTop: 'Hide top border',
@ -3336,7 +3473,9 @@ define([
txtAlignToChar: 'Align to character',
txtDeleteRadical: 'Delete radical',
txtDeleteChars: 'Delete enclosing characters',
txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators'
txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators',
txtKeepTextOnly: 'Keep text only',
textUndo: 'Undo'
}, DE.Views.DocumentHolder || {}));
});

18
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -115,6 +115,10 @@ define([
'<td class="left"><label><%= scope.txtLiveComment %></label></td>',
'<td class="right"><div id="fms-chb-live-comment"/></td>',
'</tr>','<tr class="divider coauth"></tr>',
'<tr class="coauth">',
'<td class="left"></td>',
'<td class="right"><div id="fms-chb-resolved-comment"/></td>',
'</tr>','<tr class="divider coauth"></tr>',
/** coauthoring end **/
'<tr class="edit">',
'<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
@ -185,6 +189,13 @@ define([
this.chLiveComment = new Common.UI.CheckBox({
el: $('#fms-chb-live-comment'),
labelText: this.strLiveComment
}).on('change', _.bind(function(field, newValue, oldValue, eOpts){
this.chResolvedComment.setDisabled(field.getValue()!=='checked');
}, this));
this.chResolvedComment = new Common.UI.CheckBox({
el: $('#fms-chb-resolved-comment'),
labelText: this.strResolvedComment
});
/** coauthoring end **/
@ -342,6 +353,9 @@ define([
value = Common.localStorage.getItem("de-settings-livecomment");
this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0));
value = Common.localStorage.getItem("de-settings-resolvedcomment");
this.chResolvedComment.setValue(!(value!==null && parseInt(value) == 0));
value = Common.localStorage.getItem("de-settings-coauthmode");
if (value===null && Common.localStorage.getItem("de-settings-autosave")===null &&
this.mode.customization && this.mode.customization.autosave===false)
@ -391,6 +405,7 @@ define([
Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue());
/** coauthoring begin **/
Common.localStorage.setItem("de-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0);
Common.localStorage.setItem("de-settings-resolvedcomment", this.chResolvedComment.isChecked() ? 1 : 0);
if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
Common.localStorage.setItem("de-settings-coauthmode", this.cmbCoAuthMode.getValue());
Common.localStorage.setItem(this.cmbCoAuthMode.getValue() ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", this.cmbShowChanges.getValue());
@ -463,7 +478,8 @@ define([
txtFitPage: 'Fit to Page',
txtFitWidth: 'Fit to Width',
textForceSave: 'Save to Server',
strForcesave: 'Always save to server (otherwise save to server on document close)'
strForcesave: 'Always save to server (otherwise save to server on document close)',
strResolvedComment: 'Turn on display of the resolved comments'
}, DE.Views.FileMenuPanels.Settings || {}));
DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({

2
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -81,7 +81,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.api = this.options.api;
Common.UI.Window.prototype.initialize.call(this, this.options);

2
apps/documenteditor/main/app/view/MailMergeRecepients.js
View file

@ -54,7 +54,7 @@ define([
'<div id="id-mail-recepients-placeholder"></div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.fileChoiceUrl = options.fileChoiceUrl || '';
Common.UI.Window.prototype.initialize.call(this, _options);

2
apps/documenteditor/main/app/view/MailMergeSaveDlg.js
View file

@ -55,7 +55,7 @@ define([
'<div id="id-mail-merge-folder-placeholder"></div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.mergeFolderUrl = options.mergeFolderUrl || '';
this.mergedFileUrl = options.mergedFileUrl || '';

2
apps/documenteditor/main/app/view/PageMarginsDialog.js
View file

@ -89,7 +89,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.spinners = [];
this._noApply = false;

2
apps/documenteditor/main/app/view/PageSizeDialog.js
View file

@ -79,7 +79,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.spinners = [];
this._noApply = false;

12
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -1341,6 +1341,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.fillControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

106
apps/documenteditor/main/app/view/Statusbar.js
View file

@ -79,9 +79,6 @@ define([
this.fireEvent('langchanged', [this, item.value.code, item.caption]);
}
if ( DE.Views.Statusbar )
var LanguageDialog = DE.Views.Statusbar.LanguageDialog || {};
DE.Views.Statusbar = Backbone.View.extend(_.extend({
el: '#statusbar',
template: _.template(template),
@ -96,7 +93,7 @@ define([
templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -194,7 +191,7 @@ define([
maxHeight: 300,
itemTemplate: _.template([
'<a id="<%= id %>" tabindex="-1" type="menuitem">',
'<span class="lang-item-icon img-toolbarmenu lang-flag <%= iconCls %>"></span>',
'<span class="lang-item-icon lang-flag <%= iconCls %>"></span>',
'<%= caption %>',
'</a>'
].join('')),
@ -436,7 +433,7 @@ define([
_onAddUser: function(m, c, opts) {
if (this.panelUsersList) {
this.panelUsersList.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
this.panelUsersList.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
}
},
@ -466,6 +463,7 @@ define([
/** coauthoring end **/
reloadLanguages: function(array) {
this.langMenu.removeAll();
_.each(array, function(item) {
this.langMenu.addItem({
iconCls : item['tip'],
@ -485,7 +483,7 @@ define([
},
setLanguage: function(info) {
if (this.langMenu.prevTip != info.tip) {
if (this.langMenu.prevTip != info.tip && info.code !== undefined) {
var $parent = $(this.langMenu.el.parentNode, this.$el);
$parent.find('.icon-lang-flag')
.removeClass(this.langMenu.prevTip)
@ -541,99 +539,5 @@ define([
tipViewUsers : 'View users and manage document access rights',
txAccessRights : 'Change access rights'
}, DE.Views.Statusbar || {}));
DE.Views.Statusbar.LanguageDialog = Common.UI.Window.extend(_.extend({
options: {
header: false,
width: 350,
cls: 'modal-dlg'
},
template: '<div class="box">' +
'<div class="input-row">' +
'<label><%= label %></label>' +
'</div>' +
'<div class="input-row" id="id-document-language">' +
'</div>' +
'</div>' +
'<div class="footer right">' +
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;"><%= btns.ok %></button>'+
'<button class="btn normal dlg-btn" result="cancel"><%= btns.cancel %></button>'+
'</div>',
initialize : function(options) {
_.extend(this.options, options || {}, {
label: this.labelSelect,
btns: {ok: this.btnOk, cancel: this.btnCancel}
});
this.options.tpl = _.template(this.template, this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
var $window = this.getChild();
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.cmbLanguage = new Common.UI.ComboBox({
el: $window.find('#id-document-language'),
cls: 'input-group-nr',
menuStyle: 'min-width: 318px; max-height: 300px;',
editable: false,
template: _.template([
'<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control">',
'<span class="input-lang-icon img-toolbarmenu lang-flag" style="position: absolute;"></span>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>">',
'<a tabindex="-1" type="menuitem" style="padding-left: 26px !important;">',
'<span class="lang-item-icon img-toolbarmenu lang-flag <%= item.value %>" style="position: absolute;margin-left:-21px;"></span>',
'<%= scope.getDisplayValue(item) %>',
'</a>',
'</li>',
'<% }); %>',
'</ul>',
'</span>'
].join('')),
data: this.options.languages
});
if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true});
this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this));
this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]);
this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord());
},
close: function(suppressevent) {
var $window = this.getChild();
if (!$window.find('.combobox.open').length) {
Common.UI.Window.prototype.close.call(this, arguments);
}
},
onBtnClick: function(event) {
if (this.options.handler) {
this.options.handler.call(this, event.currentTarget.attributes['result'].value, this.cmbLanguage.getValue());
}
this.close();
},
onLangSelect: function(cmb, rec, e) {
var icon = cmb.$el.find('.input-lang-icon'),
plang = icon.attr('lang');
if (plang) icon.removeClass(plang);
icon.addClass(rec.value).attr('lang',rec.value);
},
labelSelect : 'Select document language',
btnCancel : 'Cancel',
btnOk : 'Ok'
}, LanguageDialog||{}));
}
);

11
apps/documenteditor/main/app/view/StyleTitleDialog.js
View file

@ -70,7 +70,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -107,10 +107,11 @@ define([
menuStyle : 'width: 100%; max-height: 290px;',
editable : false,
cls : 'input-group-nr',
data : this.options.formats
data : this.options.formats,
disabled : (this.options.formats.length==0)
});
this.cmbNextStyle.setValue(this.options.formats[0].value);
if (this.options.formats.length>0)
this.cmbNextStyle.setValue(this.options.formats[0].value);
},
show: function() {
@ -129,7 +130,7 @@ define([
getNextStyle: function () {
var me = this;
return me.cmbNextStyle.getValue();
return (me.options.formats.length>0) ? me.cmbNextStyle.getValue() : null;
},
onBtnClick: function(event) {

12
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -916,6 +916,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.lockedControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

35
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1220,15 +1220,16 @@ define([
this.btnNumbers.setMenu(
new Common.UI.Menu({
items: [
{ template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 330px; margin: 0 5px;"></div>') }
{ template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 5px;"></div>') }
]
})
);
this.btnMultilevels.setMenu(
new Common.UI.Menu({
style: 'min-width: 90px',
items: [
{ template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 165px; margin: 0 5px;"></div>') }
{ template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 5px;"></div>') }
]
})
);
@ -1353,19 +1354,19 @@ define([
this.mnuNumbersPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-numbering'),
parentMenu: this.btnNumbers.menu,
restoreHeight: 164,
restoreHeight: 92,
allowScrollbar: false,
store: new Common.UI.DataViewStore([
{offsety: 0, data: {type: 1, subtype: -1}},
{offsety: 518, data: {type: 1, subtype: 4}},
{offsety: 592, data: {type: 1, subtype: 5}},
{offsety: 666, data: {type: 1, subtype: 6}},
{offsety: 296, data: {type: 1, subtype: 1}},
{offsety: 370, data: {type: 1, subtype: 2}},
{offsety: 444, data: {type: 1, subtype: 3}},
{offsety: 740, data: {type: 1, subtype: 7}}
{offsety: 570, data: {type: 1, subtype: 4}},
{offsety: 532, data: {type: 1, subtype: 5}},
{offsety: 608, data: {type: 1, subtype: 6}},
{offsety: 418, data: {type: 1, subtype: 1}},
{offsety: 456, data: {type: 1, subtype: 2}},
{offsety: 494, data: {type: 1, subtype: 3}},
{offsety: 646, data: {type: 1, subtype: 7}}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-numberlist" style="background-position: 0 -<%= offsety %>px;"></div>')
itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
});
_conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true);
@ -1373,15 +1374,15 @@ define([
this.mnuMultilevelPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-multilevels'),
parentMenu: this.btnMultilevels.menu,
restoreHeight: 164,
restoreHeight: 92,
allowScrollbar: false,
store: new Common.UI.DataViewStore([
{ offsety:0, data:{type:2, subtype:-1} },
{ offsety:74, data:{type:2, subtype:1} },
{ offsety:148, data:{type:2, subtype:2} },
{ offsety:222, data:{type:2, subtype:3} }
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist" style="background-position: 0 -<%= offsety %>px;"></div>')
{offsety: 304, data: {type: 2, subtype: 1}},
{offsety: 342, data: {type: 2, subtype: 2}},
{offsety: 380, data: {type: 2, subtype: 3}}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
});
_conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true);

2
apps/documenteditor/main/app_dev.js
View file

@ -56,7 +56,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -125,7 +124,6 @@ require([
'locale',
'jszip',
'jsziputils',
'jsrsasign',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {

12
apps/documenteditor/main/locale/de.json
View file

@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "Der minimale Wert für dieses Feld ist {0}.",
"Common.Views.InsertTableDialog.txtRows": "Anzahl von Zeilen\t",
"Common.Views.InsertTableDialog.txtTitle": "Größe der Tabelle",
"Common.Views.LanguageDialog.btnCancel": "Abbrechen",
"Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Sprache des Dokuments wählen",
"Common.Views.OpenDialog.cancelButtonText": "Abbrechen",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Verschlüsselung ",
@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Zeile löschen",
"DE.Views.DocumentHolder.deleteTableText": "Tabelle löschen",
"DE.Views.DocumentHolder.deleteText": "Löschen",
"DE.Views.DocumentHolder.direct270Text": "um 270° drehen",
"DE.Views.DocumentHolder.direct90Text": "um 90° drehen ",
"DE.Views.DocumentHolder.direct270Text": "Text nach oben drehen",
"DE.Views.DocumentHolder.direct90Text": "Text nach unten drehen",
"DE.Views.DocumentHolder.directHText": "Horizontal",
"DE.Views.DocumentHolder.directionText": "Textausrichtung\t",
"DE.Views.DocumentHolder.editChartText": "Daten ändern",
@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Manuellen Umbruch einfügen\t",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Formel nachher einfügen\t",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Formel vorher einfügen\t",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Nur Text beibehalten",
"DE.Views.DocumentHolder.txtLimitChange": "Grenzwerten ändern ",
"DE.Views.DocumentHolder.txtLimitOver": "Grenzwert über den Text\n",
"DE.Views.DocumentHolder.txtLimitUnder": "Grenzwert unter den Text",
@ -928,6 +932,7 @@
"DE.Views.FileMenuPanels.Settings.strForcesave": "Immer auf dem Server speichern (ansonsten auf dem Server beim Schließen des Dokuments speichern)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Hieroglyphen einschalten",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Live-Kommentare einschalten",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Die Anzeige der aufgelösten Kommentare einschalten",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Änderungen bei der Echtzeit-Zusammenarbeit zeigen",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Rechtschreibprüfung einschalten",
"DE.Views.FileMenuPanels.Settings.strStrict": "Formal",
@ -1287,9 +1292,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Oben und unten",
"DE.Views.ShapeSettings.txtWood": "Holz",
"DE.Views.Statusbar.goToPageText": "Auf die Seite übergehen",
"DE.Views.Statusbar.LanguageDialog.btnCancel": "Abbrechen",
"DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
"DE.Views.Statusbar.LanguageDialog.labelSelect": "Sprache des Dokuments wählen",
"DE.Views.Statusbar.pageIndexText": "Seite {0} von {1}",
"DE.Views.Statusbar.textChangesPanel": "Änderungen anzeigen",
"DE.Views.Statusbar.textTrackChanges": "Nachverfolgen von Änderungen",

19
apps/documenteditor/main/locale/en.json
View file

@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.",
"Common.Views.InsertTableDialog.txtRows": "Number of Rows",
"Common.Views.InsertTableDialog.txtTitle": "Table Size",
"Common.Views.LanguageDialog.btnCancel": "Cancel",
"Common.Views.LanguageDialog.btnOk": "Ok",
"Common.Views.LanguageDialog.labelSelect": "Select document language",
"Common.Views.OpenDialog.cancelButtonText": "Cancel",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
@ -674,11 +677,11 @@
"DE.Views.DocumentHolder.advancedText": "Advanced Settings",
"DE.Views.DocumentHolder.alignmentText": "Alignment",
"DE.Views.DocumentHolder.belowText": "Below",
"DE.Views.DocumentHolder.bottomCellText": "Align Bottom",
"del_DE.Views.DocumentHolder.bottomCellText": "Align Bottom",
"DE.Views.DocumentHolder.breakBeforeText": "Page break before",
"DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
"DE.Views.DocumentHolder.cellText": "Cell",
"DE.Views.DocumentHolder.centerCellText": "Align Center",
"del_DE.Views.DocumentHolder.centerCellText": "Align Center",
"DE.Views.DocumentHolder.centerText": "Center",
"DE.Views.DocumentHolder.chartText": "Chart Advanced Settings",
"DE.Views.DocumentHolder.columnText": "Column",
@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Delete Row",
"DE.Views.DocumentHolder.deleteTableText": "Delete Table",
"DE.Views.DocumentHolder.deleteText": "Delete",
"DE.Views.DocumentHolder.direct270Text": "Rotate at 270°",
"DE.Views.DocumentHolder.direct90Text": "Rotate at 90°",
"DE.Views.DocumentHolder.direct270Text": "Rotate Text Up",
"DE.Views.DocumentHolder.direct90Text": "Rotate Text Down",
"DE.Views.DocumentHolder.directHText": "Horizontal",
"DE.Views.DocumentHolder.directionText": "Text Direction",
"DE.Views.DocumentHolder.editChartText": "Edit Data",
@ -752,7 +755,7 @@
"DE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
"DE.Views.DocumentHolder.textWrap": "Wrapping Style",
"DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
"DE.Views.DocumentHolder.topCellText": "Align Top",
"del_DE.Views.DocumentHolder.topCellText": "Align Top",
"DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
"DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
"DE.Views.DocumentHolder.txtAddHor": "Add horizontal line",
@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
"DE.Views.DocumentHolder.txtLimitChange": "Change limits location",
"DE.Views.DocumentHolder.txtLimitOver": "Limit over text",
"DE.Views.DocumentHolder.txtLimitUnder": "Limit under text",
@ -835,6 +839,7 @@
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"DE.Views.DocumentHolder.textUndo": "Undo",
"DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
"DE.Views.DropcapSettingsAdvanced.okButtonText": "Ok",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
@ -928,6 +933,7 @@
"DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Turn on hieroglyphs",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Turn on display of the comments",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Realtime Collaboration Changes",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Turn on spell checking option",
"DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
@ -1287,9 +1293,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
"DE.Views.ShapeSettings.txtWood": "Wood",
"DE.Views.Statusbar.goToPageText": "Go to Page",
"DE.Views.Statusbar.LanguageDialog.btnCancel": "Cancel",
"DE.Views.Statusbar.LanguageDialog.btnOk": "Ok",
"DE.Views.Statusbar.LanguageDialog.labelSelect": "Select document language",
"DE.Views.Statusbar.pageIndexText": "Page {0} of {1}",
"DE.Views.Statusbar.textChangesPanel": "Changes Panel",
"DE.Views.Statusbar.textTrackChanges": "Track Changes",

38
apps/documenteditor/main/locale/fr.json
View file

@ -20,7 +20,7 @@
"Common.Controllers.ReviewChanges.textCenter": "Aligner au centre",
"Common.Controllers.ReviewChanges.textChart": "Graphique",
"Common.Controllers.ReviewChanges.textColor": "Couleur de police",
"Common.Controllers.ReviewChanges.textContextual": "N'ajoutez pas l'intervalle entre paragraphes du même style",
"Common.Controllers.ReviewChanges.textContextual": "Ne pas ajouter d'intervalle entre paragraphes du même style",
"Common.Controllers.ReviewChanges.textDeleted": "<b>Supprimé:</b>\n\n",
"Common.Controllers.ReviewChanges.textDStrikeout": "Double barré",
"Common.Controllers.ReviewChanges.textEquation": "Équation",
@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "La valeur minimale pour ce champ est {0}.",
"Common.Views.InsertTableDialog.txtRows": "Nombre de lignes",
"Common.Views.InsertTableDialog.txtTitle": "Taille du tableau",
"Common.Views.LanguageDialog.btnCancel": "Annuler",
"Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Sélectionner la langue du document",
"Common.Views.OpenDialog.cancelButtonText": "Annuler",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Codage ",
@ -195,7 +198,7 @@
"DE.Controllers.LeftMenu.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.<br>Êtes-vous sûr de vouloir continuer ?",
"DE.Controllers.Main.applyChangesTextText": "Chargement des changemets...",
"DE.Controllers.Main.applyChangesTitleText": "Chargement des changemets",
"DE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.",
"DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
"DE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.",
"DE.Controllers.Main.criticalErrorTitle": "Erreur",
"DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
@ -218,8 +221,8 @@
"DE.Controllers.Main.errorMailMergeSaveFile": "Fusionner échoué.",
"DE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement",
"DE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
"DE.Controllers.Main.errorSessionAbsolute": "La session de la modification de document a expiré.Veuillez recharger la page.",
"DE.Controllers.Main.errorSessionIdle": "Le document n'est pas modifié depuis longtemps. Veuillez recharger la page.",
"DE.Controllers.Main.errorSessionAbsolute": "Votre session a expiré. Veuillez recharger la page.",
"DE.Controllers.Main.errorSessionIdle": "Le document n'a pas été modifié depuis trop longtemps. Veuillez recharger la page.",
"DE.Controllers.Main.errorSessionToken": "La connexion au serveur a été interrompue. Veuillez recharger la page.",
"DE.Controllers.Main.errorStockChart": "Ordre des lignes est incorrect. Pour créer un graphique boursier organisez vos données sur la feuille de calcul dans l'ordre suivant:<br> cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.",
"DE.Controllers.Main.errorToken": "Le jeton de sécurité du document n’était pas formé correctement.<br>Veuillez contacter l'administrateur de Document Server.",
@ -262,7 +265,7 @@
"DE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être inférieure à %1.",
"DE.Controllers.Main.textAnonymous": "Anonyme",
"DE.Controllers.Main.textBuyNow": "Visiter le site web",
"DE.Controllers.Main.textChangesSaved": "Toutes les modifications sont enregistrées",
"DE.Controllers.Main.textChangesSaved": "Toutes les modifications ont été enregistrées",
"DE.Controllers.Main.textCloseTip": "Cliquez pour fermer le conseil",
"DE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
"DE.Controllers.Main.textLoadingDocument": "Chargement du document",
@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Supprimer la ligne",
"DE.Views.DocumentHolder.deleteTableText": "Supprimer le tableau",
"DE.Views.DocumentHolder.deleteText": "Supprimer",
"DE.Views.DocumentHolder.direct270Text": "Rotation à 270 °",
"DE.Views.DocumentHolder.direct90Text": "Rotation à 90 °",
"DE.Views.DocumentHolder.direct270Text": "Rotation du texte vers le haut",
"DE.Views.DocumentHolder.direct90Text": "Rotation du texte vers le bas",
"DE.Views.DocumentHolder.directHText": "Horizontal",
"DE.Views.DocumentHolder.directionText": "Orientation du texte",
"DE.Views.DocumentHolder.editChartText": "Modifier les données",
@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Insérer pause manuelle",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Insérer équation après",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Insérez l'équation avant",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
"DE.Views.DocumentHolder.txtLimitChange": "Modifier d'emplacement des locations",
"DE.Views.DocumentHolder.txtLimitOver": "Limite au-dessous le texte",
"DE.Views.DocumentHolder.txtLimitUnder": "Limite en dessous le texte",
@ -921,14 +925,15 @@
"DE.Views.FileMenuPanels.Settings.strAutoRecover": "Activer la récupération automatique",
"DE.Views.FileMenuPanels.Settings.strAutosave": "Activer l'enregistrement automatique",
"DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Mode de co-édition ",
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Les autres utilisateurs pourront voir immédiatement vos modifications ",
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Les autres utilisateurs verront vos modifications en temps reel",
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Avant de pouvoir afficher les modifications, vous avez besoin de les accépter ",
"DE.Views.FileMenuPanels.Settings.strFast": "Rapide",
"DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting de la police",
"DE.Views.FileMenuPanels.Settings.strForcesave": "Toujours enregistrer sur le serveur ( sinon enregistrer sur le serveur lors de la fermeture du document )",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Activer des hiéroglyphes",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Activer l'affichage des commentaires",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Changements de collaboration en temps réel",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Visibilité des modifications en co-édition",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activer la vérification de l'orthographe",
"DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
"DE.Views.FileMenuPanels.Settings.strUnit": "Unité de mesure",
@ -943,7 +948,7 @@
"DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé",
"DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur",
"DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
"DE.Views.FileMenuPanels.Settings.txtAll": "Tous",
"DE.Views.FileMenuPanels.Settings.txtAll": "Surligner toutes les modifications",
"DE.Views.FileMenuPanels.Settings.txtCm": "Centimètre",
"DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajuster à la page",
"DE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajuster à la largeur",
@ -953,7 +958,7 @@
"DE.Views.FileMenuPanels.Settings.txtLiveComment": "Affichage des commentaires ",
"DE.Views.FileMenuPanels.Settings.txtMac": "comme OS X",
"DE.Views.FileMenuPanels.Settings.txtNative": "Natif",
"DE.Views.FileMenuPanels.Settings.txtNone": "Aucuns",
"DE.Views.FileMenuPanels.Settings.txtNone": "Surligner aucune modification",
"DE.Views.FileMenuPanels.Settings.txtPt": "Point",
"DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Vérification de l'orthographe",
"DE.Views.FileMenuPanels.Settings.txtWin": "comme Windows",
@ -1163,7 +1168,7 @@
"DE.Views.PageSizeDialog.textWidth": "Largeur",
"DE.Views.ParagraphSettings.strLineHeight": "Interligne",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Espacement de paragraphe",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "N'ajoutez pas l'intervalle entre paragraphes du même style",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style",
"DE.Views.ParagraphSettings.strSpacingAfter": "Après",
"DE.Views.ParagraphSettings.strSpacingBefore": "Avant",
"DE.Views.ParagraphSettings.textAdvanced": "Afficher les paramètres avancés",
@ -1180,7 +1185,7 @@
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Toutes en majuscules",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordures et remplissage",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Saut de page avant",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Barré double",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double barré",
"DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Première ligne",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
@ -1287,9 +1292,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Haut et bas",
"DE.Views.ShapeSettings.txtWood": "Bois",
"DE.Views.Statusbar.goToPageText": "Aller à la page",
"DE.Views.Statusbar.LanguageDialog.btnCancel": "Annuler",
"DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
"DE.Views.Statusbar.LanguageDialog.labelSelect": "Sélectionner la langue du document",
"DE.Views.Statusbar.pageIndexText": "Page {0} de {1}",
"DE.Views.Statusbar.textChangesPanel": "Сhangements de panneau",
"DE.Views.Statusbar.textTrackChanges": "Suivi des modifications",
@ -1408,7 +1410,7 @@
"DE.Views.TableSettingsAdvanced.textRightOf": "à droite de",
"DE.Views.TableSettingsAdvanced.textRightTooltip": "A droite",
"DE.Views.TableSettingsAdvanced.textTable": "Tableau",
"DE.Views.TableSettingsAdvanced.textTableBackColor": "Tableau de fond",
"DE.Views.TableSettingsAdvanced.textTableBackColor": "Fond du tableau",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Position du tableau",
"DE.Views.TableSettingsAdvanced.textTableSize": "Taille du tableau",
"DE.Views.TableSettingsAdvanced.textTitle": "Tableau - Paramètres avancés",
@ -1456,7 +1458,7 @@
"DE.Views.TextArtSettings.textTemplate": "Modèle",
"DE.Views.TextArtSettings.textTransform": "Transformer",
"DE.Views.TextArtSettings.txtNoBorders": "Pas de ligne",
"DE.Views.Toolbar.mniCustomTable": "Inserer tableau personnalisé",
"DE.Views.Toolbar.mniCustomTable": "Inserer un tableau personnalisé",
"DE.Views.Toolbar.mniDelFootnote": "Supprimer les notes de bas de page",
"DE.Views.Toolbar.mniEditDropCap": "Paramètres de la lettrine",
"DE.Views.Toolbar.mniEditFooter": "Modifier le pied de page",

12
apps/documenteditor/main/locale/ru.json
View file

@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "Минимальное значение для этого поля - {0}.",
"Common.Views.InsertTableDialog.txtRows": "Количество строк",
"Common.Views.InsertTableDialog.txtTitle": "Размер таблицы",
"Common.Views.LanguageDialog.btnCancel": "Отмена",
"Common.Views.LanguageDialog.btnOk": "Ок",
"Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа",
"Common.Views.OpenDialog.cancelButtonText": "Отмена",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Кодировка",
@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Удалить строку",
"DE.Views.DocumentHolder.deleteTableText": "Удалить таблицу",
"DE.Views.DocumentHolder.deleteText": "Удалить",
"DE.Views.DocumentHolder.direct270Text": "Поворот на 270°",
"DE.Views.DocumentHolder.direct90Text": "Поворот на 90°",
"DE.Views.DocumentHolder.direct270Text": "Повернуть текст вверх",
"DE.Views.DocumentHolder.direct90Text": "Повернуть текст вниз",
"DE.Views.DocumentHolder.directHText": "Горизонтальное",
"DE.Views.DocumentHolder.directionText": "Направление текста",
"DE.Views.DocumentHolder.editChartText": "Изменить данные",
@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить формулу после",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить формулу перед",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",
"DE.Views.DocumentHolder.txtLimitChange": "Изменить положение пределов",
"DE.Views.DocumentHolder.txtLimitOver": "Предел над текстом",
"DE.Views.DocumentHolder.txtLimitUnder": "Предел под текстом",
@ -928,6 +932,7 @@
"DE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Включить отображение комментариев в тексте",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Включить отображение решенных комментариев",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Включить проверку орфографии",
"DE.Views.FileMenuPanels.Settings.strStrict": "Строгий",
@ -1287,9 +1292,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Сверху и снизу",
"DE.Views.ShapeSettings.txtWood": "Дерево",
"DE.Views.Statusbar.goToPageText": "Перейти на страницу",
"DE.Views.Statusbar.LanguageDialog.btnCancel": "Отмена",
"DE.Views.Statusbar.LanguageDialog.btnOk": "ОК",
"DE.Views.Statusbar.LanguageDialog.labelSelect": "Выбрать язык документа",
"DE.Views.Statusbar.pageIndexText": "Страница {0} из {1}",
"DE.Views.Statusbar.textChangesPanel": "Панель изменений",
"DE.Views.Statusbar.textTrackChanges": "Отслеживание изменений",

3
apps/documenteditor/main/resources/help/en/Contents.json
View file

@ -23,7 +23,8 @@
{"src": "UsageInstructions/AddHyperlinks.htm", "name": "Add hyperlinks"},
{"src": "UsageInstructions/InsertDropCap.htm", "name": "Insert a drop cap"},
{"src": "UsageInstructions/InsertHeadersFooters.htm", "name": "Insert headers and footers"},
{"src":"UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers" },
{ "src": "UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers" },
{"src": "UsageInstructions/InsertFootnotes.htm", "name": "Insert footnotes" },
{"src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations" },
{"src": "UsageInstructions/InsertTextObjects.htm", "name": "Insert text objects" },
{"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge"},

2
apps/documenteditor/main/resources/help/en/UsageInstructions/InsertAutoshapes.htm
View file

@ -183,6 +183,8 @@
<p><img alt="Shape - Advanced Settings" src="../images/shape_properties_4.png" /></p>
<p>The <b>Text Padding</b> tab allows to change the autoshape <b>Top</b>, <b>Bottom</b>, <b>Left</b> and <b>Right</b> internal margins (i.e. the distance between the text within the shape and the autoshape borders).</p>
<p class="note"><b>Note</b>: this tab is only available if text is added within the autoshape, otherwise the tab is disabled.</p>
<p><img alt="Shape - Advanced Settings" src="../images/shape_properties_5.png" /></p>
<p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the shape.</p>
</div>
</body>
</html>

4
apps/documenteditor/main/resources/help/en/UsageInstructions/InsertCharts.htm
View file

@ -158,6 +158,8 @@
</ul>
</li>
</ul>
<p><img alt="Chart - Advanced Settings" src="../images/chartsettings5.png" /></p>
<p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the chart.</p>
</li>
</ol>
<hr />
@ -242,6 +244,8 @@
<li><b>Move object with text</b> controls whether the chart moves as the text to which it is anchored moves.</li>
<li><b>Allow overlap</b> controls whether two charts overlap or not if you drag them near each other on the page.</li>
</ul>
<p><img alt="Chart - Advanced Settings" src="../images/chart_properties_3.png" /></p>
<p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the chart.</p>
</div>
</body>
</html>

77
apps/documenteditor/main/resources/help/en/UsageInstructions/InsertFootnotes.htm Normal file
View file

@ -0,0 +1,77 @@
<!DOCTYPE html>
<html>
<head>
<title>Insert footnotes</title>
<meta charset="utf-8" />
<meta name="description" content="Insert footnotes to provide explanations for some terms or make references to the sources" />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
</head>
<body>
<div class="mainpart">
<h1>Insert footnotes</h1>
<p>You can add footnotes to provide explanations or comments for certain sentences or terms used in your text, make references to the sources etc.</p>
<p>To insert a footnote into your document,</p>
<ol>
<li>position the insertion point at the end of the text passage that you want to add a footnote to,</li>
<li>click the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/addfootnote.png" /> icon at the top toolbar, or<br/>
click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon and select the <b>Insert Footnote</b> option from the menu,
<p>The footnote mark (i.e. the superscript character that indicates a footnote) appears in the document text and the insertion point moves to the bottom of the current page.</p>
</li>
<li>type in the footnote text.</li>
</ol>
<p>Repeat the above mentioned operations to add subsequent footnotes for other text passages in the document. The footnotes are numbered automatically.</p>
<p><img alt="Footnotes" src="../images/footnotesadded.png" /></p>
<p>If you hover the mouse pointer over the footnote mark in the document text, a small pop-up window with the footnote text appears.</p>
<p><img alt="Footnote text" src="../images/footnotetext.png" /></p>
<p>To easily navigate between the added footnotes within the document text,</p>
<ol>
<li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon,</li>
<li>in the <b>Go to Footnotes</b> section, use the <img alt="Previous footnote icon" src="../images/previousfootnote.png" /> arrow to go to the previous footnote or the <img alt="Next footnote icon" src="../images/nextfootnote.png" /> arrow to go to the next footnote.</li>
</ol>
<hr />
<p>To edit the footnotes settings,</p>
<ol>
<li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon at the top toolbar,</li>
<li>select the <b>Notes Settings</b> option from the menu,</li>
<li>change the current parameters in the <b>Notes Settings</b> window that opens:
<p><img alt="Footnotes Settings window" src="../images/footnotes_settings.png" /></p>
<ul>
<li>Set the <b>Location</b> of footnotes on the page selecting one of the available options:
<ul>
<li><b>Bottom of page</b> - to position footnotes at the bottom of the page (this option is selected by default).</li>
<li><b>Below text</b> - to position footnotes closer to the text. This option can be useful in cases when the page contains a short text.</li>
</ul>
</li>
<li>Adjust the footnotes <b>Format</b>:
<ul>
<li><b>Number Format</b> - select the necessary number format from the available ones: <em>1, 2, 3,...</em>, <em>a, b, c,...</em>, <em>A, B, C,...</em>, <em>i, ii, iii,...</em>, <em>I, II, III,...</em>.</li>
<li><b>Start at</b> - use the arrows to set the number or letter you want to start numbering with.</li>
<li><b>Numbering</b> - select a way to number your footnotes:
<ul>
<li><b>Continuous</b> - to number footnotes sequentially throughout the document,</li>
<li><b>Restart each section</b> - to start footnote numbering with the number 1 (or some other specified character) at the beginning of each section,</li>
<li><b>Restart each page</b> - to start footnote numbering with the number 1 (or some other specified character) at the beginning of each page.</li>
</ul>
</li>
<li><b>Custom Mark</b> - set a special character or a word you want to use as the footnote mark (e.g. * or Note1). Enter the necessary character/word into the text entry field and click the <b>Insert</b> button at the bottom of the <b>Notes Settings</b> window.</li>
</ul>
</li>
<li>Use the <b>Apply changes to</b> drop-down list to select if you want to apply the specified notes settings to the <b>Whole document</b> or the <b>Current section</b> only.
<p class="note"><b>Note</b>: to use different footnotes formatting in separate parts of the document, you need to add <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">section breaks</a> first.</p>
</li>
</ul>
</li>
<li>When ready, click the <b>Apply</b> button.</li>
</ol>
<hr />
<p>To remove a single footnote, position the insertion point directly before the footnote mark in the document text and press <b>Delete</b>. Other footnotes will be renumbered automatically.</p>
<p>To delete all the footnotes in the document,</p>
<ol>
<li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon at the top toolbar,</li>
<li>select the <b>Delete All Footnotes</b> option from the menu.</li>
</ol>
</div>
</body>
</html>

4
apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm
View file

@ -46,7 +46,7 @@
<li><b>Image Advanced Settings</b> is used to open the 'Image - Advanced Settings' window.</li>
</ul>
<hr />
<p>To change its advanced settings, click the image with the right mouse button and select <b>Advanced Settings</b> from the right-click menu or just click the <b>Show advanced settings</b> link at the right sidebar. The image properties window will open:</p>
<p>To change its advanced settings, click the image with the right mouse button and select the <b>Image Advanced Settings</b> option from the right-click menu or just click the <b>Show advanced settings</b> link at the right sidebar. The image properties window will open:</p>
<p><img alt="Image - Advanced Settings: Size" src="../images/image_properties.png" /></p>
<p>The <b>Size</b> tab contains the following parameters:</p>
<ul>
@ -92,6 +92,8 @@
<li><b>Move object with text</b> controls whether the image moves as the text to which it is anchored moves.</li>
<li><b>Allow overlap</b> controls whether two images overlap or not if you drag them near each other on the page.</li>
</ul>
<p><img alt="Image - Advanced Settings" src="../images/image_properties_3.png" /></p>
<p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image.</p>
</div>
</body>
</html>

2
apps/documenteditor/main/resources/help/en/UsageInstructions/InsertPageNumbers.htm
View file

@ -37,7 +37,7 @@
<li>Set the <b>Position</b> of page numbers on the page as well as relative to the top and bottom of the page.</li>
<li>Check the <b>Different first page</b> box to apply a different page number to the very first page or in case you don't want to add any number to it at all. </li>
<li>Use the <b>Different odd and even pages</b> box to insert different page numbers for odd and even pages. </li>
<li>The <b>Link to Previous</b> option is available in case you've previously added <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">sections</a> into your document. If not, it will be grayed out. Moreover, this option is also unavailable for the very first section (i.e. when a header or footer that belongs to the first section is selected). By default, this box is checked, so that unified numbering is applied to all the sections. If you select a header or footer area, you will see that the area is marked with the <b>Same as Previous</b> label. Uncheck the <b>Link to Previous</b> box to use different page numbering for each section of the document, for example, to start each section numbering at 1. The <b>Same as Previous</b> label will no longer be displayed.</li>
<li>The <b>Link to Previous</b> option is available in case you've previously added <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">sections</a> into your document. If not, it will be grayed out. Moreover, this option is also unavailable for the very first section (i.e. when a header or footer that belongs to the first section is selected). By default, this box is checked, so that unified numbering is applied to all the sections. If you select a header or footer area, you will see that the area is marked with the <b>Same as Previous</b> label. Uncheck the <b>Link to Previous</b> box to use different page numbering for each section of the document. The <b>Same as Previous</b> label will no longer be displayed.</li>
</ul>
<p><img alt="Same as previous label" src="../images/sameasprevious_label.png" /></p>
</li>

6
apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTables.htm
View file

@ -64,7 +64,7 @@
</li>
<li><p><b>Select from Template</b> is used to choose a table template from the available ones.</p></li>
<li><p><b>Borders Style</b> is used to select the border size, color, style as well as background color.</p></li>
<li><p><b>Text Wrapping</b> is used to select between two text wrapping styles - inline and flow.</p></li>
<li><p><b>Wrapping Style</b> is used to select between two text wrapping styles - inline and flow.</p></li>
<li><p><b>Rows &amp; Columns</b> is used to perform some operations with the table: select, delete, insert rows and columns, merge cells, split a cell.</p></li>
<li><p><b>Repeat as header row at the top of each page</b> is used to insert the same header row at the top of each page in long tables.</p></li>
<li><p><b>Show advanced settings</b> is used to open the 'Table - Advanced Settings' window.</p></li>
@ -149,7 +149,9 @@
</ul>
</li>
</ul>
<p><img alt="Table - Advanced Settings" src="../images/table_properties_6.png" /></p>
<p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the table.</p>
</div>
</body>
</html>

3
apps/documenteditor/main/resources/help/en/UsageInstructions/ParagraphIndents.htm
View file

@ -25,7 +25,8 @@
<p>Select the necessary paragraph(s) and drag the indent markers along the ruler.</p>
<ul>
<li><b>First Line Indent</b> marker <img alt="First Line Indent marker" src="../images/firstline_indent.png" /> is used to set the offset from the left side of the page for the first line of the paragraph.</li>
<li><b>Hanging Indent</b> marker <img alt="Hanging Indent marker" src="../images/hanging.png" /> is used to set the offset from the left side of the page for the second and all the subsequent lines of the paragraph.</li>
<li><b>Hanging Indent</b> marker <img alt="Hanging Indent marker" src="../images/hanging.png" /> is used to set the offset from the left side of the page for the second line and all the subsequent lines of the paragraph.</li>
<li><b>Left Indent</b> marker <img alt="Left Indent marker" src="../images/leftindent.png" /> is used to set the entire paragraph offset from the left side of the page.</li>
<li><b>Right Indent</b> marker <img alt="Right Indent marker" src="../images/right_indent.png" /> is used to set the paragraph offset from the right side of the page.</li>
</ul>
</div>

2
apps/documenteditor/main/resources/help/en/UsageInstructions/SectionBreaks.htm
View file

@ -10,7 +10,7 @@
<body>
<div class="mainpart">
<h1>Insert section breaks</h1>
<p>Section breaks allow you to apply a different layout or formatting for the certain parts of your document. For example, you can use individual <a href="../UsageInstructions/InsertHeadersFooters.htm" onclick="onhyperlinkclick(this)">headers and footers</a>, <a href="../UsageInstructions/InsertPageNumbers.htm" onclick="onhyperlinkclick(this)">page numbering</a>, <a href="../UsageInstructions/SetPageParameters.htm" onclick="onhyperlinkclick(this)">margins, size, orientation, or column number</a> for each separate section.</p>
<p>Section breaks allow you to apply a different layout or formatting for the certain parts of your document. For example, you can use individual <a href="../UsageInstructions/InsertHeadersFooters.htm" onclick="onhyperlinkclick(this)">headers and footers</a>, <a href="../UsageInstructions/InsertPageNumbers.htm" onclick="onhyperlinkclick(this)">page numbering</a>, <a href="../UsageInstructions/InsertFootnotes.htm" onclick="onhyperlinkclick(this)">footnotes format</a>, <a href="../UsageInstructions/SetPageParameters.htm" onclick="onhyperlinkclick(this)">margins, size, orientation, or column number</a> for each separate section.</p>
<p class="note"><b>Note</b>: an inserted section break defines formatting of the preceding part of the document.</p>
<p>To insert a section break at the current cursor position:</p>
<ol>

BIN
apps/documenteditor/main/resources/help/en/images/addfootnote.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 384 B

BIN
apps/documenteditor/main/resources/help/en/images/chart_properties.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chart_properties_1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chart_properties_2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chart_properties_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chartsettings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chartsettings2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chartsettings3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chartsettings4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
apps/documenteditor/main/resources/help/en/images/chartsettings5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
apps/documenteditor/main/resources/help/en/images/footnotes.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 416 B

BIN
apps/documenteditor/main/resources/help/en/images/footnotes_settings.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9 KiB

BIN
apps/documenteditor/main/resources/help/en/images/footnotesadded.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
apps/documenteditor/main/resources/help/en/images/footnotetext.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
apps/documenteditor/main/resources/help/en/images/hanging.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 278 B

BIN
apps/documenteditor/main/resources/help/en/images/image_properties.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
apps/documenteditor/main/resources/help/en/images/image_properties_1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
apps/documenteditor/main/resources/help/en/images/image_properties_2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
apps/documenteditor/main/resources/help/en/images/image_properties_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
apps/documenteditor/main/resources/help/en/images/leftindent.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 101 B

BIN
apps/documenteditor/main/resources/help/en/images/nextfootnote.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 160 B

BIN
apps/documenteditor/main/resources/help/en/images/previousfootnote.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 166 B

BIN
apps/documenteditor/main/resources/help/en/images/right_table.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
apps/documenteditor/main/resources/help/en/images/shape_properties.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
apps/documenteditor/main/resources/help/en/images/shape_properties_1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
apps/documenteditor/main/resources/help/en/images/shape_properties_2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
apps/documenteditor/main/resources/help/en/images/shape_properties_3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
apps/documenteditor/main/resources/help/en/images/shape_properties_4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Some files were not shown because too many files have changed in this diff Show more