From 91972b300a3c5241ab5b21cfae81997f25b544f3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 15 May 2018 11:10:33 +0300 Subject: [PATCH 1/3] [Mobile] Fix Bug 37700 --- apps/common/mobile/resources/less/material/_container.less | 4 ++-- apps/documenteditor/mobile/resources/css/app-material.css | 4 ++-- apps/presentationeditor/mobile/resources/css/app-material.css | 4 ++-- apps/spreadsheeteditor/mobile/resources/css/app-material.css | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/common/mobile/resources/less/material/_container.less b/apps/common/mobile/resources/less/material/_container.less index d72f27eaa..8caf0af92 100644 --- a/apps/common/mobile/resources/less/material/_container.less +++ b/apps/common/mobile/resources/less/material/_container.less @@ -50,10 +50,10 @@ } .popover-view { - border-radius: 3px; + border-radius: 2px; > .pages { - border-radius: 3px; + border-radius: 2px; } } } diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 16bb85cd5..01f6efb39 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -5664,11 +5664,11 @@ a.item-link, } .settings.popup .popover-view, .settings.popover .popover-view { - border-radius: 3px; + border-radius: 2px; } .settings.popup .popover-view > .pages, .settings.popover .popover-view > .pages { - border-radius: 3px; + border-radius: 2px; } .settings .categories { width: 100%; diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index 3de924f2d..0f45b26d4 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -5664,11 +5664,11 @@ a.item-link, } .settings.popup .popover-view, .settings.popover .popover-view { - border-radius: 3px; + border-radius: 2px; } .settings.popup .popover-view > .pages, .settings.popover .popover-view > .pages { - border-radius: 3px; + border-radius: 2px; } .settings .categories { width: 100%; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 85046cd42..4e5d59495 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -5674,11 +5674,11 @@ textarea { } .settings.popup .popover-view, .settings.popover .popover-view { - border-radius: 3px; + border-radius: 2px; } .settings.popup .popover-view > .pages, .settings.popover .popover-view > .pages { - border-radius: 3px; + border-radius: 2px; } .settings .categories { width: 100%; From 0175dc8e9d7cc2588de4cf921d44517d366a62ef Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 17 May 2018 12:30:13 +0300 Subject: [PATCH 2/3] [SSE] locked 'pivot table' options for offline files --- .../main/app/controller/Main.js | 2 +- .../main/app/controller/Toolbar.js | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 653f2a13b..f97db87d0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1000,7 +1000,7 @@ define([ statusbarController.getView('Statusbar').changeViewMode(true); } - if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) + if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && !me.appOptions.isOffline) application.getController('PivotTable').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api); var viewport = this.getApplication().getController('Viewport').getView('Viewport'); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 3f50209ad..893472db0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2953,15 +2953,17 @@ define([ me.toolbar.setApi(me.api); if ( !config.isEditDiagram && !config.isEditMailMerge ) { - var tab = {action: 'pivot', caption: me.textPivot}; - var $panel = me.getApplication().getController('PivotTable').createToolbarPanel(); - if ( $panel ) { - me.toolbar.addTab(tab, $panel, 3); - me.toolbar.setVisible('pivot', true); + if ( !config.isOffline ) { + tab = {action: 'pivot', caption: me.textPivot}; + $panel = me.getApplication().getController('PivotTable').createToolbarPanel(); + if ($panel) { + me.toolbar.addTab(tab, $panel, 3); + me.toolbar.setVisible('pivot', true); + } } - tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; - $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); + var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; + var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); if ( $panel ) me.toolbar.addTab(tab, $panel, 4); @@ -2978,7 +2980,7 @@ define([ if ( config.isProtectSupport && config.isOffline ) { tab = {action: 'protect', caption: me.toolbar.textTabProtect}; - var $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); + $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) me.toolbar.addTab(tab, $panel, 5); } From fe43b16e080734f984f13e282e96b4f823bbe772 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 May 2018 15:44:38 +0300 Subject: [PATCH 3/3] [DE] Fix layout for review changes dialog --- apps/common/main/lib/view/ReviewChanges.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 9f86d7636..397c91e9c 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -969,7 +969,7 @@ define([ Common.Views.ReviewChangesDialog = Common.UI.Window.extend(_.extend({ options: { - width : 283, + width : 330, height : 90, title : 'Review Changes', modal : false, @@ -978,7 +978,9 @@ define([ }, initialize : function(options) { - _.extend(this.options, options || {}); + _.extend(this.options, { + title : this.textTitle + }, options || {}); this.template = [ '
',