From be66e0fcf0f40c77fbfcb3d6ca5f1b99919f9fa3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 21 Jun 2022 10:42:57 +0300 Subject: [PATCH] [SSE] Refactoring --- apps/spreadsheeteditor/main/app/template/FileMenu.template | 2 +- apps/spreadsheeteditor/main/app/view/FileMenu.js | 2 +- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 2 +- apps/spreadsheeteditor/main/resources/less/leftmenu.less | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/template/FileMenu.template b/apps/spreadsheeteditor/main/app/template/FileMenu.template index a52e7980e7..8071eaded0 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 a1f6f05203..9d29b673ec 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.MainSettingsGeneral({menu:this})).render(this.$el.find('#panel-settings-general')), + 'opts' : (new SSE.Views.FileMenuPanels.MainSettingsGeneral({menu:this})).render(this.$el.find('#panel-settings')), '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 45132c47c8..c24d16580a 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -183,7 +183,7 @@ define([ }); SSE.Views.FileMenuPanels.MainSettingsGeneral = Common.UI.BaseView.extend(_.extend({ - el: '#panel-settings-general', + el: '#panel-settings', menu: undefined, template: _.template([ diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index fc7d33bf13..8fdd8b6a1f 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -188,8 +188,7 @@ } } - #panel-settings-general, - #panel-settings-print { + #panel-settings { & > div { width: 100%; height: 100%; @@ -205,7 +204,7 @@ flex-direction: column; } - #panel-settings-general { + #panel-settings { padding: 0; #id-settings-menu {