Merge branch 'release/v7.3.0' of https://github.com/ONLYOFFICE/web-apps into release/v7.3.0

apps/documenteditor/main/app/controller/Main.js

@@ -148,7 +148,8 @@ define([
                     "None": this.txtNone,
                     "No table of figures entries found.": this.txtNoTableOfFigures,
                     "table of figures": this.txtTableOfFigures,
-                    "TOC Heading": this.txtTOCHeading
+                    "TOC Heading": this.txtTOCHeading,
+                    "Anyone": this.textAnyone
                 };
                 styleNames.forEach(function(item){
                     translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
@@ -3372,7 +3373,8 @@ define([
             errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
             errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.',
             errorCannotPasteImg: 'We can\'t paste this image from the Clipboard, but you can save it to your device and \ninsert it from there, or you can copy the image without text and paste it into the document.',
-            textTryQuickPrint: 'You have selected Quick print: the entire document will be printed on the last selected or default printer.<br>Do you want to continue?'
+            textTryQuickPrint: 'You have selected Quick print: the entire document will be printed on the last selected or default printer.<br>Do you want to continue?',
+            textAnyone: 'Anyone'
         }
     })(), DE.Controllers.Main || {}))
 });

apps/documenteditor/main/app/view/FormSettings.js

@@ -1534,7 +1534,7 @@ define([
                             checkable: true
                         }), {caption: '--'}],
                     menu        : true,
-                    colors: ['FEF8E5', 'FFEFBF', 'E2EFD8', 'C6E0B3', 'EDEDED', 'DBDBDB', 'CDD6E4', 'A2B2CA', '800000', 'FF6600', 'F2F2F2', 'D9D9D9', 'DDEBF6', 'C2DDF2', 'FBECE2',
+                    colors: ['FEF8E5', 'FFEFBF', 'E2EFD8', 'C6E0B3', 'EDEDED', 'DBDBDB', 'CDD6E4', 'A2B2CA', 'F2F2F2', 'D9D9D9', 'DDEBF6', 'C2DDF2', 'FBECE2',
                             'F7D9C6', 'D6E3EE', 'B9CAE7', 'F2DADA', 'F2C2C2', 'F0DDF6', 'E5C2F2', 'E6FBD6', 'CDF7AC', 'EED6D6', 'E7B9B9', 'CCE1FF', '9AC4FF', 'E4CDDB', 'D9ADC7'],
                     dataHint: '1',
                     dataHintDirection: 'bottom',

apps/documenteditor/main/app/view/RoleEditDlg.js

@@ -72,7 +72,7 @@ define([
 
             this.options.tpl = _.template(this.template)(this.options);
             this.props = this.options.props;
-            this.lastColor = 'C9C8FF';
+            this.lastColor = 'CCE1FF';
             this.oformManager = this.options.oformManager;
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
@@ -111,7 +111,7 @@ define([
                                   }),
                                   {caption: '--'}],
                 additionalAlign: this.menuAddAlign,
-                colors: ['FEF8E5', 'FFEFBF', 'E2EFD8', 'C6E0B3', 'EDEDED', 'DBDBDB', 'CDD6E4', 'A2B2CA', '800000', 'FF6600', 'F2F2F2', 'D9D9D9', 'DDEBF6', 'C2DDF2', 'FBECE2',
+                colors: ['FEF8E5', 'FFEFBF', 'E2EFD8', 'C6E0B3', 'EDEDED', 'DBDBDB', 'CDD6E4', 'A2B2CA', 'F2F2F2', 'D9D9D9', 'DDEBF6', 'C2DDF2', 'FBECE2',
                         'F7D9C6', 'D6E3EE', 'B9CAE7', 'F2DADA', 'F2C2C2', 'F0DDF6', 'E5C2F2', 'E6FBD6', 'CDF7AC', 'EED6D6', 'E7B9B9', 'CCE1FF', '9AC4FF', 'E4CDDB', 'D9ADC7'],
                 color: this.lastColor,
                 cls: 'move-focus',
@@ -164,6 +164,7 @@ define([
                 this.btnColor.setColor(this.lastColor);
                 this.mnuColorPicker.selectByRGB(this.lastColor, true);
             } else {
+                this.btnColor.setColor('transparent');
                 this.mnuColorPicker.clearSelection();
             }
         },

apps/documenteditor/main/app/view/RolesManagerDlg.js

@@ -250,23 +250,15 @@ define([  'text!documenteditor/main/app/template/RolesManagerDlg.template',
 
             if (!rec) return;
 
-            if (store.length===1 && rec.get('fields')>0) {
-                Common.UI.warning({
-                    msg: me.warnCantDelete,
-                    buttons: ['ok']
-                });
-                return;
-            }
-
             var callback = function(toRole) {
                 me.lastSelectedRole = store.indexOf(rec);
                 me.oformManager.asc_removeRole(rec.get('name'), toRole); // remove role and move it's fields
             };
 
-            if (rec.get('fields')<1) {
+            if (store.length===1 || rec.get('fields')<1) {
                 me._isWarningVisible = true;
                 Common.UI.warning({
-                    msg: Common.Utils.String.format(me.warnDelete, rec.get('name')),
+                    msg: Common.Utils.String.format(store.length===1 ? me.textDeleteLast : me.warnDelete, rec.get('name')),
                     buttons: ['ok', 'cancel'],
                     callback: function(btn) {
                         if (btn == 'ok') {
@@ -366,7 +358,8 @@ define([  'text!documenteditor/main/app/template/RolesManagerDlg.template',
         textUp: 'Move role up',
         textDown: 'Move role down',
         textDescription: 'Add roles and set the order in which the fillers receive and sign the document',
-        textAnyone: 'Anyone'
+        textAnyone: 'Anyone',
+        textDeleteLast: 'Are you sure you want to delete the role {0}?<br>Once deleted, the default role will be created.'
 
     }, DE.Views.RolesManagerDlg || {}));
 });

apps/documenteditor/main/locale/en.json

@@ -819,6 +819,7 @@
   "DE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.",
   "DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.",
   "DE.Controllers.Main.textAnonymous": "Anonymous",
+  "DE.Controllers.Main.textAnyone": "Anyone",
   "DE.Controllers.Main.textApplyAll": "Apply to all equations",
   "DE.Controllers.Main.textBuyNow": "Visit website",
   "DE.Controllers.Main.textChangesSaved": "All changes saved",
@@ -2697,6 +2698,7 @@
   "DE.Views.RolesManagerDlg.txtTitle": "Manage Roles",
   "DE.Views.RolesManagerDlg.warnCantDelete": "You cannot delete this role because it has associated fields.",
   "DE.Views.RolesManagerDlg.warnDelete": "Are you sure you want to delete the role {0}?",
+  "DE.Views.RolesManagerDlg.textDeleteLast": "Are you sure you want to delete the role {0}?<br>Once deleted, the default role will be created.",
   "DE.Views.SaveFormDlg.saveButtonText": "Save",
   "DE.Views.SaveFormDlg.textAnyone": "Anyone",
   "DE.Views.SaveFormDlg.textDescription": "When saving to the oform, only roles with fields are added to the filling list",

apps/documenteditor/main/locale/ru.json

@@ -819,6 +819,7 @@
   "DE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1.",
   "DE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1.",
   "DE.Controllers.Main.textAnonymous": "Аноним",
+  "DE.Controllers.Main.textAnyone": "Любой",
   "DE.Controllers.Main.textApplyAll": "Применить ко всем уравнениям",
   "DE.Controllers.Main.textBuyNow": "Перейти на сайт",
   "DE.Controllers.Main.textChangesSaved": "Все изменения сохранены",