From 88998b07aad84adf4c39087da7cb1fdeaefe90da Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 25 Sep 2018 13:46:28 +0300 Subject: [PATCH] Set header layout as in the desktop editors --- apps/common/main/lib/view/Header.js | 1 + .../main/app/controller/Toolbar.js | 21 ++++++++++--------- .../main/app/controller/Viewport.js | 6 ++++-- apps/documenteditor/main/app/view/Toolbar.js | 2 +- .../main/app/controller/Toolbar.js | 20 +++++++++--------- .../main/app/controller/Viewport.js | 6 ++++-- .../main/app/view/Toolbar.js | 2 +- .../main/app/controller/Toolbar.js | 20 +++++++++--------- .../main/app/controller/Viewport.js | 9 ++++---- .../main/app/view/Toolbar.js | 2 +- 10 files changed, 48 insertions(+), 41 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 4ef297cb7..eef3df1b2 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -106,6 +106,7 @@ define([ ''; var templateTitleBox = '
' + + '
' + '
' + '
' + '
' + diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 973a3eaa8..46ed54bcd 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2758,17 +2758,18 @@ define([ me.toolbar.addTab(tab, $panel, 4); me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); + + // hide 'print' and 'save' buttons group and next separator + me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); + + // hide 'undo' and 'redo' buttons and retrieve parent container + var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); + + // move 'paste' button to the container instead of 'undo' and 'redo' + me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnCopy.$el.removeClass('split'); + if ( config.isDesktopApp ) { - // hide 'print' and 'save' buttons group and next separator - me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); - - // hide 'undo' and 'redo' buttons and retrieve parent container - var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); - - // move 'paste' button to the container instead of 'undo' and 'redo' - me.toolbar.btnPaste.$el.detach().appendTo($box); - me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.canProtect ) { tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index 15eea4154..031f1755c 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -76,7 +76,8 @@ define([ 'render:before' : function (toolbar) { var config = DE.getController('Main').appOptions; toolbar.setExtra('right', me.header.getPanel('right', config)); - toolbar.setExtra('left', me.header.getPanel('left', config)); + if (!config.isEdit) + toolbar.setExtra('left', me.header.getPanel('left', config)); }, 'view:compact' : function (toolbar, state) { me.header.mnuitemCompactToolbar.setChecked(state, true); @@ -157,9 +158,10 @@ define([ if ( panel ) panel.height = _intvars.get('toolbar-height-tabs'); } - if ( config.isDesktopApp && config.isEdit ) { + if ( config.isEdit ) { var $title = me.viewport.vlayout.getItem('title').el; $title.html(me.header.getPanel('title', config)).show(); + $title.find('.extra').html(me.header.getPanel('left', config)); var toolbar = me.viewport.vlayout.getItem('toolbar'); toolbar.el.addClass('top-title'); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index c1123e3fd..f4ab59f50 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2097,7 +2097,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ - extCls: this.mode.isDesktopApp ? 'inc-index' : undefined, + extCls: 'inc-index', target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function () { diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 9d69e0c5a..63a30d45d 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2007,17 +2007,17 @@ define([ if ( $panel ) me.toolbar.addTab(tab, $panel, 3); + // hide 'print' and 'save' buttons group and next separator + me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); + + // hide 'undo' and 'redo' buttons and get container + var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); + + // move 'paste' button to the container instead of 'undo' and 'redo' + me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnCopy.$el.removeClass('split'); + if ( config.isDesktopApp ) { - // hide 'print' and 'save' buttons group and next separator - me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); - - // hide 'undo' and 'redo' buttons and get container - var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); - - // move 'paste' button to the container instead of 'undo' and 'redo' - me.toolbar.btnPaste.$el.detach().appendTo($box); - me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.canProtect ) { // don't add protect panel to toolbar tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index b827fce0d..29a7f9064 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -77,7 +77,8 @@ define([ 'render:before' : function (toolbar) { var config = PE.getController('Main').appOptions; toolbar.setExtra('right', me.header.getPanel('right', config)); - toolbar.setExtra('left', me.header.getPanel('left', config)); + if (!config.isEdit) + toolbar.setExtra('left', me.header.getPanel('left', config)); }, 'view:compact' : function (toolbar, state) { me.header.mnuitemCompactToolbar.setChecked(state, true); @@ -160,9 +161,10 @@ define([ me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact'); } - if ( config.isDesktopApp && config.isEdit ) { + if ( config.isEdit ) { var $title = me.viewport.vlayout.getItem('title').el; $title.html(me.header.getPanel('title', config)).show(); + $title.find('.extra').html(me.header.getPanel('left', config)); var toolbar = me.viewport.vlayout.getItem('toolbar'); toolbar.el.addClass('top-title'); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index e8ead7172..c30ef4dd9 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1425,7 +1425,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ - extCls: this.mode.isDesktopApp ? 'inc-index' : undefined, + extCls: 'inc-index', target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function () { diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index de0ef8277..5da9e6b4d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3096,17 +3096,17 @@ define([ if ( $panel ) me.toolbar.addTab(tab, $panel, 5); + // hide 'print' and 'save' buttons group and next separator + me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); + + // hide 'undo' and 'redo' buttons and get container + var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); + + // move 'paste' button to the container instead of 'undo' and 'redo' + me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnCopy.$el.removeClass('split'); + if ( config.isDesktopApp ) { - // hide 'print' and 'save' buttons group and next separator - me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); - - // hide 'undo' and 'redo' buttons and get container - var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); - - // move 'paste' button to the container instead of 'undo' and 'redo' - me.toolbar.btnPaste.$el.detach().appendTo($box); - me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.canProtect ) { tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index ae52f7426..95cdb62e4 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -78,10 +78,10 @@ define([ 'render:before' : function (toolbar) { var config = SSE.getController('Main').appOptions; toolbar.setExtra('right', me.header.getPanel('right', config)); - toolbar.setExtra('left', me.header.getPanel('left', config)); + if (!config.isEdit) + toolbar.setExtra('left', me.header.getPanel('left', config)); - if ( me.appConfig && me.appConfig.isDesktopApp && - me.appConfig.isEdit && toolbar.btnCollabChanges ) + if ( me.appConfig && me.appConfig.isEdit && toolbar.btnCollabChanges ) toolbar.btnCollabChanges = me.header.btnSave; }, @@ -144,9 +144,10 @@ define([ me.viewport.vlayout.getItem('toolbar').height = 41; } - if ( config.isDesktopApp && config.isEdit && !config.isEditDiagram && !config.isEditMailMerge ) { + if ( config.isEdit && !config.isEditDiagram && !config.isEditMailMerge ) { var $title = me.viewport.vlayout.getItem('title').el; $title.html(me.header.getPanel('title', config)).show(); + $title.find('.extra').html(me.header.getPanel('left', config)); var toolbar = me.viewport.vlayout.getItem('toolbar'); toolbar.el.addClass('top-title'); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index dcee358b6..dfdba45ac 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -2066,7 +2066,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ - extCls: this.mode.isDesktopApp ? 'inc-index' : undefined, + extCls: 'inc-index', target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function() {