From abb23f145ec9cf3cf3698110e5dff1120e4509e8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 2 Oct 2023 12:24:36 +0300 Subject: [PATCH 1/7] Set auto height for advanced settings dialog --- .../main/resources/less/advanced-settings-window.less | 4 ++++ .../main/app/view/ExternalLinksDlg.js | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/common/main/resources/less/advanced-settings-window.less b/apps/common/main/resources/less/advanced-settings-window.less index 73c6ae6621..529221c8e9 100644 --- a/apps/common/main/resources/less/advanced-settings-window.less +++ b/apps/common/main/resources/less/advanced-settings-window.less @@ -46,6 +46,10 @@ } } + &.auto .body { + padding-bottom: 15px; + } + .footer { padding: 15px 15px 0; diff --git a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js index 8260424c97..07fcc543a5 100644 --- a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js @@ -51,7 +51,7 @@ define([ options: { alias: 'ExternalLinksDlg', contentWidth: 500, - height: 294, + height: 'auto', buttons: null }, @@ -60,7 +60,7 @@ define([ _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
', '
', '', @@ -73,7 +73,7 @@ define([ '', '', '', - '', '', @@ -84,7 +84,8 @@ define([ '
', '', '
' - ].join('') + ].join(''), + cls: 'advanced-settings-dlg auto' }, options); this.api = options.api; @@ -98,7 +99,6 @@ define([ this.wrapEvents = { onUpdateExternalReferenceList: _.bind(this.refreshList, this) }; - Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); }, render: function () { From c323980f632adbe085d8db8b81fd6522846ab716 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Oct 2023 21:45:04 +0300 Subject: [PATCH 2/7] Set auto-height for advanced settings windows --- .../main/lib/view/AdvancedSettingsWindow.js | 29 +++++++++++++++---- .../less/advanced-settings-window.less | 6 ++-- .../main/app/view/BookmarksDialog.js | 3 +- .../main/app/view/CaptionDialog.js | 3 +- .../main/app/view/MailMergeEmailDlg.js | 5 ++-- .../main/app/view/NoteSettingsDialog.js | 3 +- .../main/app/view/RolesManagerDlg.js | 3 +- .../main/app/view/SaveFormDlg.js | 3 +- .../main/app/view/TextToTableDialog.js | 6 ++-- .../main/app/view/WatermarkSettingsDialog.js | 3 +- .../main/app/view/HeaderFooterDialog.js | 4 +-- .../template/FormatRulesManagerDlg.template | 2 +- .../main/app/template/NameManagerDlg.template | 2 +- .../app/template/ProtectRangesDlg.template | 2 +- .../ProtectedRangesManagerDlg.template | 2 +- .../main/app/template/SortDialog.template | 2 +- .../main/app/template/WatchDialog.template | 2 +- .../main/app/view/ChartDataDialog.js | 5 ++-- .../main/app/view/ChartTypeDialog.js | 4 +-- .../main/app/view/CreatePivotDialog.js | 5 ++-- .../main/app/view/CreateSparklineDialog.js | 7 ++--- .../main/app/view/ExternalLinksDlg.js | 8 ++--- .../main/app/view/FormatRulesEditDlg.js | 6 ++-- .../main/app/view/FormatRulesManagerDlg.js | 3 +- .../main/app/view/ImportFromXmlDialog.js | 7 ++--- .../main/app/view/MacroDialog.js | 5 ++-- .../main/app/view/NameManagerDlg.js | 3 +- .../main/app/view/NamedRangeEditDlg.js | 11 ++++--- .../main/app/view/NamedRangePasteDlg.js | 7 ++--- .../main/app/view/ProtectRangesDlg.js | 3 +- .../app/view/ProtectedRangesManagerDlg.js | 3 +- .../main/app/view/SortDialog.js | 3 +- .../main/app/view/SortOptionsDialog.js | 5 ++-- .../main/app/view/SpecialPasteDialog.js | 5 ++-- .../main/app/view/ValueFieldSettingsDialog.js | 9 +++--- .../main/app/view/ViewManagerDlg.js | 3 +- .../main/app/view/WatchDialog.js | 3 +- 37 files changed, 91 insertions(+), 94 deletions(-) diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index 32e60c7f3d..34ebd30b67 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -45,7 +45,7 @@ define([ initialize : function(options) { var _options = {}; _.extend(_options, { - height: 200, + height: 'auto', header: true, cls: 'advanced-settings-dlg', toggleGroup: 'advanced-settings-group', @@ -55,7 +55,7 @@ define([ }, options); this.template = options.template || [ - '
', + '
', '
', '<% _.each(items, function(item) { %>', '', @@ -105,6 +105,15 @@ define([ cnt_panel.width(this.contentWidth); $window.width(((menu_panel.length>0) ? menu_panel.width() : 0) + cnt_panel.outerWidth() + 2); + if (this.options.contentHeight) { + $window.find('.body > .box').css('height', this.options.contentHeight); + } else if (typeof this.options.height === 'number') { + var bodyEl = $window.find('.body'), + hfHeight = parseInt($window.find('.header').css('height')) + parseInt($window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom')) + + parseInt($window.css('border-bottom-width')) + parseInt($window.css('border-top-width')); + $window.find('.body > .box').css('height', this.options.height - hfHeight); + } + this.content_panels = $window.find('.settings-panel'); if (this.btnsCategory.length>0) this.btnsCategory[0].toggle(true, true); @@ -113,10 +122,20 @@ define([ setHeight: function(height) { Common.UI.Window.prototype.setHeight.call(this, height); - var $window = this.getChild(); - var boxEl = $window.find('.body > .box'); + var $window = this.getChild(), + bodyEl = $window.find('.body'), + footerHeight = parseInt($window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom')); + $window.find('.body > .box').css('height', parseInt(bodyEl.css('height')) - footerHeight); + }, - boxEl.css('height', height - 85); + setInnerHeight: function(height) { // height of box element + var $window = this.getChild(), + bodyEl = $window.find('.body'), + hfHeight = parseInt($window.find('.header').css('height')) + parseInt($window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom')) + + parseInt($window.css('border-bottom-width')) + parseInt($window.css('border-top-width')); + + Common.UI.Window.prototype.setHeight.call(this, height + hfHeight); + $window.find('.body > .box').css('height', height); }, onDlgBtnClick: function(event) { diff --git a/apps/common/main/resources/less/advanced-settings-window.less b/apps/common/main/resources/less/advanced-settings-window.less index 529221c8e9..dcb9e6d67d 100644 --- a/apps/common/main/resources/less/advanced-settings-window.less +++ b/apps/common/main/resources/less/advanced-settings-window.less @@ -44,10 +44,12 @@ padding-right: 10px; } } - } - &.auto .body { padding-bottom: 15px; + + &.no-footer { + padding-bottom: 0; + } } .footer { diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index b7b9befd6a..0451afc67e 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -50,7 +50,6 @@ define([ DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 320, - height: 366, buttons: null, id: 'window-bookmarks' }, @@ -61,7 +60,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', + '', '', '
', diff --git a/apps/documenteditor/main/app/view/CaptionDialog.js b/apps/documenteditor/main/app/view/CaptionDialog.js index b7b45793c1..276ed1b3b8 100644 --- a/apps/documenteditor/main/app/view/CaptionDialog.js +++ b/apps/documenteditor/main/app/view/CaptionDialog.js @@ -48,7 +48,6 @@ define([ DE.Views.CaptionDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 351, - height: 350, id: 'window-caption' }, @@ -58,7 +57,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js index 6ca003f8b4..4d8be5cfa2 100644 --- a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js +++ b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js @@ -45,15 +45,14 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template', DE.Views.MailMergeEmailDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { alias: 'MailMergeEmail', - contentWidth: 500, - height: 435 + contentWidth: 500 }, initialize : function(options) { _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', '
' diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js index f6353694d0..23a7ce466b 100644 --- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js +++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js @@ -48,7 +48,6 @@ define([ DE.Views.NoteSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 300, - height: 395, id: 'window-note-settings', buttons: null }, @@ -59,7 +58,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/RolesManagerDlg.js b/apps/documenteditor/main/app/view/RolesManagerDlg.js index 7e6c593297..c6fd3b0f6e 100644 --- a/apps/documenteditor/main/app/view/RolesManagerDlg.js +++ b/apps/documenteditor/main/app/view/RolesManagerDlg.js @@ -52,7 +52,6 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template', options: { alias: 'RolesManagerDlg', contentWidth: 500, - height: 353, buttons: null }, @@ -61,7 +60,7 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template', _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/SaveFormDlg.js b/apps/documenteditor/main/app/view/SaveFormDlg.js index 06fbb4f93a..e3ff378a61 100644 --- a/apps/documenteditor/main/app/view/SaveFormDlg.js +++ b/apps/documenteditor/main/app/view/SaveFormDlg.js @@ -51,7 +51,6 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow', options: { alias: 'SaveFormDlg', contentWidth: 320, - height: 280, buttons: null }, @@ -60,7 +59,7 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow', _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/TextToTableDialog.js b/apps/documenteditor/main/app/view/TextToTableDialog.js index d0b61b8fa2..874b394b24 100644 --- a/apps/documenteditor/main/app/view/TextToTableDialog.js +++ b/apps/documenteditor/main/app/view/TextToTableDialog.js @@ -45,9 +45,7 @@ define([ DE.Views.TextToTableDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 300, - height: 405, - buttons: ['ok', 'cancel'] + contentWidth: 300 }, initialize : function(options) { @@ -56,7 +54,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js index d2f91e21c6..7684f116c5 100644 --- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js @@ -76,7 +76,6 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', DE.Views.WatermarkSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 400, - height: 442, id: 'window-watermark' }, @@ -87,7 +86,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', title: this.textTitle, template: _.template( [ - '
', + '
', '
', '
', template, diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js index 69b482694c..40ce514ae9 100644 --- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js +++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js @@ -47,7 +47,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', PE.Views.HeaderFooterDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 360, - height: 415, + contentHeight: 330, buttons: null, id: 'window-header-footer' }, @@ -59,7 +59,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', title: this.textHFTitle, template: _.template( [ - '
', + '
', '
', '
', template, diff --git a/apps/spreadsheeteditor/main/app/template/FormatRulesManagerDlg.template b/apps/spreadsheeteditor/main/app/template/FormatRulesManagerDlg.template index b542fb59f7..f1ed78c871 100644 --- a/apps/spreadsheeteditor/main/app/template/FormatRulesManagerDlg.template +++ b/apps/spreadsheeteditor/main/app/template/FormatRulesManagerDlg.template @@ -19,7 +19,7 @@
- - diff --git a/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template b/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template index 0c69b43de8..4c07c123b8 100644 --- a/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ProtectRangesDlg.template @@ -19,7 +19,7 @@ - diff --git a/apps/spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.template b/apps/spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.template index 1ca643e112..130eca48b4 100644 --- a/apps/spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.template @@ -21,7 +21,7 @@ - diff --git a/apps/spreadsheeteditor/main/app/template/SortDialog.template b/apps/spreadsheeteditor/main/app/template/SortDialog.template index e41022c64a..53ec59030e 100644 --- a/apps/spreadsheeteditor/main/app/template/SortDialog.template +++ b/apps/spreadsheeteditor/main/app/template/SortDialog.template @@ -19,7 +19,7 @@ - diff --git a/apps/spreadsheeteditor/main/app/template/WatchDialog.template b/apps/spreadsheeteditor/main/app/template/WatchDialog.template index 0c555cef6c..0e226bd8b4 100644 --- a/apps/spreadsheeteditor/main/app/template/WatchDialog.template +++ b/apps/spreadsheeteditor/main/app/template/WatchDialog.template @@ -8,7 +8,7 @@ - diff --git a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js index e2e723aaa0..784ec2b9f5 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js @@ -49,7 +49,6 @@ define([ SSE.Views.ChartDataDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - height: 490, id: 'window-chart-data' }, @@ -59,7 +58,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
+
diff --git a/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template b/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template index fd60993267..d1b550e736 100644 --- a/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template +++ b/apps/spreadsheeteditor/main/app/template/NameManagerDlg.template @@ -13,7 +13,7 @@
+
+
+
+
+
', @@ -102,7 +101,7 @@ define([ '', '', '', - '', '', diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 724df9f466..e52fe6ed18 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -69,7 +69,7 @@ define([ SSE.Views.ChartTypeDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - height: 385 + contentHeight: 300 }, initialize : function(options) { @@ -78,7 +78,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', + '', '', '
', diff --git a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js index f1e97c4844..6126f40b4a 100644 --- a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js +++ b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js @@ -47,7 +47,6 @@ define([ SSE.Views.CreatePivotDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, - height: 250, id: 'window-create-pivot' }, @@ -57,7 +56,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', @@ -87,7 +86,7 @@ define([ '', '', '', - '', '', diff --git a/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js b/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js index 3c9fcdacdf..c573b152b0 100644 --- a/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js +++ b/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js @@ -45,8 +45,7 @@ define([ SSE.Views.CreateSparklineDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 310, - height: 195 + contentWidth: 310 }, initialize : function(options) { @@ -55,7 +54,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', + '', '
', '
', @@ -75,7 +74,7 @@ define([ '', '', '', - '', '', diff --git a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js index 07fcc543a5..75faef28e9 100644 --- a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js @@ -51,7 +51,6 @@ define([ options: { alias: 'ExternalLinksDlg', contentWidth: 500, - height: 'auto', buttons: null }, @@ -60,7 +59,7 @@ define([ _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
', '
', '
', + '', '
', '
', @@ -73,7 +72,7 @@ define([ '', '', '', - '', '', @@ -84,8 +83,7 @@ define([ '
', '', '
' - ].join(''), - cls: 'advanced-settings-dlg auto' + ].join('') }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index e426145df1..65aa86281b 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -51,7 +51,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', options: { alias: 'FormatRulesEditDlg', contentWidth: 491, - height: 445, + height: 'auto', id: 'window-format-rules' }, @@ -61,7 +61,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', _.extend(this.options, { title: this.txtTitleNew, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', '
' @@ -1499,7 +1499,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', (cmbData.length>0) && this.cmbRule.setValue((ruleType!==undefined) ? ruleType : cmbData[0].value); } this.setControls(index, this.cmbRule.getValue()); - this.setHeight(index==9 ? 445 : 355); + this.setInnerHeight(index==9 ? 360 : 270); if (rec) { var type = rec.get('type'); diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index 06e673eb90..e00e368aa3 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -91,7 +91,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa options: { alias: 'FormatRulesManagerDlg', contentWidth: 560, - height: 340, buttons: ['ok', 'cancel'] }, @@ -100,7 +99,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', ].join('') diff --git a/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js b/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js index fd09c73fa0..65780d9b7b 100644 --- a/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js @@ -46,8 +46,7 @@ define([ SSE.Views.ImportFromXmlDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 310, - height: 200 + contentWidth: 310 }, initialize : function(options) { @@ -56,7 +55,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', + '', '', '
', @@ -76,7 +75,7 @@ define([ '', '', '', - '', '', diff --git a/apps/spreadsheeteditor/main/app/view/MacroDialog.js b/apps/spreadsheeteditor/main/app/view/MacroDialog.js index 9f36ca3799..f9001a4b05 100644 --- a/apps/spreadsheeteditor/main/app/view/MacroDialog.js +++ b/apps/spreadsheeteditor/main/app/view/MacroDialog.js @@ -47,8 +47,7 @@ define([ SSE.Views.MacroDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 250, - height: 312 + contentWidth: 250 }, initialize : function(options) { @@ -57,7 +56,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', + '', '
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js index 75411cfeea..6356fd5113 100644 --- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js @@ -52,7 +52,6 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', options: { alias: 'NameManagerDlg', contentWidth: 540, - height: 330, buttons: null, id: 'window-name-manager' }, @@ -62,7 +61,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js index c6c32984d0..7d1e24d89b 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js @@ -50,8 +50,7 @@ define([ SSE.Views.NamedRangeEditDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { alias: 'NamedRangeEditDlg', - contentWidth: 380, - height: 250 + contentWidth: 380 }, initialize: function (options) { @@ -60,7 +59,7 @@ define([ _.extend(this.options, { title: this.txtTitleNew, template: [ - '
', + '
', '
', '
', '
', @@ -81,10 +80,14 @@ define([ '', '', '', - '', '', + '', + '', + '', '
', + '', '
', '
', + '
', '
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js index 42c3912d28..863d4b6b79 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js @@ -49,8 +49,7 @@ define([ SSE.Views.NamedRangePasteDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { alias: 'NamedRangePasteDlg', - contentWidth: 250, - height: 282 + contentWidth: 250 }, initialize: function (options) { @@ -59,12 +58,12 @@ define([ _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
', '
', '', '', - '', diff --git a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js index 7dc311b38c..fbc62b9fda 100644 --- a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js @@ -50,7 +50,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectRangesDlg.template', options: { alias: 'ProtectRangesDlg', contentWidth: 480, - height: 333, id: 'window-protect-ranges' }, @@ -59,7 +58,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectRangesDlg.template', _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', ].join(''), diff --git a/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js index 140d0ae625..a9a3f3b1a5 100644 --- a/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js @@ -51,7 +51,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.te options: { alias: 'ProtectedRangesManagerDlg', contentWidth: 490, - height: 365, buttons: null }, @@ -60,7 +59,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.te _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index 346f563f13..4afea89969 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -74,7 +74,6 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', options: { alias: 'SortDialog', contentWidth: 560, - height: 315, buttons: ['ok', 'cancel'] }, @@ -83,7 +82,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
' ].join('') diff --git a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js index aa0711f1bd..06b1660608 100644 --- a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js @@ -46,8 +46,7 @@ define([ SSE.Views.SortOptionsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 230, - height: 200 + contentWidth: 230 }, initialize : function(options) { @@ -56,7 +55,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', + '', '', '
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js index 9225804e63..13424c5470 100644 --- a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js @@ -47,8 +47,7 @@ define([ SSE.Views.SpecialPasteDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 350, - height: 385 + contentWidth: 350 }, initialize : function(options) { @@ -57,7 +56,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js index ccdc568aea..a161b59c17 100644 --- a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js @@ -48,8 +48,7 @@ define([ SSE.Views.ValueFieldSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 284, - height: 320 + contentWidth: 284 }, initialize : function(options) { @@ -58,7 +57,7 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', '
', @@ -88,11 +87,11 @@ define([ '', '', '', - '', - '', diff --git a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js index 136d6974da..a193c40209 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js @@ -53,7 +53,6 @@ define([ options: { alias: 'ViewManagerDlg', contentWidth: 460, - height: 330, buttons: null }, @@ -62,7 +61,7 @@ define([ _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
', '
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/WatchDialog.js b/apps/spreadsheeteditor/main/app/view/WatchDialog.js index 55c2828812..46f75d4d82 100644 --- a/apps/spreadsheeteditor/main/app/view/WatchDialog.js +++ b/apps/spreadsheeteditor/main/app/view/WatchDialog.js @@ -51,7 +51,6 @@ define([ 'text!spreadsheeteditor/main/app/template/WatchDialog.template', options: { alias: 'WatchDialog', contentWidth: 560, - height: 294, modal: false, buttons: null }, @@ -61,7 +60,7 @@ define([ 'text!spreadsheeteditor/main/app/template/WatchDialog.template', _.extend(this.options, { title: this.txtTitle, template: [ - '
', + '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', '
', From 6e85d5a00ad44eb51b53e41079a106c2782446f6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 18 Oct 2023 18:39:33 +0300 Subject: [PATCH 3/7] Fix for ie11 --- apps/common/main/resources/less/asc-mixins.less | 6 ++++++ .../main/app/template/ImageSettingsAdvanced.template | 4 ++-- .../main/app/template/ParagraphSettingsAdvanced.template | 4 ++-- .../main/app/template/ImageSettingsAdvanced.template | 4 ++-- .../main/app/template/ImageSettingsAdvanced.template | 4 ++-- .../main/app/view/ProtectedRangesEditDlg.js | 1 + 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 7d940f0759..1ae61b6c08 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -815,6 +815,12 @@ .padding-right(40px); } +.vertical-align-baseline { + vertical-align: baseline; + .ie & { + vertical-align: middle; + } +} //.adaptive-solid-border(@width, @color, @borderside: all) { // @lb-border: if((@borderside = all), border, e('border-@{borderside}')); // @lb-border-width: if((@borderside = all), border-width, e('border-@{borderside}-width')); diff --git a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template index 5d5b7d386f..fe350ac5c1 100644 --- a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template @@ -93,8 +93,8 @@
- -
+ +
diff --git a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template index 4106b1a45b..8790e981e1 100644 --- a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template @@ -165,8 +165,8 @@
- -
+ +
diff --git a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template index dd1779a0cd..ca967b0c18 100644 --- a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template @@ -69,8 +69,8 @@
- -
+ +
diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template index 027d607b09..efdba0c69b 100644 --- a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template @@ -1,8 +1,8 @@
- -
+ +
diff --git a/apps/spreadsheeteditor/main/app/view/ProtectedRangesEditDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectedRangesEditDlg.js index b24d2d95d3..8332293f1b 100644 --- a/apps/spreadsheeteditor/main/app/view/ProtectedRangesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ProtectedRangesEditDlg.js @@ -309,6 +309,7 @@ define([ }, onUserChanging: function(combo, newValue) { + if (Common.Utils.isIE && newValue==='' && this._userStr === newValue) return; this._userStr = newValue; this.onUserMenu(); }, From 20a4b75beffa4c879270a2674804df036f3d7777 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Oct 2023 15:39:59 +0300 Subject: [PATCH 4/7] Fix height for advanced settings dialogs --- .../common/main/lib/view/AutoCorrectDialog.js | 4 ++-- apps/common/main/lib/view/PluginDlg.js | 23 ++++++++++++------- .../less/advanced-settings-window.less | 5 ++-- .../main/app/view/ControlSettingsDialog.js | 2 +- .../main/app/view/DropcapSettingsAdvanced.js | 4 ++-- .../main/app/view/ImageSettingsAdvanced.js | 2 +- .../app/view/ParagraphSettingsAdvanced.js | 2 +- .../main/app/view/TableOfContentsSettings.js | 20 ++++++++-------- .../main/app/view/TableSettingsAdvanced.js | 2 +- .../resources/less/advanced-settings.less | 1 + .../main/app/view/ChartSettingsAdvanced.js | 2 +- .../main/app/view/ImageSettingsAdvanced.js | 2 +- .../app/view/ParagraphSettingsAdvanced.js | 2 +- .../main/app/view/ShapeSettingsAdvanced.js | 2 +- .../main/app/view/TableSettingsAdvanced.js | 2 +- .../main/app/template/ChartVertAxis.template | 4 ++-- .../main/app/template/PrintSettings.template | 8 +++---- .../main/app/view/ChartSettingsDlg.js | 2 +- .../main/app/view/DataValidationDialog.js | 2 +- .../main/app/view/FieldSettingsDialog.js | 2 +- .../main/app/view/FormatRulesEditDlg.js | 1 - .../main/app/view/FormatRulesManagerDlg.js | 3 +-- .../main/app/view/FormatSettingsDialog.js | 8 +++---- .../main/app/view/FormulaWizard.js | 8 ++++--- .../main/app/view/ImageSettingsAdvanced.js | 2 +- .../app/view/ParagraphSettingsAdvanced.js | 2 +- .../main/app/view/PivotSettingsAdvanced.js | 2 +- .../main/app/view/PrintSettings.js | 8 +++---- .../main/app/view/ShapeSettingsAdvanced.js | 2 +- .../main/app/view/SlicerSettingsAdvanced.js | 2 +- .../main/app/view/TableSettingsAdvanced.js | 2 +- 31 files changed, 71 insertions(+), 62 deletions(-) diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 26c327c1ca..c707a4a193 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -52,7 +52,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', Common.Views.AutoCorrectDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 375, - height: 430, + contentHeight: 345, buttons: null, toggleGroup: 'autocorrect-dialog-group' }, @@ -78,7 +78,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', storageName: this.appPrefix + 'autocorrect-dialog-category', items: items, template: [ - '
', + '
', '
', '<% _.each(items, function(item) { %>', '', diff --git a/apps/common/main/lib/view/PluginDlg.js b/apps/common/main/lib/view/PluginDlg.js index 7340b06781..851257c881 100644 --- a/apps/common/main/lib/view/PluginDlg.js +++ b/apps/common/main/lib/view/PluginDlg.js @@ -57,16 +57,15 @@ define([ automove: false }, options); - var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34; - if (!_options.header) header_footer -= 34; this.bordersOffset = 40; _options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width; - _options.height += header_footer; - _options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height; _options.cls += ' advanced-settings-dlg invisible-borders'; + (!_options.buttons || _.size(_options.buttons)<1) && (_options.cls += ' no-footer'); + _options.contentHeight = _options.height; + _options.height = 'auto'; this.template = [ - '
', + '
', '
', '
', '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>', @@ -84,13 +83,21 @@ define([ render: function() { Common.UI.Window.prototype.render.call(this); - this.$window.find('> .body').css({height: 'auto', overflow: 'hidden'}); + var bodyEl = this.$window.find('> .body'); + bodyEl.css({height: 'auto', overflow: 'hidden'}); this.boxEl = this.$window.find('.body > .box'); - this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34; - if (!this.options.header) this._headerFooterHeight -= 34; + + this._headerFooterHeight = this.options.header ? parseInt(this.$window.find('.header').css('height')) : 0; + if (this.options.buttons && _.size(this.options.buttons)>0) + this._headerFooterHeight += parseInt(this.$window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom')); this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width')))); + if (Common.Utils.innerHeight()-this.bordersOffset*2 < this.options.contentHeight + this._headerFooterHeight) { + this.options.contentHeight = Common.Utils.innerHeight()-this.bordersOffset*2 - this._headerFooterHeight; + this.boxEl.css('height', this.options.contentHeight); + } + this.$window.find('.header').prepend($('')); var iframe = document.createElement("iframe"); diff --git a/apps/common/main/resources/less/advanced-settings-window.less b/apps/common/main/resources/less/advanced-settings-window.less index dcb9e6d67d..771458aa04 100644 --- a/apps/common/main/resources/less/advanced-settings-window.less +++ b/apps/common/main/resources/less/advanced-settings-window.less @@ -46,8 +46,9 @@ } padding-bottom: 15px; - - &.no-footer { + } + &.no-footer { + .body { padding-bottom: 0; } } diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index af36dd8f49..ee926602e7 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -50,7 +50,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, - height: 405, + contentHeight: 320, toggleGroup: 'control-adv-settings-group', storageName: 'de-control-settings-adv-category' }, diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js index 6056c33124..9af5c815a0 100644 --- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js @@ -59,7 +59,7 @@ define([ DE.Views.DropcapSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 320, - height : 380, + contentHeight: 295, toggleGroup : 'dropcap-adv-settings-group', storageName: 'de-dropcap-settings-adv-category' }, @@ -702,7 +702,7 @@ define([ }, this); if (this.isFrame) - this.setHeight(500); + this.setInnerHeight(415); this.btnsCategory[(this.isFrame) ? 1 : 0].setVisible(false); if (this.storageName) { diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 53a14f9856..ab03525cb1 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -49,7 +49,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat DE.Views.ImageSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 340, - height: 485, + contentHeight: 400, toggleGroup: 'image-adv-settings-group', sizeOriginal: {width: 0, height: 0}, sizeMax: {width: 55.88, height: 55.88}, diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index c9c7de7c96..1aa3ed41fa 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -51,7 +51,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem DE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - height: 415, + contentHeight: 330, toggleGroup: 'paragraph-adv-settings-group', storageName: 'de-para-settings-adv-category' }, diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js index 6d7ab8f9aa..82281822d6 100644 --- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js +++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js @@ -48,19 +48,19 @@ define([ DE.Views.TableOfContentsSettings = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 500, - height: 460, + contentHeight: 375, id: 'window-table-contents' }, initialize : function(options) { var me = this; - var height = options.type ? 385 : 460; + var height = options.type ? 300 : 375; _.extend(this.options, { title: options.type ? this.textTitleTOF : this.textTitle, - height: height, + contentHeight: height, template: [ - '
', + '
', '
', '
', '
', + '', '', '
', '		', + '', '', '
', '
', @@ -81,8 +81,8 @@ define([ '', '', '', '', '', @@ -115,8 +115,8 @@ define([ '
', '<% } else { %>', '
', - '', - '
', + '', + '
', '
', '
', - '', - '
', + '', + '
', '
', @@ -130,8 +130,8 @@ define([ '<% } %>', '', '', '', '
', - '', - '
', + '', + '
', '
', diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index c8736a7f31..fbb15096a6 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -53,7 +53,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat DE.Views.TableSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 340, - height: 436, + contentHeight: 351, toggleGroup: 'table-adv-settings-group', storageName: 'de-table-settings-adv-category' }, diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less index 61ca58eeb1..77cdc1b459 100644 --- a/apps/documenteditor/main/resources/less/advanced-settings.less +++ b/apps/documenteditor/main/resources/less/advanced-settings.less @@ -41,6 +41,7 @@ } .canvas-box { + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; background-color: #fff; } diff --git a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js index 64acb63acf..2766f1d5bb 100644 --- a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js @@ -46,7 +46,7 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem PE.Views.ChartSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 300, - height: 342, + contentHeight: 257, toggleGroup: 'chart-adv-settings-group', properties: null, storageName: 'pe-chart-settings-adv-category', diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index de59d1ae68..a249b3d356 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -48,7 +48,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem options: { alias: 'ImageSettingsAdvanced', contentWidth: 340, - height: 342, + contentHeight: 257, sizeOriginal: {width: 0, height: 0}, sizeMax: {width: 55.88, height: 55.88}, storageName: 'pe-img-settings-adv-category' diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js index 52f8f16fce..15cf6aeacf 100644 --- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js @@ -49,7 +49,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced PE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - height: 394, + contentHeight: 309, toggleGroup: 'paragraph-adv-settings-group', storageName: 'pe-para-settings-adv-category' }, diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index 55e6f5a7f9..40a740f55b 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -48,7 +48,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem PE.Views.ShapeSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 300, - height: 342, + contentHeight: 257, toggleGroup: 'shape-adv-settings-group', sizeOriginal: {width: 0, height: 0}, sizeMax: {width: 55.88, height: 55.88}, diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js index 6f6020167d..c419096028 100644 --- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js @@ -47,7 +47,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem options: { alias: 'TableSettingsAdvanced', contentWidth: 280, - height: 385, + contentHeight: 300, storageName: 'pe-table-settings-adv-category', sizeMax: {width: 55.88, height: 55.88}, }, diff --git a/apps/spreadsheeteditor/main/app/template/ChartVertAxis.template b/apps/spreadsheeteditor/main/app/template/ChartVertAxis.template index a9192b7e07..d62f4138e2 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartVertAxis.template +++ b/apps/spreadsheeteditor/main/app/template/ChartVertAxis.template @@ -75,8 +75,8 @@
- -
+ +
diff --git a/apps/spreadsheeteditor/main/app/template/PrintSettings.template b/apps/spreadsheeteditor/main/app/template/PrintSettings.template index 4c46aab466..26358ff2aa 100644 --- a/apps/spreadsheeteditor/main/app/template/PrintSettings.template +++ b/apps/spreadsheeteditor/main/app/template/PrintSettings.template @@ -3,10 +3,10 @@
- -
- -
+ +
+ +
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index b4edaabd0c..3daa62420a 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -52,7 +52,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' SSE.Views.ChartSettingsDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 327, - height: 535, + contentHeight: 450, toggleGroup: 'chart-settings-dlg-group', storageName: 'sse-chart-settings-adv-category' }, diff --git a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js index d7358a8d24..2ce7f4d758 100644 --- a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js +++ b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js @@ -50,7 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ SSE.Views.DataValidationDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 320, - height: 330, + contentHeight: 245, toggleGroup: 'data-validation-group', storageName: 'sse-data-validation-category' }, diff --git a/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js index 9c121dd605..4a58559816 100644 --- a/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js @@ -50,7 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FieldSettingsDialog.templa SSE.Views.FieldSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 284, - height: 450, + contentHeight: 365, toggleGroup: 'pivot-field-settings-group', storageName: 'sse-pivot-field-settings-category' }, diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index 65aa86281b..74088a7ea5 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -51,7 +51,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', options: { alias: 'FormatRulesEditDlg', contentWidth: 491, - height: 'auto', id: 'window-format-rules' }, diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index e00e368aa3..06d72a6756 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -90,8 +90,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa SSE.Views.FormatRulesManagerDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { alias: 'FormatRulesManagerDlg', - contentWidth: 560, - buttons: ['ok', 'cancel'] + contentWidth: 560 }, initialize: function (options) { diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js index a075b52712..725085e273 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js @@ -48,7 +48,7 @@ define([ SSE.Views.FormatSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 284, - height: 340 + contentHeight: 255 }, initialize : function(options) { @@ -88,12 +88,12 @@ define([ this.props = options.props; this.linked = options.linked || false; - var height = this.linked ? 360 : 340; + var height = this.linked ? 275 : 255; _.extend(this.options, { title: this.textTitle, - height: height, + contentHeight: height, template: [ - '
', + '
', '
', '
', '', diff --git a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js index db9eb40631..87e56436ff 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js @@ -45,7 +45,7 @@ define([ SSE.Views.FormulaWizard = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 580, - height: 397 + contentHeight: 312 }, initialize : function(options) { @@ -53,10 +53,10 @@ define([ _.extend(this.options, { title: this.textTitle, template: [ - '
', + '
', '
', '
', - '
', + '
', '', '', '', - '', + '', '', '
', '', '
', @@ -122,6 +122,8 @@ define([ this.lblFormulaResult = $window.find('#formula-wizard-value'); this.lblFunctionResult = $window.find('#formula-wizard-lbl-val-func'); + this.contentPanel.find('.settings-panel > table').css('height', this.options.contentHeight - 7); + this._preventCloseCellEditor = false; this.afterRender(); diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js index 96afc3daf0..7500ee2a46 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js @@ -48,7 +48,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ImageSettingsAdvanced.temp SSE.Views.ImageSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 300, - height: 342, + contentHeight: 257, toggleGroup: 'image-adv-settings-group', properties: null, storageName: 'sse-image-settings-adv-category' diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js index e9f825a4f0..b745bbe09b 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -49,7 +49,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. SSE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - height: 394, + contentHeight: 309, toggleGroup: 'paragraph-adv-settings-group', storageName: 'sse-para-settings-adv-category' }, diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js index 2c4ff2e640..77b40ff82f 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js @@ -50,7 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp SSE.Views.PivotSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, - height: 440, + contentHeight: 355, toggleGroup: 'pivot-adv-settings-group', storageName: 'sse-pivot-adv-settings-category' }, diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js index c26001430c..ec0398acf3 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js @@ -50,7 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', options: { alias: 'PrintSettings', contentWidth: 280, - height: 513, + contentHeight: 468, buttons: null }, @@ -61,7 +61,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', _.extend(this.options, { title: (this.type == 'print') ? this.textTitle : this.textTitlePDF, template: [ - '
', + '
', '
', '
' + ((this.type == 'print') ? this.textPrintRange : this.textRange)+ '
', '
' + this.textSettings + '
', @@ -366,13 +366,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', if (!this.extended) { this.extended = true; this.panelDetails.css({'display': 'none'}); - this.setHeight(344); + this.setInnerHeight(259); btn.setCaption(this.textShowDetails); Common.localStorage.setItem("sse-hide-print-settings", 1); } else { this.extended = false; this.panelDetails.css({'display': 'block'}); - this.setHeight(553); + this.setInnerHeight(468); btn.setCaption(this.textHideDetails); Common.localStorage.setItem("sse-hide-print-settings", 0); } diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index 168d962747..00e296431b 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -48,7 +48,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp SSE.Views.ShapeSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 300, - height: 342, + contentHeight: 257, toggleGroup: 'shape-adv-settings-group', sizeOriginal: {width: 0, height: 0}, sizeMax: {width: 55.88, height: 55.88}, diff --git a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js index c4fd6e7dce..bbccdb6569 100644 --- a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js @@ -49,7 +49,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem SSE.Views.SlicerSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 330, - height: 435, + contentHeight: 350, toggleGroup: 'slicer-adv-settings-group', storageName: 'sse-slicer-settings-adv-category' }, diff --git a/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js index cb081e6d8d..455074be19 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js @@ -46,7 +46,7 @@ define([ 'text!spreadsheeteditor/main/app/template/TableSettingsAdvanced.temp SSE.Views.TableSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 300, - height: 342, + contentHeight: 257, toggleGroup: 'table-adv-settings-group', properties: null, storageName: 'sse-table-settings-adv-category' From 65ccb45c8457e58b1ff082b95b3793ccd5d2094b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Oct 2023 19:32:19 +0300 Subject: [PATCH 5/7] Refactoring modal dialogs --- .../lib/template/ExtendedColorDialog.template | 2 +- .../common/main/lib/view/CopyWarningDialog.js | 14 +----- .../main/lib/view/DocumentAccessDialog.js | 1 - .../main/lib/view/ExtendedColorDialog.js | 5 +-- apps/common/main/lib/view/ExternalEditor.js | 18 +++++--- .../common/main/lib/view/InsertTableDialog.js | 1 - apps/common/main/lib/view/OpenDialog.js | 39 ++++------------ apps/common/main/lib/view/PasswordDialog.js | 1 - apps/common/main/lib/view/ReviewChanges.js | 1 - apps/common/main/lib/view/SaveAsDlg.js | 1 - apps/common/main/lib/view/SelectFileDlg.js | 1 - .../resources/less/extended-color-picker.less | 18 +------- .../main/resources/less/opendialog.less | 22 +--------- apps/common/main/resources/less/window.less | 21 ++++----- .../main/app/view/CrossReferenceDialog.js | 1 - .../main/app/view/CustomColumnsDialog.js | 2 +- .../main/app/view/DateTimeDialog.js | 7 +-- .../main/app/view/HyphenationDialog.js | 3 +- .../main/app/view/LineNumbersDialog.js | 3 +- .../main/app/view/ListSettingsDialog.js | 2 +- .../main/app/view/NotesRemoveDialog.js | 1 - .../main/app/view/PageSizeDialog.js | 5 +-- .../main/app/view/StyleTitleDialog.js | 1 - .../main/app/view/TableFormulaDialog.js | 4 +- .../main/app/view/TableToTextDialog.js | 1 - .../main/app/view/AnimationDialog.js | 18 +++----- .../main/app/view/DateTimeDialog.js | 4 +- .../main/app/view/GridSettings.js | 9 ++-- .../main/app/view/SlideSizeSettings.js | 7 ++- .../main/app/view/SlideshowSettings.js | 7 ++- .../main/app/view/AutoFilterDialog.js | 44 +++++++------------ .../main/app/view/FormulaDialog.js | 5 +-- .../main/app/view/HeaderFooterDialog.js | 2 +- .../main/app/view/PageMarginsDialog.js | 7 ++- .../main/app/view/PivotGroupDialog.js | 4 +- .../main/app/view/PrintTitlesDialog.js | 5 +-- .../main/app/view/RemoveDuplicatesDialog.js | 5 +-- .../main/app/view/ScaleDialog.js | 1 - .../main/app/view/SlicerAddDialog.js | 2 +- .../main/resources/less/filterdialog.less | 33 ++++---------- .../main/resources/less/formuladialog.less | 21 --------- 41 files changed, 102 insertions(+), 247 deletions(-) diff --git a/apps/common/main/lib/template/ExtendedColorDialog.template b/apps/common/main/lib/template/ExtendedColorDialog.template index f0bfb0c049..29796da59e 100644 --- a/apps/common/main/lib/template/ExtendedColorDialog.template +++ b/apps/common/main/lib/template/ExtendedColorDialog.template @@ -1,4 +1,4 @@ -
+
diff --git a/apps/common/main/lib/view/CopyWarningDialog.js b/apps/common/main/lib/view/CopyWarningDialog.js index 747cbac4d0..7b6c8389ac 100644 --- a/apps/common/main/lib/view/CopyWarningDialog.js +++ b/apps/common/main/lib/view/CopyWarningDialog.js @@ -48,7 +48,6 @@ define([ Common.Views.CopyWarningDialog = Common.UI.Window.extend(_.extend({ options: { width : 500, - height : 325, cls : 'modal-dlg copy-warning', buttons: ['ok'] }, @@ -76,7 +75,7 @@ define([ '

' + this.textToPaste + '

', '
', '
', - '
', + '
', '
', '
' ].join(''); @@ -95,17 +94,6 @@ define([ }); this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); - this.autoSize(); - }, - - autoSize: function() { - var text_cnt = this.getChild('.box'), - footer = this.getChild('.footer'), - header = this.getChild('.header'), - body = this.getChild('.body'); - - body.height(parseInt(text_cnt.height()) + parseInt(footer.css('height'))); - this.setHeight(parseInt(body.css('height')) + parseInt(header.css('height'))); }, onBtnClick: function(event) { diff --git a/apps/common/main/lib/view/DocumentAccessDialog.js b/apps/common/main/lib/view/DocumentAccessDialog.js index 2a172447c8..35f568271c 100644 --- a/apps/common/main/lib/view/DocumentAccessDialog.js +++ b/apps/common/main/lib/view/DocumentAccessDialog.js @@ -48,7 +48,6 @@ define([ _.extend(_options, { title: this.textTitle, width: 600, - height: 536, header: true }, options); diff --git a/apps/common/main/lib/view/ExtendedColorDialog.js b/apps/common/main/lib/view/ExtendedColorDialog.js index f7e11d1110..c80c5cce19 100644 --- a/apps/common/main/lib/view/ExtendedColorDialog.js +++ b/apps/common/main/lib/view/ExtendedColorDialog.js @@ -48,7 +48,7 @@ define([ initialize : function(options) { Common.UI.Window.prototype.initialize.call(this, { - cls: 'extended-color-dlg', + cls: 'extended-color-dlg modal-dlg', tpl: this.tpl({ txtNew: this.textNew, txtCurrent: this.textCurrent, @@ -56,8 +56,7 @@ define([ txtCancel: this.cancelButtonText }), header: false, - width: 340, - height: 272 + width: 340 }); this.hexRe = /\s*#?([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)\s*/; diff --git a/apps/common/main/lib/view/ExternalEditor.js b/apps/common/main/lib/view/ExternalEditor.js index 4ab81feaa1..b1a1d3ffeb 100644 --- a/apps/common/main/lib/view/ExternalEditor.js +++ b/apps/common/main/lib/view/ExternalEditor.js @@ -55,21 +55,19 @@ define([ value = Common.localStorage.getItem(this.storageName + '-height'); value && (height = parseInt(value)); - var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top'); _.extend(_options, { width: width, - height: (_inner_height - height)<0 ? _inner_height : height, cls: 'advanced-settings-dlg', header: true, toolclose: 'hide', toolcallback: _.bind(this.onToolClose, this), resizable: true }, options); - - this._headerFooterHeight = 85; + // (!_options.buttons || _.size(_options.buttons)<1) && (_options.cls += ' no-footer'); + _options.contentHeight = height; this.template = [ - '
', + '
', '
', '
', '
', @@ -90,6 +88,16 @@ define([ render: function() { Common.UI.Window.prototype.render.call(this); this.boxEl = this.$window.find('.body > .box'); + var bodyEl = this.$window.find('> .body'); + this._headerFooterHeight = this.initConfig.header ? parseInt(this.$window.find('.header').css('height')) : 0; + this._headerFooterHeight += parseInt(this.$window.find('.footer').css('height')) + parseInt(bodyEl.css('padding-top')) + parseInt(bodyEl.css('padding-bottom')); + this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width')))); + + var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top'); + if (_inner_height < this.initConfig.contentHeight + this._headerFooterHeight) { + this.initConfig.contentHeight = _inner_height - this._headerFooterHeight; + this.boxEl.css('height', this.initConfig.contentHeight); + } this.btnSave = new Common.UI.Button({ el: this.$window.find('#id-btn-editor-apply'), diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js index e6a667e50e..4a14f1ef8e 100644 --- a/apps/common/main/lib/view/InsertTableDialog.js +++ b/apps/common/main/lib/view/InsertTableDialog.js @@ -47,7 +47,6 @@ define([ Common.Views.InsertTableDialog = Common.UI.Window.extend(_.extend({ options: { width: 230, - height: 157, style: 'min-width: 230px;', cls: 'modal-dlg', id: 'window-insert-table', diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index bbbae218a9..cf9984a904 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -52,38 +52,15 @@ define([ var t = this, _options = {}; - var width, height; - - if (options.preview) { - width = 414; - height = (options.type==Common.Utils.importTextType.Data) ? 385 : 277; - } else { - width = (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 280); - switch (options.type) { - case Common.Utils.importTextType.CSV: - case Common.Utils.importTextType.Paste: - case Common.Utils.importTextType.Columns: - height = 190; - break; - case Common.Utils.importTextType.Data: - height = 245; - break; - default: - height = options.warning ? 187 : 147; - break; - } - } - _.extend(_options, { closable : false, // true if save settings preview : options.preview, warning : options.warning, codepages : options.codepages, warningMsg : options.warningMsg, - width : width, - height : height, + width : options.preview ? 414 : (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 280), header : true, - cls : 'open-dlg', + cls : 'modal-dlg open-dlg', contentTemplate : '', toolcallback : _.bind(t.onToolClose, t), closeFile : false @@ -93,13 +70,13 @@ define([ this.txtOpenFile = options.txtOpenFile || this.txtOpenFile; this.template = options.template || [ - '
', + '
', '
', '<% if (type == Common.Utils.importTextType.DRM) { %>', '<% if (warning) { %>', '
', '
', - '
' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '
', + '
' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '
', '', '
', '
', @@ -111,7 +88,7 @@ define([ '<% } %>', '<% } else { %>', '<% if (codepages && codepages.length>0) { %>', - '
class="margin-right-10" style="width: 230px;display: inline-block;margin-bottom:15px;" <% } else { %> style="width: 100%;margin-bottom:15px;"<% } %> >', + '
class="margin-right-10" style="width: 230px;display: inline-block;" <% } else { %> style="width: 100%;"<% } %> >', '', '
', '
', @@ -119,7 +96,7 @@ define([ '
', '<% } %>', '<% if (type == Common.Utils.importTextType.CSV) { %>', - '
', + '
', '', '
', '
', @@ -128,7 +105,7 @@ define([ '
', '<% } %>', '<% if (type == Common.Utils.importTextType.Paste || type == Common.Utils.importTextType.Columns || type == Common.Utils.importTextType.Data) { %>', - '
', + '
', '', '
', '
', @@ -138,7 +115,7 @@ define([ '
', '<% } %>', '<% if (!!preview) { %>', - '
', + '
', '', '
', '
', diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js index 2e5a53b0ff..650fc3b27d 100644 --- a/apps/common/main/lib/view/PasswordDialog.js +++ b/apps/common/main/lib/view/PasswordDialog.js @@ -54,7 +54,6 @@ define([ _.extend(_options, { width : 395, - height : 270, header : true, cls : 'modal-dlg', contentTemplate : '', diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 9878c39df7..e6ef05cdf2 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -987,7 +987,6 @@ define([ Common.Views.ReviewChangesDialog = Common.UI.Window.extend(_.extend({ options: { width : 330, - height : 90, title : 'Review Changes', modal : false, cls : 'review-changes modal-dlg', diff --git a/apps/common/main/lib/view/SaveAsDlg.js b/apps/common/main/lib/view/SaveAsDlg.js index d8f5976b0c..52d7f9ef9e 100644 --- a/apps/common/main/lib/view/SaveAsDlg.js +++ b/apps/common/main/lib/view/SaveAsDlg.js @@ -45,7 +45,6 @@ define([ _.extend(_options, { title: this.textTitle, width: 420, - height: 681, header: true }, options); diff --git a/apps/common/main/lib/view/SelectFileDlg.js b/apps/common/main/lib/view/SelectFileDlg.js index 81004365d0..101bbebe73 100644 --- a/apps/common/main/lib/view/SelectFileDlg.js +++ b/apps/common/main/lib/view/SelectFileDlg.js @@ -45,7 +45,6 @@ define([ _.extend(_options, { title: this.textTitle, width: 1024, - height: 621, header: true }, options); diff --git a/apps/common/main/resources/less/extended-color-picker.less b/apps/common/main/resources/less/extended-color-picker.less index 6c0d5cc767..aad5044b3d 100644 --- a/apps/common/main/resources/less/extended-color-picker.less +++ b/apps/common/main/resources/less/extended-color-picker.less @@ -1,7 +1,5 @@ .extended-color-dlg { - .color-box { - padding: 16px 16px 5px 16px; - + .box { & > div { display: inline-block; } @@ -64,18 +62,4 @@ } } } - - - .footer { - height: 37px; - width: 100%; - bottom: 0; - text-align: center; - padding: 7px 0 0 0; - - button { - width: 75px; - height: 22px; - } - } } \ No newline at end of file diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 54522bf9a4..a9acfa523a 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -1,9 +1,6 @@ .open-dlg { .body { - height: auto; - top: 34px; - & > div { width: 100%; } @@ -15,14 +12,9 @@ .content-panel { vertical-align: top; - padding: 15px 15px 0; + padding-bottom: 10px; width: 100%; - .inner-content { - padding-left: 10px; - padding-right: 10px; - } - label { .font-size-normal(); font-weight: normal; @@ -89,16 +81,4 @@ } } } - .footer { - padding-top: 15px; - - &.center { - text-align: center; - } - - &.justify { - padding-left: 30px; - padding-right: 30px; - } - } } \ No newline at end of file diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index f2b82fa11a..8614ce115e 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -363,7 +363,7 @@ .modal-dlg { .body { height: auto; - padding: 15px; + padding: 15px 0; .input-row { height: @input-height-base; @@ -379,10 +379,15 @@ label { .font-size-normal(); } + + .box { + padding-right: 15px; + padding-left: 15px; + } } .footer { - padding-top: 15px; + padding: 15px 15px 0; &.center { text-align: center; @@ -392,22 +397,22 @@ .text-align-right(); } } + + .separator.horizontal { + width: 100%; + } } // CopyWarningDialog .copy-warning { .body { - padding: 15px 0; - & > div { width: 100%; - padding: 0 20px; } .box { text-align: center; - padding-bottom: 15px; } .message{ text-align: justify; @@ -435,9 +440,5 @@ text-align: center; } } - - .footer { - padding: 20px; - } } } \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/CrossReferenceDialog.js b/apps/documenteditor/main/app/view/CrossReferenceDialog.js index 15c00c805b..58bf3d315c 100644 --- a/apps/documenteditor/main/app/view/CrossReferenceDialog.js +++ b/apps/documenteditor/main/app/view/CrossReferenceDialog.js @@ -45,7 +45,6 @@ define([ DE.Views.CrossReferenceDialog = Common.UI.Window.extend(_.extend({ options: { width: 400, - height: 410, style: 'min-width: 240px;', cls: 'modal-dlg', modal: false, diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js index 76c2f859a6..b25c2c03ab 100644 --- a/apps/documenteditor/main/app/view/CustomColumnsDialog.js +++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js @@ -59,7 +59,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/DateTimeDialog.js b/apps/documenteditor/main/app/view/DateTimeDialog.js index a062464128..3b4cfea84a 100644 --- a/apps/documenteditor/main/app/view/DateTimeDialog.js +++ b/apps/documenteditor/main/app/view/DateTimeDialog.js @@ -54,15 +54,12 @@ define([ }, initialize : function (options) { - var t = this, - _options = {}; - _.extend(this.options, { title: this.txtTitle }, options || {}); this.template = [ - '
', + '
', '
', '', '
', @@ -71,7 +68,7 @@ define([ '', '
', '
', - '
', + '
', '
', '', '
', diff --git a/apps/documenteditor/main/app/view/HyphenationDialog.js b/apps/documenteditor/main/app/view/HyphenationDialog.js index 28168e0b39..c251be8aa4 100644 --- a/apps/documenteditor/main/app/view/HyphenationDialog.js +++ b/apps/documenteditor/main/app/view/HyphenationDialog.js @@ -46,7 +46,6 @@ define([ DE.Views.HyphenationDialog = Common.UI.Window.extend(_.extend({ options: { width: 290, - height: 'auto', header: true, style: 'min-width: 290px;', cls: 'modal-dlg', @@ -60,7 +59,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '', '', '', '<% if (type == 2) { %>', '', '', '', - '', + '', '', '
', diff --git a/apps/documenteditor/main/app/view/LineNumbersDialog.js b/apps/documenteditor/main/app/view/LineNumbersDialog.js index 912718a623..d93cef4942 100644 --- a/apps/documenteditor/main/app/view/LineNumbersDialog.js +++ b/apps/documenteditor/main/app/view/LineNumbersDialog.js @@ -46,7 +46,6 @@ define([ DE.Views.LineNumbersDialog = Common.UI.Window.extend(_.extend({ options: { width: 290, - height: 332, header: true, style: 'min-width: 290px;', cls: 'modal-dlg', @@ -60,7 +59,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index 89597d9e8e..d1e330738b 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -196,7 +196,7 @@ define([ '
', - '
', + '
', '', '', '
', diff --git a/apps/documenteditor/main/app/view/NotesRemoveDialog.js b/apps/documenteditor/main/app/view/NotesRemoveDialog.js index 0ccd45a29c..4b2fe15b96 100644 --- a/apps/documenteditor/main/app/view/NotesRemoveDialog.js +++ b/apps/documenteditor/main/app/view/NotesRemoveDialog.js @@ -44,7 +44,6 @@ define([ DE.Views.NotesRemoveDialog = Common.UI.Window.extend(_.extend({ options: { width: 214, - height: 139, header: true, style: 'min-width: 214px;', cls: 'modal-dlg', diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js index 932f1fa664..2bca7e0d09 100644 --- a/apps/documenteditor/main/app/view/PageSizeDialog.js +++ b/apps/documenteditor/main/app/view/PageSizeDialog.js @@ -58,7 +58,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '', '', '', '', '
', @@ -77,8 +77,7 @@ define([ '
', - '
', - '
' + '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js index 5ed0ebfeb5..038f2a95bb 100644 --- a/apps/documenteditor/main/app/view/StyleTitleDialog.js +++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js @@ -44,7 +44,6 @@ define([ DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({ options: { width: 350, - height: 196, style: 'min-width: 230px;', cls: 'modal-dlg', buttons: ['ok', 'cancel'] diff --git a/apps/documenteditor/main/app/view/TableFormulaDialog.js b/apps/documenteditor/main/app/view/TableFormulaDialog.js index ab0d779de8..9981a2231a 100644 --- a/apps/documenteditor/main/app/view/TableFormulaDialog.js +++ b/apps/documenteditor/main/app/view/TableFormulaDialog.js @@ -56,7 +56,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', @@ -65,7 +65,7 @@ define([ '', '
', '
', - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/TableToTextDialog.js b/apps/documenteditor/main/app/view/TableToTextDialog.js index c77cee43d9..3d2edf2f7e 100644 --- a/apps/documenteditor/main/app/view/TableToTextDialog.js +++ b/apps/documenteditor/main/app/view/TableToTextDialog.js @@ -46,7 +46,6 @@ define([ DE.Views.TableToTextDialog = Common.UI.Window.extend(_.extend({ options: { width: 300, - height: 254, header: true, style: 'min-width: 240px;', cls: 'modal-dlg', diff --git a/apps/presentationeditor/main/app/view/AnimationDialog.js b/apps/presentationeditor/main/app/view/AnimationDialog.js index 52d59b4d09..3ccc6a9d9e 100644 --- a/apps/presentationeditor/main/app/view/AnimationDialog.js +++ b/apps/presentationeditor/main/app/view/AnimationDialog.js @@ -43,9 +43,8 @@ define([ PE.Views.AnimationDialog = Common.UI.Window.extend(_.extend({ options: { width: 350, - height: 396, header: true, - cls: 'animation-dlg', + cls: 'modal-dlg', buttons: ['ok', 'cancel'] }, initialize : function(options) { @@ -53,11 +52,11 @@ define([ title: this.textTitle }, options || {}); this.template = [ - '
', + '
', '
', - '
', - '
', - // '
', + '
', + '
', + // '
', '
' ].join(''); this.allEffects = Common.define.effectData.getEffectFullData(); @@ -90,14 +89,11 @@ define([ var $window = this.getChild(); - var footer = $window.find('.footer'); - footer.css({"text-align": "center"}); - this.cmbGroup = new Common.UI.ComboBox({ el : $('#animation-group'), cls: 'input-group-nr', editable: false, - style : 'margin-top: 16px; width: 100%;', + style : 'width: 100%;', menuStyle: 'min-width: 100%;', takeFocusOnClose: true, data : this.EffectGroupData, @@ -110,7 +106,7 @@ define([ cls: 'input-group-nr', editable: false, valueField: 'id', - style : 'margin-top: 16px; width: 100%;', + style : 'width: 100%;', menuStyle: 'min-width: 100%;', takeFocusOnClose: true }); diff --git a/apps/presentationeditor/main/app/view/DateTimeDialog.js b/apps/presentationeditor/main/app/view/DateTimeDialog.js index f96917d95e..e5c730063e 100644 --- a/apps/presentationeditor/main/app/view/DateTimeDialog.js +++ b/apps/presentationeditor/main/app/view/DateTimeDialog.js @@ -62,7 +62,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', @@ -71,7 +71,7 @@ define([ '', '
', '
', - '
', + '
', '
', '', '
', diff --git a/apps/presentationeditor/main/app/view/GridSettings.js b/apps/presentationeditor/main/app/view/GridSettings.js index 085a4b24e3..e24fe917a2 100644 --- a/apps/presentationeditor/main/app/view/GridSettings.js +++ b/apps/presentationeditor/main/app/view/GridSettings.js @@ -59,14 +59,13 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', - '
', - '
', - '
', - '
' + '
', + '
', + '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); diff --git a/apps/presentationeditor/main/app/view/SlideSizeSettings.js b/apps/presentationeditor/main/app/view/SlideSizeSettings.js index 0dddbccc49..7259cd5d83 100644 --- a/apps/presentationeditor/main/app/view/SlideSizeSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSizeSettings.js @@ -58,7 +58,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', @@ -82,9 +82,8 @@ define([ '
', '', '
', - '
', - '
', - '
' + '
', + '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); diff --git a/apps/presentationeditor/main/app/view/SlideshowSettings.js b/apps/presentationeditor/main/app/view/SlideshowSettings.js index 976517390d..4c02d757ed 100644 --- a/apps/presentationeditor/main/app/view/SlideshowSettings.js +++ b/apps/presentationeditor/main/app/view/SlideshowSettings.js @@ -58,10 +58,9 @@ define([ }, options || {}); this.template = [ - '
', - '
', - '
', - '
' + '
', + '
', + '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index fc8b6948b8..c76a90349b 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -55,17 +55,17 @@ define([ _.extend(_options, { width : options.type === 'date' ? 528 : 501, - height : 230, contentWidth : 180, header : true, - cls : 'filter-dlg' + (options.type === 'date' ? ' date-filter' : ''), + cls : 'filter-dlg modal-dlg' + (options.type === 'date' ? ' date-filter' : ''), contentTemplate : '', title : t.txtTitle, - items : [] + items : [], + buttons: ['ok', 'cancel'] }, options); this.template = options.template || [ - '
', + '
', '
', '', '
', @@ -87,11 +87,6 @@ define([ '<% } %>', '
', '
', - '
', - '
', - '
', - '', - '', '
' ].join(''); @@ -375,10 +370,9 @@ define([ _.extend(_options, { width : (this.type=='value') ? 450 : 318, - height : 160, contentWidth : 180, header : true, - cls : 'filter-dlg', + cls : 'filter-dlg modal-dlg', contentTemplate : '', title : t.txtTitle, items : [], @@ -386,7 +380,7 @@ define([ }, options); this.template = options.template || [ - '
', + '
', '
', '', '
', @@ -397,8 +391,7 @@ define([ '
', '
', '
', - '
', - '
' + '
' ].join(''); this.api = options.api; @@ -581,13 +574,13 @@ define([ _.extend(_options, { width : 501, - height : 210, contentWidth : 180, header : true, - cls : 'filter-dlg', + cls : 'filter-dlg modal-dlg', contentTemplate : '', title : (options.type=='label') ? t.txtTitleLabel : t.txtTitleValue, - items : [] + items : [], + buttons: ['ok', 'cancel'] }, options); this.api = options.api; @@ -595,7 +588,7 @@ define([ this.type = options.type || 'value'; this.template = options.template || [ - '
', + '
', '
', '', '
', @@ -610,11 +603,6 @@ define([ '', '
', '
', - '
', - '
', - '
', - '', - '', '
' ].join(''); @@ -860,10 +848,9 @@ define([ _.extend(_options, { width : 250, - height : 215, contentWidth : 180, header : true, - cls : 'filter-dlg', + cls : 'filter-dlg modal-dlg', contentTemplate : '', title : t.txtTitle, items : [], @@ -871,15 +858,14 @@ define([ }, options); this.template = options.template || [ - '
', + '
', '
', '
', '
', '
', '
', '
', - '
', - '
' + '
' ].join(''); this.api = options.api; @@ -1062,7 +1048,7 @@ define([ height : height || 277, contentWidth : (width - 50) || 400, header : false, - cls : 'filter-dlg autofilter invisible-borders', + cls : 'filter-dlg modal-dlg autofilter invisible-borders', contentTemplate : '', title : t.txtTitle, modal : false, diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js index 56e208d7a9..4a07704abc 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js @@ -56,9 +56,8 @@ define([ _.extend(_options, { width : 375, - height : 490, header : true, - cls : 'formula-dlg', + cls : 'modal-dlg formula-dlg', contentTemplate : '', title : t.txtTitle, items : [], @@ -66,7 +65,7 @@ define([ }, options); this.template = options.template || [ - '
', + '
', '
', '', '', diff --git a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js index 6ec3a7a134..0fb48dd688 100644 --- a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js @@ -81,7 +81,7 @@ define([ }; this.template = [ - '
', + '
', '', '', '', '
', diff --git a/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js b/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js index 904b537c0c..eb6015c1b6 100644 --- a/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js @@ -58,8 +58,8 @@ define([ }, options || {}); this.template = [ - '
', - '', + '
', + '
', '', '', '', '
', '', @@ -81,8 +81,7 @@ define([ '
', - '
', - '
' + '' ].join(''); this.options.tpl = _.template(this.template)(this.options); diff --git a/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js b/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js index b7947bb111..f4ab7fce6a 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js @@ -52,14 +52,14 @@ define([ initialize : function (options) { var t = this, - height = options.date ? 335 : 195; + height = options.date ? 250 : 110; _.extend(this.options, { title: this.txtTitle }, options || {}); this.template = options.template || [ - '
', + '
', '', '', '', '
', diff --git a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js index 92fdf52621..d302f8a236 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js @@ -58,7 +58,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '', '', '', '', '
', @@ -87,8 +87,7 @@ define([ '
', - '
', - '
' + '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); diff --git a/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js b/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js index 5fe2762535..58012c19f9 100644 --- a/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js +++ b/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js @@ -53,15 +53,12 @@ define([ }, initialize : function (options) { - var t = this, - _options = {}; - _.extend(this.options, { title: this.txtTitle }, options || {}); this.template = [ - '
', + '
', '
', '', '
', diff --git a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js index a8df8d78d7..154614a1b5 100644 --- a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js @@ -45,7 +45,6 @@ define([ SSE.Views.ScaleDialog = Common.UI.Window.extend(_.extend({ options: { width: 215, - height: 235, header: true, style: 'min-width: 215px;', cls: 'modal-dlg', diff --git a/apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js b/apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js index 1678dd409d..867f112a3c 100644 --- a/apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js @@ -57,7 +57,7 @@ define([ }, options || {}); this.template = [ - '
', + '
', '
', '', '
', diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less index 0bad6b7c5e..3509ed0733 100644 --- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less +++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less @@ -64,8 +64,12 @@ } .body { - height: auto; - top: 34px; + .autofilter& { + padding: 0; + .box { + padding: 0; + } + } & > div { width: 100%; @@ -78,14 +82,9 @@ .content-panel { vertical-align: top; - padding: 15px; + padding-bottom: 10px; width: 100%; - .inner-content { - padding-left: 10px; - padding-right: 10px; - } - label { .font-size-normal(); font-weight: normal; @@ -102,6 +101,7 @@ } .autofilter& { + padding: 15px; border-right: 1px solid @border-divider-ie; border-right: @scaled-one-px-value solid @border-divider; display: flex; @@ -150,23 +150,6 @@ } } - .footer { - padding-top: 15px; - - &.center { - text-align: center; - } - - &.right { - .text-align-right(); - } - - &.justify { - padding-left: 30px; - padding-right: 30px; - } - } - .combo-container-1 { margin-top: 15px; } diff --git a/apps/spreadsheeteditor/main/resources/less/formuladialog.less b/apps/spreadsheeteditor/main/resources/less/formuladialog.less index 2d0559c490..c8b048823c 100644 --- a/apps/spreadsheeteditor/main/resources/less/formuladialog.less +++ b/apps/spreadsheeteditor/main/resources/less/formuladialog.less @@ -7,9 +7,6 @@ } .body { - height: auto; - top: 34px; - & > div { width: 100%; } @@ -21,14 +18,8 @@ .content-panel { vertical-align: top; - padding: 15px; width: 100%; - .inner-content { - padding-left: 10px; - padding-right: 10px; - } - label { .font-size-normal(); font-weight: normal; @@ -46,16 +37,4 @@ } } } - .footer { - padding-top: 15px; - - &.center { - text-align: center; - } - - &.justify { - padding-left: 30px; - padding-right: 30px; - } - } } \ No newline at end of file From b3ae32e477f198a50835c9cf2c387fa41bfa41fd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 25 Oct 2023 11:08:05 +0300 Subject: [PATCH 6/7] Refactoring custom window buttons --- apps/common/main/lib/component/Window.js | 12 ++++++------ apps/common/main/resources/less/buttons.less | 2 +- apps/documenteditor/main/app/controller/Main.js | 3 +-- .../main/app/view/MailMergeSettings.js | 3 +-- apps/pdfeditor/main/app/controller/Main.js | 3 +-- apps/presentationeditor/main/app/controller/Main.js | 3 +-- apps/spreadsheeteditor/main/app/controller/Main.js | 3 +-- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 017e3f15ad..b1fb40d255 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -179,7 +179,7 @@ define([ '<% if (typeof (buttons) !== "undefined" && _.size(buttons) > 0) { %>' + '
' + '<% for(var bt in buttons) { %>' + - ''+ + ''+ '<% } %>' + '
' + '<% } %>' + @@ -629,12 +629,12 @@ define([ var newBtns = {}; _.each(options.buttons, function(b){ if (typeof(b) == 'object') { - if (b.value !== undefined) - newBtns[b.value] = {text: b.caption, cls: 'custom' + ((b.primary || options.primary==b.value) ? ' primary' : '')}; + if (b.value !== undefined) { + newBtns[b.value] = {text: b.caption, cls: 'auto' + ((b.primary || options.primary==b.value) ? ' primary' : '')}; + b.id && (newBtns[b.value].id = b.id); + } } else if (b!==undefined) { - newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b || _.indexOf(options.primary, b)>-1) ? 'primary' : ''}; - if (b=='custom') - newBtns[b].cls += ' custom'; + newBtns[b] = {text: arrBtns[b], cls: (options.primary==b || _.indexOf(options.primary, b)>-1) ? 'primary' : ''}; } }); diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 2d96fc1224..6324e16a98 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -1327,7 +1327,7 @@ opacity: @component-disabled-opacity; } - &.custom { + &.auto { width: auto; min-width: 86px; } diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index dec84cce44..932ea4c7f2 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2640,9 +2640,8 @@ define([ width: 500, msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn, iconCls: 'info', - buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'], + buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'], primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok', - customButtonText: this.textStrict, dontshow: true, callback: _.bind(function(btn, dontshow){ if (dontshow) Common.localStorage.setItem("de-hide-try-undoredo", 1); diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index b72453c3c0..bc8aa14acf 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -639,9 +639,8 @@ define([ title: this.notcriticalErrorTitle, msg: opts.data.error, iconCls: 'warn', - buttons: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : ['custom', 'cancel'], + buttons: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : [{value: 'custom', caption: this.textGoToMail}, 'cancel'], primary: _.isEmpty(opts.data.createEmailAccountUrl) ? ['ok'] : 'custom', - customButtonText: this.textGoToMail, callback: _.bind(function(btn){ if (btn == 'custom') { window.open(opts.data.createEmailAccountUrl, "_blank"); diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js index 606f5db592..c767424c38 100644 --- a/apps/pdfeditor/main/app/controller/Main.js +++ b/apps/pdfeditor/main/app/controller/Main.js @@ -2034,9 +2034,8 @@ define([ width: 500, msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn, iconCls: 'info', - buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'], + buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'], primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok', - customButtonText: this.textStrict, dontshow: true, callback: _.bind(function(btn, dontshow){ if (dontshow) Common.localStorage.setItem("pdfe-hide-try-undoredo", 1); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 0bf6520405..86b7c5858c 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2198,9 +2198,8 @@ define([ width: 500, msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn, iconCls: 'info', - buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'], + buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'], primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok', - customButtonText: this.textStrict, dontshow: true, callback: _.bind(function(btn, dontshow){ if (dontshow) window.localStorage.setItem("pe-hide-try-undoredo", 1); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index e13b5caa73..dde29e0333 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -2933,9 +2933,8 @@ define([ width: 500, msg: this.appOptions.canChangeCoAuthoring ? this.textTryUndoRedo : this.textTryUndoRedoWarn, iconCls: 'info', - buttons: this.appOptions.canChangeCoAuthoring ? ['custom', 'cancel'] : ['ok'], + buttons: this.appOptions.canChangeCoAuthoring ? [{value: 'custom', caption: this.textStrict}, 'cancel'] : ['ok'], primary: this.appOptions.canChangeCoAuthoring ? 'custom' : 'ok', - customButtonText: this.textStrict, dontshow: true, callback: _.bind(function(btn, dontshow){ if (dontshow) window.localStorage.setItem("sse-hide-try-undoredo", 1); From bbcbfc32ced8ee2887b05adaf1616cdacbcf316d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 25 Oct 2023 22:38:52 +0300 Subject: [PATCH 7/7] Refactoring AdvancedSettingsWindow templates --- apps/common/forms/lib/view/modals.js | 22 +++++--------- .../main/lib/view/AdvancedSettingsWindow.js | 14 ++++++--- .../common/main/lib/view/AutoCorrectDialog.js | 18 ++---------- apps/common/main/lib/view/ExternalEditor.js | 2 +- apps/common/main/lib/view/OpenDialog.js | 4 +-- .../app/template/WatermarkSettings.template | 6 +++- .../main/app/view/BookmarksDialog.js | 20 +++++-------- .../main/app/view/CaptionDialog.js | 14 ++++----- .../main/app/view/FileMenuPanels.js | 2 +- .../main/app/view/MailMergeEmailDlg.js | 8 ++--- .../main/app/view/NoteSettingsDialog.js | 29 +++++++++---------- .../main/app/view/RolesManagerDlg.js | 13 ++------- .../main/app/view/SaveFormDlg.js | 21 ++++++-------- .../main/app/view/TableOfContentsSettings.js | 19 +++++------- .../main/app/view/TextToTableDialog.js | 17 +++++------ .../main/app/view/WatermarkSettingsDialog.js | 16 ++-------- .../pdfeditor/main/app/view/FileMenuPanels.js | 2 +- .../app/template/HeaderFooterDialog.template | 2 +- .../main/app/view/FileMenuPanels.js | 2 +- .../main/app/view/HeaderFooterDialog.js | 18 ++++++------ .../main/resources/less/rightmenu.less | 3 -- .../main/app/view/ChartDataDialog.js | 15 ++++------ .../main/app/view/ChartTypeDialog.js | 17 +++++------ .../main/app/view/CreatePivotDialog.js | 15 +++++----- .../main/app/view/CreateSparklineDialog.js | 17 +++++------ .../main/app/view/ExternalLinksDlg.js | 20 +++++-------- .../main/app/view/FileMenuPanels.js | 2 +- .../main/app/view/FormatRulesEditDlg.js | 8 ++--- .../main/app/view/FormatRulesManagerDlg.js | 8 ++--- .../main/app/view/FormatSettingsDialog.js | 13 ++++----- .../main/app/view/FormulaDialog.js | 11 ++++--- .../main/app/view/FormulaWizard.js | 19 +++++------- .../main/app/view/ImportFromXmlDialog.js | 17 +++++------ .../main/app/view/MacroDialog.js | 15 +++++----- .../main/app/view/NameManagerDlg.js | 13 +++------ .../main/app/view/NamedRangeEditDlg.js | 15 ++++------ .../main/app/view/NamedRangePasteDlg.js | 15 +++++----- .../main/app/view/ProtectRangesDlg.js | 15 ++-------- .../app/view/ProtectedRangesManagerDlg.js | 13 +++------ .../main/app/view/SortDialog.js | 8 ++--- .../main/app/view/SortOptionsDialog.js | 16 +++++----- .../main/app/view/SpecialPasteDialog.js | 17 +++++------ .../main/app/view/ValueFieldSettingsDialog.js | 17 +++++------ .../main/app/view/ViewManagerDlg.js | 23 ++++++--------- .../main/app/view/WatchDialog.js | 13 +++------ .../main/resources/less/rightmenu.less | 3 -- 46 files changed, 242 insertions(+), 355 deletions(-) diff --git a/apps/common/forms/lib/view/modals.js b/apps/common/forms/lib/view/modals.js index a759044154..9c34a0d098 100644 --- a/apps/common/forms/lib/view/modals.js +++ b/apps/common/forms/lib/view/modals.js @@ -44,13 +44,13 @@ define([ width: 300, header: true, style: 'min-width: 300px;', - cls: 'modal-dlg', - buttons: null + cls: 'modal-dlg' }, initialize : function(options) { _.extend(this.options, { - title: this.textTitle + title: this.textTitle, + buttons: [{value: 'ok', caption: this.txtCopy}] }, options || {}); this.template = [ @@ -73,10 +73,7 @@ define([ '
', '
', - '
', - '
', - '', - '
' + '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); @@ -160,13 +157,13 @@ define([ width: 300, header: true, style: 'min-width: 300px;', - cls: 'modal-dlg', - buttons: null + cls: 'modal-dlg' }, initialize : function(options) { _.extend(this.options, { - title: this.textTitle + title: this.textTitle, + buttons: [{value: 'ok', caption: this.txtCopy}] }, options || {}); this.template = [ @@ -189,10 +186,7 @@ define([ '
', '
', - '
', - '
', - '', - '
' + '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index 34ebd30b67..3264046cc7 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -49,22 +49,28 @@ define([ header: true, cls: 'advanced-settings-dlg', toggleGroup: 'advanced-settings-group', - contentTemplate: '', + contentTemplate: '', // use instead 'template' for internal layout + contentStyle: '', items: [], - buttons: ['ok', 'cancel'] + buttons: ['ok', 'cancel'], + separator: true }, options); this.template = options.template || [ '
', + '<% if (items.length>0) { %>', '
', '<% _.each(items, function(item) { %>', '', '<% }); %>', '
', '
', - '
' + _options.contentTemplate + '
', + '<% } %>', + '
' + _options.contentTemplate + '
', '
', - '
' + '<% if (separator) { %>', + '
', + '<% } %>' ].join(''); _options.tpl = _.template(this.template)(_options); diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index c707a4a193..d069a49b3b 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -53,7 +53,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', options: { contentWidth: 375, contentHeight: 345, - buttons: null, + buttons: ['close'], toggleGroup: 'autocorrect-dialog-group' }, @@ -77,21 +77,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', title: this.textTitle, storageName: this.appPrefix + 'autocorrect-dialog-category', items: items, - template: [ - '
', - '
', - '<% _.each(items, function(item) { %>', - '', - '<% }); %>', - '
', - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - '
', - '
', - '', - '
' - ].join('') + contentTemplate: _.template(contentTemplate)({scope: this}) }, options || {}); this.api = this.options.api; diff --git a/apps/common/main/lib/view/ExternalEditor.js b/apps/common/main/lib/view/ExternalEditor.js index b1a1d3ffeb..e28bb3e705 100644 --- a/apps/common/main/lib/view/ExternalEditor.js +++ b/apps/common/main/lib/view/ExternalEditor.js @@ -72,7 +72,7 @@ define([ '
', '
', '
', - '', + '', '', '
' ].join(''); diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index cf9984a904..63eced4317 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -138,10 +138,10 @@ define([ '
', '', '<% if (closeFile) { %>', - '', + '', '<% } %>', '<% if (closable) { %>', - '', + '', '<% } %>', '
' ].join(''); diff --git a/apps/documenteditor/main/app/template/WatermarkSettings.template b/apps/documenteditor/main/app/template/WatermarkSettings.template index 69c66d3cf0..e6ef3eed66 100644 --- a/apps/documenteditor/main/app/template/WatermarkSettings.template +++ b/apps/documenteditor/main/app/template/WatermarkSettings.template @@ -1,4 +1,6 @@ - +
+
+
@@ -65,3 +67,5 @@
+
+
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index 0451afc67e..61365292b1 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -50,7 +50,8 @@ define([ DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 320, - buttons: null, + buttons: ['close'], + separator: false, id: 'window-bookmarks' }, @@ -59,10 +60,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 5px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -106,13 +107,8 @@ define([ '
', - '
', - '
', - '
', - '
', - '', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/documenteditor/main/app/view/CaptionDialog.js b/apps/documenteditor/main/app/view/CaptionDialog.js index 276ed1b3b8..ac0074546b 100644 --- a/apps/documenteditor/main/app/view/CaptionDialog.js +++ b/apps/documenteditor/main/app/view/CaptionDialog.js @@ -48,6 +48,7 @@ define([ DE.Views.CaptionDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 351, + separator: false, id: 'window-caption' }, @@ -56,10 +57,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 5px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '
', @@ -120,9 +121,8 @@ define([ '
', '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.objectType = options.objectType; diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index d78d37ccb4..80a7e5b0fd 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1960,7 +1960,7 @@ define([ '
' ].join('')); diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js index 4d8be5cfa2..c108af2480 100644 --- a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js +++ b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js @@ -51,12 +51,8 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template', initialize : function(options) { _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - '
' - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); }, diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js index 23a7ce466b..49116dea26 100644 --- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js +++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js @@ -47,9 +47,9 @@ define([ DE.Views.NoteSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 300, + contentWidth: 310, id: 'window-note-settings', - buttons: null + separator: false }, initialize : function(options) { @@ -57,10 +57,16 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + buttons: [ + {value: 'insert', caption: this.textInsert}, + {value: 'apply', caption: this.textApply, id: 'note-settings-btn-apply'}, + 'cancel' + ], + primary: 'insert', + contentStyle: 'padding: 0 5px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -114,15 +120,8 @@ define([ '
', - '
', - '
', - '
', - '
', - '', - '', - '', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/documenteditor/main/app/view/RolesManagerDlg.js b/apps/documenteditor/main/app/view/RolesManagerDlg.js index c6fd3b0f6e..a0e0acbebc 100644 --- a/apps/documenteditor/main/app/view/RolesManagerDlg.js +++ b/apps/documenteditor/main/app/view/RolesManagerDlg.js @@ -52,22 +52,15 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template', options: { alias: 'RolesManagerDlg', contentWidth: 500, - buttons: null + buttons: ['close'] }, initialize: function (options) { var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - '
', - '
', - '', - '
' - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/documenteditor/main/app/view/SaveFormDlg.js b/apps/documenteditor/main/app/view/SaveFormDlg.js index e3ff378a61..c43f004686 100644 --- a/apps/documenteditor/main/app/view/SaveFormDlg.js +++ b/apps/documenteditor/main/app/view/SaveFormDlg.js @@ -51,16 +51,19 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow', options: { alias: 'SaveFormDlg', contentWidth: 320, - buttons: null + separator: false }, initialize: function (options) { var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
', + buttons: [ + {value: 'ok', caption: this.saveButtonText}, + 'cancel' + ], + contentStyle: 'padding: 0;', + contentTemplate: _.template([ '
', '
', '', @@ -81,14 +84,8 @@ define([ 'common/main/lib/view/AdvancedSettingsWindow', '', '
', '
', - '
', - '
', - '
', - '
', - '', - '', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js index 82281822d6..4daa2ad97c 100644 --- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js +++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js @@ -59,10 +59,10 @@ define([ _.extend(this.options, { title: options.type ? this.textTitleTOF : this.textTitle, contentHeight: height, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 15px 10px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '', '', '', '', '
', @@ -92,7 +92,7 @@ define([ '
', - '<% if (type == 1) { %>', + '<% if (scope.type == 1) { %>', '', '
', '
', @@ -105,7 +105,7 @@ define([ '
', - '<% if (type == 1) { %>', + '<% if (scope.type == 1) { %>', '
', '
', '
', @@ -135,11 +135,8 @@ define([ '
', - '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/documenteditor/main/app/view/TextToTableDialog.js b/apps/documenteditor/main/app/view/TextToTableDialog.js index 874b394b24..3108456c78 100644 --- a/apps/documenteditor/main/app/view/TextToTableDialog.js +++ b/apps/documenteditor/main/app/view/TextToTableDialog.js @@ -45,7 +45,8 @@ define([ DE.Views.TextToTableDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 300 + contentWidth: 300, + separator: false }, initialize : function(options) { @@ -53,10 +54,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 5px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -129,10 +130,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js index 7684f116c5..76a2a9d0bc 100644 --- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js @@ -76,6 +76,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', DE.Views.WatermarkSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 400, + separator: false, id: 'window-watermark' }, @@ -84,19 +85,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', _.extend(this.options, { title: this.textTitle, - template: _.template( - [ - '
', - '
', - '
', - template, - '
', - '
', - '
' - ].join('') - )({ - scope: this - }) + contentStyle: 'padding: 10px 5px;', + contentTemplate: _.template(template)({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js index ccda511d4a..c0bebee85a 100644 --- a/apps/pdfeditor/main/app/view/FileMenuPanels.js +++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js @@ -1655,7 +1655,7 @@ define([ '
' ].join('')); diff --git a/apps/presentationeditor/main/app/template/HeaderFooterDialog.template b/apps/presentationeditor/main/app/template/HeaderFooterDialog.template index a1012d5858..cb73e1355f 100644 --- a/apps/presentationeditor/main/app/template/HeaderFooterDialog.template +++ b/apps/presentationeditor/main/app/template/HeaderFooterDialog.template @@ -1,4 +1,4 @@ - +
', '', '', - '', + '', '', '
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index d0718bef23..3d63718226 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -1443,7 +1443,7 @@ define([ '
' ].join('')); diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js index 40ce514ae9..77de6dad55 100644 --- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js +++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js @@ -48,7 +48,6 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', options: { contentWidth: 360, contentHeight: 330, - buttons: null, id: 'window-header-footer' }, @@ -57,11 +56,17 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', _.extend(this.options, { title: this.textHFTitle, + buttons: [ + {value: 'all', caption: this.applyAllText}, + {value: 'ok', caption: this.applyText, id: 'hf-dlg-btn-apply'}, + 'cancel' + ], + primary: 'all', template: _.template( [ '
', - '
', - '
', + '
', + '
', template, '
', '
', @@ -76,12 +81,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', '
', '
', '
', - '
', - '
', - '', - '', - '', - '
' + '
' ].join('') )({ scope: this diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index fd60a2476d..050b94e989 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -1,7 +1,4 @@ -.settings-panel { -} - .right-panel .settings-panel { label.input-label{ vertical-align: baseline; diff --git a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js index 784ec2b9f5..ee5dcd1599 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js @@ -57,10 +57,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 10px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -106,11 +106,8 @@ define([ '
', - '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index e52fe6ed18..02359e91e1 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -69,7 +69,8 @@ define([ SSE.Views.ChartTypeDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 370, - contentHeight: 300 + contentHeight: 300, + separator: false }, initialize : function(options) { @@ -77,10 +78,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 10px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -100,10 +101,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js index 6126f40b4a..77b1623c25 100644 --- a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js +++ b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js @@ -47,6 +47,7 @@ define([ SSE.Views.CreatePivotDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, + separator: false, id: 'window-create-pivot' }, @@ -55,10 +56,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 10px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -91,10 +92,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js b/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js index c573b152b0..0e8c2e50be 100644 --- a/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js +++ b/apps/spreadsheeteditor/main/app/view/CreateSparklineDialog.js @@ -45,7 +45,8 @@ define([ SSE.Views.CreateSparklineDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 310 + contentWidth: 310, + separator: false }, initialize : function(options) { @@ -53,10 +54,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 10px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -79,10 +80,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js index 75faef28e9..2ff0c37aae 100644 --- a/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ExternalLinksDlg.js @@ -51,17 +51,18 @@ define([ options: { alias: 'ExternalLinksDlg', contentWidth: 500, - buttons: null + separator: false, + buttons: ['close'] }, initialize: function (options) { var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -77,13 +78,8 @@ define([ '
', - '
', - '
', - '
', - '
', - '', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 6042ea2f36..27a2af9911 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1835,7 +1835,7 @@ define([ '
', '', '', - '', + '', '', '' ].join('')); diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index 74088a7ea5..1e4a59ba92 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -59,12 +59,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', _.extend(this.options, { title: this.txtTitleNew, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - '
' - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index 06d72a6756..cf3b7af90e 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -90,6 +90,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa SSE.Views.FormatRulesManagerDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { alias: 'FormatRulesManagerDlg', + separator: false, contentWidth: 560 }, @@ -97,11 +98,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js index 725085e273..225cc61189 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js @@ -92,10 +92,10 @@ define([ _.extend(this.options, { title: this.textTitle, contentHeight: height, - template: [ - '
', - '
', + contentStyle: 'padding: 0 10px;', + contentTemplate: _.template([ '
', + '
', '', '', '', '', '
', @@ -155,11 +155,8 @@ define([ '
', - '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js index 4a07704abc..9650b924a4 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js @@ -61,7 +61,10 @@ define([ contentTemplate : '', title : t.txtTitle, items : [], - buttons: null + buttons: [ + {value: 'ok', caption: this.okButtonText, primary: true, id: 'formula-dlg-btn-ok'}, + 'cancel' + ], }, options); this.template = options.template || [ @@ -76,11 +79,7 @@ define([ '', '
', '
', - '
', - '
', - '', - '', - '
' + '
' ].join(''); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js index 87e56436ff..71e5b6eb3b 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js @@ -52,11 +52,11 @@ define([ var me = this; _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', - '', + contentStyle: 'padding: 0;', + contentTemplate: _.template([ + '
', + '
', + '
', '', '
', '', '
', @@ -81,11 +81,8 @@ define([ '
', '
', - '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.props = this.options.props; @@ -122,7 +119,7 @@ define([ this.lblFormulaResult = $window.find('#formula-wizard-value'); this.lblFunctionResult = $window.find('#formula-wizard-lbl-val-func'); - this.contentPanel.find('.settings-panel > table').css('height', this.options.contentHeight - 7); + this.innerPanel.find('> table').css('height', this.options.contentHeight - 7); this._preventCloseCellEditor = false; diff --git a/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js b/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js index 65780d9b7b..38dbca1c84 100644 --- a/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ImportFromXmlDialog.js @@ -46,7 +46,8 @@ define([ SSE.Views.ImportFromXmlDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 310 + contentWidth: 310, + separator: false }, initialize : function(options) { @@ -54,10 +55,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 10px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -80,10 +81,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/MacroDialog.js b/apps/spreadsheeteditor/main/app/view/MacroDialog.js index f9001a4b05..792be168b3 100644 --- a/apps/spreadsheeteditor/main/app/view/MacroDialog.js +++ b/apps/spreadsheeteditor/main/app/view/MacroDialog.js @@ -47,7 +47,8 @@ define([ SSE.Views.MacroDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 250 + contentWidth: 250, + separator: false }, initialize : function(options) { @@ -55,10 +56,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', + contentStyle: 'padding: 0 5px;', + contentTemplate: _.template([ '
', + '
', '', '', '', '', '
', @@ -76,10 +77,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js index 6356fd5113..62c5dc0a10 100644 --- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js @@ -52,7 +52,8 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', options: { alias: 'NameManagerDlg', contentWidth: 540, - buttons: null, + buttons: ['close'], + separator: false, id: 'window-name-manager' }, @@ -60,14 +61,8 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - '
', - '', - '
' - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js index 7d1e24d89b..01599d64a6 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js @@ -58,10 +58,10 @@ define([ _.extend(this.options, { title: this.txtTitleNew, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -89,11 +89,8 @@ define([ '
', - '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js index 863d4b6b79..7133754aca 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js @@ -49,6 +49,7 @@ define([ SSE.Views.NamedRangePasteDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { alias: 'NamedRangePasteDlg', + separator: false, contentWidth: 250 }, @@ -57,10 +58,10 @@ define([ _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -69,10 +70,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js index fbc62b9fda..0521bd6075 100644 --- a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js @@ -50,6 +50,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectRangesDlg.template', options: { alias: 'ProtectRangesDlg', contentWidth: 480, + separator: false, id: 'window-protect-ranges' }, @@ -57,18 +58,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectRangesDlg.template', var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - ].join(''), - buttons: [ - // { - // value: 'protect-sheet', - // caption: this.textProtect - // }, - 'ok','cancel'] - // primary: 'protect-sheet' + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js index a9a3f3b1a5..35ef6548aa 100644 --- a/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg.js @@ -51,21 +51,16 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectedRangesManagerDlg.te options: { alias: 'ProtectedRangesManagerDlg', contentWidth: 490, - buttons: null + separator: false, + buttons: ['close'] }, initialize: function (options) { var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - '
', - '', - '
' - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js index 4afea89969..d8b985126e 100644 --- a/apps/spreadsheeteditor/main/app/view/SortDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js @@ -74,6 +74,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', options: { alias: 'SortDialog', contentWidth: 560, + separator: false, buttons: ['ok', 'cancel'] }, @@ -81,11 +82,8 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template', var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
' - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js index 06b1660608..0e133ec692 100644 --- a/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SortOptionsDialog.js @@ -46,7 +46,8 @@ define([ SSE.Views.SortOptionsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 230 + contentWidth: 230, + separator: false }, initialize : function(options) { @@ -54,10 +55,9 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -85,10 +85,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.props = options.props; diff --git a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js index 13424c5470..79c409d718 100644 --- a/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SpecialPasteDialog.js @@ -47,7 +47,8 @@ define([ SSE.Views.SpecialPasteDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 350 + contentWidth: 350, + separator: false }, initialize : function(options) { @@ -55,10 +56,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 5px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -157,10 +158,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.handler = options.handler; diff --git a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js index a161b59c17..197ef39a6a 100644 --- a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js @@ -48,7 +48,8 @@ define([ SSE.Views.ValueFieldSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 284 + contentWidth: 284, + separator: false }, initialize : function(options) { @@ -56,10 +57,10 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', + contentStyle: 'padding: 0 10px;', + contentTemplate: _.template([ + '
', + '
', '', '', '', '', '
', @@ -97,10 +98,8 @@ define([ '
', - '
', - '
', - '
' - ].join('') + '
' + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js index a193c40209..7da6b0dbf8 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js @@ -52,18 +52,20 @@ define([ SSE.Views.ViewManagerDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { alias: 'ViewManagerDlg', - contentWidth: 460, - buttons: null + contentWidth: 460 }, initialize: function (options) { var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
', - '
', + buttons: [ + {value: 'ok', caption: this.textGoTo, primary: true}, + 'close' + ], + contentStyle: 'padding: 0;', + contentTemplate: _.template([ + '
', '
', '', '', @@ -82,15 +84,8 @@ define([ '', '
', '
', - '
', - '
', - '
', - '
', - '
', - '', - '', '
' - ].join('') + ].join(''))({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/app/view/WatchDialog.js b/apps/spreadsheeteditor/main/app/view/WatchDialog.js index 46f75d4d82..d7f57518c2 100644 --- a/apps/spreadsheeteditor/main/app/view/WatchDialog.js +++ b/apps/spreadsheeteditor/main/app/view/WatchDialog.js @@ -52,21 +52,16 @@ define([ 'text!spreadsheeteditor/main/app/template/WatchDialog.template', alias: 'WatchDialog', contentWidth: 560, modal: false, - buttons: null + separator: false, + buttons: ['close'] }, initialize: function (options) { var me = this; _.extend(this.options, { title: this.txtTitle, - template: [ - '
', - '
' + _.template(contentTemplate)({scope: this}) + '
', - '
', - '
', - '', - '
' - ].join('') + contentStyle: 'padding: 0;', + contentTemplate: _.template(contentTemplate)({scope: this}) }, options); this.api = options.api; diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 7623049885..bd437b3b73 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -1,7 +1,4 @@ -.settings-panel { -} - .right-panel .settings-panel { label.input-label{ vertical-align: baseline;