From d239ff5831ccd852a6d7856773742e6ae9e46587 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Mon, 14 Feb 2022 05:56:29 +0300 Subject: [PATCH 01/11] Update for DE --- .../main/app/view/FileMenuPanels.js | 299 +++++++++++------- .../main/resources/less/filemenu.less | 4 +- 2 files changed, 178 insertions(+), 125 deletions(-) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 9572efa4a..326865b68 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -232,93 +232,110 @@ define([ template: _.template([ '
', '', - /** coauthoring begin **/ - '', - '', - '', - '','', - '', - '', - '', - '','', - /** coauthoring end **/ - '', - '', - '', - '','', - '', - '', - '', - '','', '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', + '', + '', '', - '', '', - '','', - '', - '', - '', - '','', - /** coauthoring begin **/ + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', '', '', - '', - '','', - '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', '', - '', - '','', - /** coauthoring end **/ + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + + '
', - '
', - '
', + '
', + '', + '
', + '
', + '', + '
', + '', '', '', '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', + '', '', '', '', - '','', - '', - '', - '', - '','', + '', + '', + '', + '', + '', + '', + '', + '', + '', '', '', '', - '','', - '', - '', - '', '', '
', '
', '
', '
', '
', + '
', '' @@ -579,13 +578,16 @@ define([ { value: 0, displayValue: this.txtWarnMacros, descValue: this.txtWarnMacrosDesc }, { value: 1, displayValue: this.txtRunMacros, descValue: this.txtRunMacrosDesc } ], + itemsTemplate: _.template([ + '<% _.each(items, function(item) { %>', + '
  • ', + '
    • ', + '<% }); %>' + ].join('')), dataHint: '2', dataHintDirection: 'bottom', dataHintOffset: 'big' - }).on('selected', function(combo, record) { - me.lblMacrosDesc.text(record.descValue); }); - this.lblMacrosDesc = $markup.findById('#fms-lbl-macros'); this.chPaste = new Common.UI.CheckBox({ el: $markup.findById('#fms-chb-paste-settings'), @@ -767,7 +769,6 @@ define([ item = this.cmbMacros.store.findWhere({value: Common.Utils.InternalSettings.get("de-macros-mode")}); this.cmbMacros.setValue(item ? item.get('value') : 0); - this.lblMacrosDesc.text(item ? item.get('descValue') : this.txtWarnMacrosDesc); this.chPaste.setValue(Common.Utils.InternalSettings.get("de-settings-paste-button")); diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index a8b8b8150..e3a4f4fb0 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -123,30 +123,46 @@ #panel-settings { table { - width: 100%; + width: 500px; tr { - td { - padding: 5px 10px; - - &.left { - //text-align: right; - width: 30%; - + padding: 6px 10px; + &.group-name { + padding-top: 22px; + &.top{padding-top: 5px} label { + font-size: 14px; .font-weight-bold(); - font-size: 12px; } } - &.right { - width: 70%; + &.subgroup-name label{ + font-size: 11px; + .font-weight-bold(); } + + .comment-text{ + opacity: 0.45; + } + } + + &.left { + text-align: right; + width: 30%; + label { + .font-weight-bold(); + font-size: 12px; + } + } + + &.right { + width: 70%; } &.divider { height: 10px; } + } } } From ddbf060303161a2dce5238c400f6d4a99d586c9f Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 16 Feb 2022 02:12:31 +0300 Subject: [PATCH 03/11] Update for SE --- .../main/app/template/FileMenu.template | 2 +- .../main/app/view/FileMenu.js | 2 +- .../main/app/view/FileMenuPanels.js | 490 +- .../main/resources/less/leftmenu.less | 27 +- build/package-lock.json | 7882 +++++++++++++++++ 5 files changed, 8182 insertions(+), 221 deletions(-) create mode 100644 build/package-lock.json diff --git a/apps/spreadsheeteditor/main/app/template/FileMenu.template b/apps/spreadsheeteditor/main/app/template/FileMenu.template index 8071eaded..a52e7980e 100644 --- a/apps/spreadsheeteditor/main/app/template/FileMenu.template +++ b/apps/spreadsheeteditor/main/app/template/FileMenu.template @@ -31,7 +31,7 @@
    -
    +
    diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index 73ed419df..a68d507a3 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -336,7 +336,7 @@ define([ if (!this.panels) { this.panels = { - 'opts' : (new SSE.Views.FileMenuPanels.Settings({menu:this})).render(this.$el.find('#panel-settings')), + 'opts' : (new SSE.Views.FileMenuPanels.MainSettingsGeneral({menu:this})).render(this.$el.find('#panel-settings-general')), 'info' : (new SSE.Views.FileMenuPanels.DocumentInfo({menu:this})).render(this.$el.find('#panel-info')), 'rights' : (new SSE.Views.FileMenuPanels.DocumentRights({menu:this})).render(this.$el.find('#panel-rights')) }; diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 15f1ebc11..2148ca59c 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -284,93 +284,133 @@ define([ template: _.template([ '
    ', '
    ', - '', - /** coauthoring begin **/ - '', - '', - '', - '','', - '', - '', - '', - '','', + '
    ', + '', + '', + '', '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', - /** coauthoring end **/ - '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', + '', + '', '', - '', - '', + '', + /** coauthoring begin **/ + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + /** coauthoring end **/ + '', + '', + '', + '', + //'', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', - '','', - '', - '', - '', + '', + '', + '', - '','', - '', - '', - '', '', - '', - '', - '', + '', + '', '', - '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + + '', + '', + '', + '', + '', + '', + '', + '', + /** coauthoring begin **/ + + + + '', + '', + '', + '', + '', - '', - '', + '', + '', '', '
    ', - '
    ', - '
    ', + '
    ', + '
    ', + '', + '', + '
    ', + '
    ', + '', + '', + '
    ', + '
    ', + '
    ', '
    ', '
    ', + '
    ', '
    ', '
    ', - '
    ', - '
    ', '
    ', '