diff --git a/apps/documenteditor/main/app/controller/ViewTab.js b/apps/documenteditor/main/app/controller/ViewTab.js index 4f8128f23..0e544b79b 100644 --- a/apps/documenteditor/main/app/controller/ViewTab.js +++ b/apps/documenteditor/main/app/controller/ViewTab.js @@ -72,12 +72,22 @@ define([ }, setConfig: function(config) { + var mode = config.mode; this.toolbar = config.toolbar; this.view = this.createView('ViewTab', { toolbar: this.toolbar.toolbar, - mode: config.mode, + mode: mode, compactToolbar: this.toolbar.toolbar.isCompactView }); + if (mode.canBrandingExt && mode.customization && mode.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar')) { + this.view.chStatusbar.$el.remove(); + var slotChkRulers = this.view.chRulers.$el, + groupRulers = slotChkRulers.closest('.group'), + groupToolbar = this.view.chToolbar.$el.closest('.group'); + groupToolbar.find('.elset')[1].append(slotChkRulers[0]); + groupRulers.remove(); + this.view.cmpEl.find('.separator-rulers').remove(); + } this.addListeners({ 'ViewTab': { 'zoom:topage': _.bind(this.onBtnZoomTo, this, 'topage'), diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index a20d3042e..a9b069198 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -202,14 +202,14 @@
-
- -
+
+ +
-
+
diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js index 1460cdac1..ed1636b24 100644 --- a/apps/documenteditor/main/app/view/ViewTab.js +++ b/apps/documenteditor/main/app/view/ViewTab.js @@ -211,6 +211,8 @@ define([ dataHintOffset: 'small' }); this.lockedControls.push(this.chRulers); + + this.cmpEl = $host; }, render: function (el) { diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js index bfd39f5fc..9fedc8a61 100644 --- a/apps/presentationeditor/main/app/controller/ViewTab.js +++ b/apps/presentationeditor/main/app/controller/ViewTab.js @@ -74,12 +74,16 @@ define([ }, setConfig: function(config) { + var mode = config.mode; this.toolbar = config.toolbar; this.view = this.createView('ViewTab', { toolbar: this.toolbar.toolbar, - mode: config.mode, + mode: mode, compactToolbar: this.toolbar.toolbar.isCompactView }); + if (mode.canBrandingExt && mode.customization && mode.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar')) { + this.view.chStatusbar.$el.remove(); + } this.addListeners({ 'ViewTab': { 'zoom:toslide': _.bind(this.onBtnZoomTo, this, 'toslide'), diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index 6842594d2..9a2166506 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -211,10 +211,10 @@
- +
- +
diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js index bac0719d4..09d045e0b 100644 --- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js @@ -78,11 +78,15 @@ define([ setConfig: function(config) { this.toolbar = config.toolbar; + var mode = config.mode; this.view = this.createView('ViewTab', { toolbar: this.toolbar.toolbar, - mode: config.mode, + mode: mode, compactToolbar: this.toolbar.toolbar.isCompactView }); + if (mode.canBrandingExt && mode.customization && mode.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar')) { + this.view.chStatusbar.$el.remove(); + } this.addListeners({ 'ViewTab': { 'zoom:selected': _.bind(this.onSelectedZoomValue, this), diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 79469b15a..059112936 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -294,10 +294,10 @@
- +
- +