diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js
index 612729bb2..ad69d208f 100644
--- a/apps/common/main/lib/component/ComboBox.js
+++ b/apps/common/main/lib/component/ComboBox.js
@@ -146,7 +146,7 @@ define([
scope : me
}));
if (this.itemsTemplate)
- this.cmpEl.find('ul').append(
+ this.cmpEl.find('ul').html(
$(this.itemsTemplate({
items : items,
scope : me
diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less
index c3ef9c3fc..4f446d5df 100644
--- a/apps/common/main/resources/less/layout.less
+++ b/apps/common/main/resources/less/layout.less
@@ -49,7 +49,7 @@
}
> .layout-resizer {
- width: 4px;
+ width: 2px;
cursor: col-resize;
&.move {
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 810557e60..0049fce41 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -3239,6 +3239,17 @@ define([
caption : '--'
});
+ var menuParaRefreshField = new Common.UI.MenuItem({
+ caption: me.textRefreshField
+ }).on('click', function(item, e){
+ me.api.asc_UpdateComplexField(item.options.fieldProps);
+ me.fireEvent('editcomplete', me);
+ });
+
+ var menuParaFieldSeparator = new Common.UI.MenuItem({
+ caption : '--'
+ });
+
this.textMenu = new Common.UI.Menu({
initMenu: function(value){
var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties()));
@@ -3353,6 +3364,14 @@ define([
menuParaTOCSettings.setVisible(in_toc);
menuParaTOCRefresh.setVisible(in_toc);
menuParaTOCSeparator.setVisible(in_toc);
+
+ var in_field = me.api.asc_GetCurrentComplexField();
+ menuParaRefreshField.setVisible(!!in_field);
+ menuParaRefreshField.setDisabled(disabled);
+ menuParaFieldSeparator.setVisible(!!in_field);
+ if (in_field) {
+ menuParaRefreshField.options.fieldProps = in_field;
+ }
},
items: [
me.menuSpellPara,
@@ -3370,6 +3389,8 @@ define([
menuParaRemoveControl,
menuParaControlSettings,
menuParaControlSeparator,
+ menuParaRefreshField,
+ menuParaFieldSeparator,
menuParaTOCSettings,
menuParaTOCRefresh,
menuParaTOCSeparator,
@@ -3701,7 +3722,8 @@ define([
textUpdateAll: 'Refresh entire table',
textUpdatePages: 'Refresh page numbers only',
textTOCSettings: 'Table of contents settings',
- textTOC: 'Table of contents'
+ textTOC: 'Table of contents',
+ textRefreshField: 'Refresh field'
}, DE.Views.DocumentHolder || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less
index 1215b908d..38e3d28a7 100644
--- a/apps/documenteditor/main/resources/less/layout.less
+++ b/apps/documenteditor/main/resources/less/layout.less
@@ -39,7 +39,7 @@ label {
top:0;
right: 0;
bottom: 0;
- background-color: #f4f4f4;
+ background-color: @gray-light;
overflow: hidden;
}
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 6e08bd8a0..b8516bb34 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -1,5 +1,5 @@
-@tabs-bg-color: #4f6279;
+@tabs-bg-color: #446995;
.toolbar {
&:not(.cover) {
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index d151a4946..fb734334e 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -146,7 +146,8 @@ define([
'Table': this.txtSldLtTTbl,
'Slide title': this.txtSlideTitle,
'Loading': this.txtLoading,
- 'Click to add notes': this.txtAddNotes
+ 'Click to add notes': this.txtAddNotes,
+ 'Click to add first slide': this.txtAddFirstSlide
}
});
@@ -2006,7 +2007,8 @@ define([
txtLoading: 'Loading...',
txtAddNotes: 'Click to add notes',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.',
- errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
+ errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
+ txtAddFirstSlide: 'Click to add first slide'
}
})(), PE.Controllers.Main || {}))
});
diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template
index 6e6bd8ad3..898b9759f 100644
--- a/apps/presentationeditor/main/app/template/StatusBar.template
+++ b/apps/presentationeditor/main/app/template/StatusBar.template
@@ -2,7 +2,7 @@