diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 42fdf831ca..eca408c00b 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -414,6 +414,14 @@ define([ $html.find('#slot-btn-back').hide(); this.labelDocName.hide(); + //TODO: for new design representation only + this.labelDocName = $('#box-document-title > #title-doc-name'); + this.labelDocName.text = function (str) {this.val(str);}; + this.labelDocName.text( this.documentCaption ); + + $('.toolbar-fullview-panel').addClass('new-doctitle-offset'); + /***********/ + if ( config.isOffline ) $saveStatus = false; } else { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 67c665f3a3..af24cab25a 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -239,4 +239,27 @@ width: 20px; height: 20px; } -} \ No newline at end of file +} + +#box-document-title { + background-color: @tabs-bg-color; + + #title-doc-name { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + text-align: center; + font-size: 12px; + width: 100%; + height: 100%; + + color: #d3d9e3; + background-color: transparent; + border: 0 none; + cursor: default; + } +} + +.toolbar-fullview-panel.new-doctitle-offset { + top: @height-tabs + 26; +} diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index fe6907548c..b34a955f85 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -75,7 +75,8 @@ define([ toolbar.setExtra('left', me.header.getPanel('left', config)); }, 'view:compact' : function (toolbar, state) { - me.viewport.vlayout.panels[0].height = state ? 32 : 32+67; + me.viewport.vlayout.getItem('toolbar').height = state ? + Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal'); } } }); @@ -113,11 +114,18 @@ define([ onAppShowed: function (config) { var me = this; + me.appConfig = config; if ( !config.isEdit || ( !Common.localStorage.itemExists("de-compact-toolbar") && config.customization && config.customization.compactToolbar )) { - me.viewport.vlayout.panels[0].height = 32; + + var panel = me.viewport.vlayout.getItem('toolbar'); + if ( panel ) panel.height = Common.Utils.InternalSettings.get('toolbar-height-compact'); + } + + if ( config.isDesktopApp ) { + me.viewport.vlayout.getItem('doc-title').el.show(); } }, diff --git a/apps/documenteditor/main/app/template/Viewport.template b/apps/documenteditor/main/app/template/Viewport.template index a0d2cb205d..2535307dd8 100644 --- a/apps/documenteditor/main/app/template/Viewport.template +++ b/apps/documenteditor/main/app/template/Viewport.template @@ -1,5 +1,8 @@