Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

v5.1.4

Browse source
This commit is contained in:
Alexey Golubev 2018-05-24 15:34:47 +03:00
parent bce8908d78 fe43b16e08
commit 02c9828c57
7 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/view/ReviewChanges.js
View file

@ -969,7 +969,7 @@ define([
Common.Views.ReviewChangesDialog = Common.UI.Window.extend(_.extend({ Common.Views.ReviewChangesDialog = Common.UI.Window.extend(_.extend({
options: { options: {
width : 283, width : 330,
height : 90, height : 90,
title : 'Review Changes', title : 'Review Changes',
modal : false, modal : false,
@ -978,7 +978,9 @@ define([
}, },
initialize : function(options) { initialize : function(options) {
_.extend(this.options, options || {}); _.extend(this.options, {
title : this.textTitle
}, options || {});
this.template = [ this.template = [
'<div class="box">', '<div class="box">',

4
apps/common/mobile/resources/less/material/_container.less
View file

@ -50,10 +50,10 @@
} }
.popover-view { .popover-view {
border-radius: 3px; border-radius: 2px;
> .pages { > .pages {
border-radius: 3px; border-radius: 2px;
} }
} }
} }

4
apps/documenteditor/mobile/resources/css/app-material.css
View file

@ -5664,11 +5664,11 @@ a.item-link,
} }
.settings.popup .popover-view, .settings.popup .popover-view,
.settings.popover .popover-view { .settings.popover .popover-view {
border-radius: 3px; border-radius: 2px;
} }
.settings.popup .popover-view > .pages, .settings.popup .popover-view > .pages,
.settings.popover .popover-view > .pages { .settings.popover .popover-view > .pages {
border-radius: 3px; border-radius: 2px;
} }
.settings .categories { .settings .categories {
width: 100%; width: 100%;

4
apps/presentationeditor/mobile/resources/css/app-material.css
View file

@ -5664,11 +5664,11 @@ a.item-link,
} }
.settings.popup .popover-view, .settings.popup .popover-view,
.settings.popover .popover-view { .settings.popover .popover-view {
border-radius: 3px; border-radius: 2px;
} }
.settings.popup .popover-view > .pages, .settings.popup .popover-view > .pages,
.settings.popover .popover-view > .pages { .settings.popover .popover-view > .pages {
border-radius: 3px; border-radius: 2px;
} }
.settings .categories { .settings .categories {
width: 100%; width: 100%;

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1000,7 +1000,7 @@ define([
statusbarController.getView('Statusbar').changeViewMode(true); 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); application.getController('PivotTable').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
var viewport = this.getApplication().getController('Viewport').getView('Viewport'); var viewport = this.getApplication().getController('Viewport').getView('Viewport');

18
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -2957,15 +2957,17 @@ define([
me.toolbar.setApi(me.api); me.toolbar.setApi(me.api);
if ( !config.isEditDiagram && !config.isEditMailMerge ) { if ( !config.isEditDiagram && !config.isEditMailMerge ) {
var tab = {action: 'pivot', caption: me.textPivot}; if ( !config.isOffline ) {
var $panel = me.getApplication().getController('PivotTable').createToolbarPanel(); tab = {action: 'pivot', caption: me.textPivot};
if ( $panel ) { $panel = me.getApplication().getController('PivotTable').createToolbarPanel();
me.toolbar.addTab(tab, $panel, 3); if ($panel) {
me.toolbar.setVisible('pivot', true); me.toolbar.addTab(tab, $panel, 3);
me.toolbar.setVisible('pivot', true);
}
} }
tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
$panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel ) if ( $panel )
me.toolbar.addTab(tab, $panel, 4); me.toolbar.addTab(tab, $panel, 4);
@ -2982,7 +2984,7 @@ define([
if ( config.isOffline ) { if ( config.isOffline ) {
tab = {action: 'protect', caption: me.toolbar.textTabProtect}; 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) if ($panel)
me.toolbar.addTab(tab, $panel, 5); me.toolbar.addTab(tab, $panel, 5);
} }

4
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

@ -5674,11 +5674,11 @@ textarea {
} }
.settings.popup .popover-view, .settings.popup .popover-view,
.settings.popover .popover-view { .settings.popover .popover-view {
border-radius: 3px; border-radius: 2px;
} }
.settings.popup .popover-view > .pages, .settings.popup .popover-view > .pages,
.settings.popover .popover-view > .pages { .settings.popover .popover-view > .pages {
border-radius: 3px; border-radius: 2px;
} }
.settings .categories { .settings .categories {
width: 100%; width: 100%;