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

Branding refactoring

Browse source
This commit is contained in:
Julia Radzhabova 2019-02-07 13:18:56 +03:00
parent 4866923553
commit 89a704950c
13 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api/documents/api.js
View file

@ -580,8 +580,6 @@
customization: { customization: {
about: true, about: true,
feedback: false feedback: false
// ,compactHeader:true
// ,toolbarBreakTabs:true
} }
} }
}; };

4
apps/documenteditor/main/app/controller/Main.js
View file

@ -1156,6 +1156,10 @@ define([
this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object'); this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding) if (this.appOptions.canBranding)
appHeader.setBranding(this.editorConfig.customization); appHeader.setBranding(this.editorConfig.customization);
else if (typeof this.editorConfig.customization == 'object') {
this.editorConfig.customization.compactHeader = this.editorConfig.customization.toolbarBreakTabs =
this.editorConfig.customization.toolbarHideFileName = false;
}
this.appOptions.canRename && appHeader.setCanRename(true); this.appOptions.canRename && appHeader.setCanRename(true);

2
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -2778,7 +2778,7 @@ define([
me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
if (!config.canBranding || !config.customization.compactHeader) { if (!(config.customization && config.customization.compactHeader)) {
// hide 'print' and 'save' buttons group and next separator // hide 'print' and 'save' buttons group and next separator
me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();

6
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -76,7 +76,7 @@ define([
'render:before' : function (toolbar) { 'render:before' : function (toolbar) {
var config = DE.getController('Main').appOptions; var config = DE.getController('Main').appOptions;
toolbar.setExtra('right', me.header.getPanel('right', config)); toolbar.setExtra('right', me.header.getPanel('right', config));
if (!config.isEdit || config.canBranding && !!config.customization.compactHeader) if (!config.isEdit || config.customization && !!config.customization.compactHeader)
toolbar.setExtra('left', me.header.getPanel('left', config)); toolbar.setExtra('left', me.header.getPanel('left', config));
}, },
'view:compact' : function (toolbar, state) { 'view:compact' : function (toolbar, state) {
@ -162,7 +162,7 @@ define([
if ( panel ) panel.height = _intvars.get('toolbar-height-tabs'); if ( panel ) panel.height = _intvars.get('toolbar-height-tabs');
} }
if ( config.canBranding ) { if ( config.customization ) {
if ( config.customization.toolbarBreakTabs ) if ( config.customization.toolbarBreakTabs )
me.viewport.vlayout.getItem('toolbar').el.addClass('style-off-tabs'); me.viewport.vlayout.getItem('toolbar').el.addClass('style-off-tabs');
@ -170,7 +170,7 @@ define([
me.viewport.vlayout.getItem('toolbar').el.addClass('style-skip-docname'); me.viewport.vlayout.getItem('toolbar').el.addClass('style-skip-docname');
} }
if ( config.isEdit && (!config.canBranding || !config.customization.compactHeader)) { if ( config.isEdit && (!(config.customization && config.customization.compactHeader))) {
var $title = me.viewport.vlayout.getItem('title').el; var $title = me.viewport.vlayout.getItem('title').el;
$title.html(me.header.getPanel('title', config)).show(); $title.html(me.header.getPanel('title', config)).show();
$title.find('.extra').html(me.header.getPanel('left', config)); $title.find('.extra').html(me.header.getPanel('left', config));

5
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1565,9 +1565,6 @@ define([
var me = this; var me = this;
// if (this.mode.isDesktopApp || this.mode.canBrandingExt && this.mode.customization && this.mode.customization.header === false)
// this.mnuitemHideTitleBar.hide();
this.btnMarkers.setMenu( this.btnMarkers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
style: 'min-width: 139px', style: 'min-width: 139px',
@ -2111,7 +2108,7 @@ define([
createSynchTip: function () { createSynchTip: function () {
this.synchTooltip = new Common.UI.SynchronizeTip({ this.synchTooltip = new Common.UI.SynchronizeTip({
extCls: (this.mode.canBranding && !!this.mode.customization.compactHeader) ? undefined : 'inc-index', extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index',
target: this.btnCollabChanges.$el target: this.btnCollabChanges.$el
}); });
this.synchTooltip.on('dontshowclick', function () { this.synchTooltip.on('dontshowclick', function () {

4
apps/presentationeditor/main/app/controller/Main.js
View file

@ -898,6 +898,10 @@ define([
this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object'); this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding) if (this.appOptions.canBranding)
appHeader.setBranding(this.editorConfig.customization); appHeader.setBranding(this.editorConfig.customization);
else if (typeof this.editorConfig.customization == 'object') {
this.editorConfig.customization.compactHeader = this.editorConfig.customization.toolbarBreakTabs =
this.editorConfig.customization.toolbarHideFileName = false;
}
this.appOptions.canRename && appHeader.setCanRename(true); this.appOptions.canRename && appHeader.setCanRename(true);

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -2019,7 +2019,7 @@ define([
me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
if (!config.canBranding || !config.customization.compactHeader) { if (!(config.customization && config.customization.compactHeader)) {
// hide 'print' and 'save' buttons group and next separator // hide 'print' and 'save' buttons group and next separator
me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();

6
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -77,7 +77,7 @@ define([
'render:before' : function (toolbar) { 'render:before' : function (toolbar) {
var config = PE.getController('Main').appOptions; var config = PE.getController('Main').appOptions;
toolbar.setExtra('right', me.header.getPanel('right', config)); toolbar.setExtra('right', me.header.getPanel('right', config));
if (!config.isEdit || config.canBranding && !!config.customization.compactHeader) if (!config.isEdit || config.customization && !!config.customization.compactHeader)
toolbar.setExtra('left', me.header.getPanel('left', config)); toolbar.setExtra('left', me.header.getPanel('left', config));
}, },
'view:compact' : function (toolbar, state) { 'view:compact' : function (toolbar, state) {
@ -165,7 +165,7 @@ define([
me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact'); me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact');
} }
if ( config.isEdit && (!config.canBranding || !config.customization.compactHeader)) { if ( config.isEdit && (!(config.customization && config.customization.compactHeader))) {
var $title = me.viewport.vlayout.getItem('title').el; var $title = me.viewport.vlayout.getItem('title').el;
$title.html(me.header.getPanel('title', config)).show(); $title.html(me.header.getPanel('title', config)).show();
$title.find('.extra').html(me.header.getPanel('left', config)); $title.find('.extra').html(me.header.getPanel('left', config));
@ -185,7 +185,7 @@ define([
toolbar.btnCollabChanges = me.header.btnSave; toolbar.btnCollabChanges = me.header.btnSave;
} }
if ( config.canBranding ) { if ( config.customization ) {
if ( config.customization.toolbarBreakTabs ) if ( config.customization.toolbarBreakTabs )
me.viewport.vlayout.getItem('toolbar').el.addClass('style-off-tabs'); me.viewport.vlayout.getItem('toolbar').el.addClass('style-off-tabs');

2
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1429,7 +1429,7 @@ define([
createSynchTip: function () { createSynchTip: function () {
this.synchTooltip = new Common.UI.SynchronizeTip({ this.synchTooltip = new Common.UI.SynchronizeTip({
extCls: (this.mode.canBranding && !!this.mode.customization.compactHeader) ? undefined : 'inc-index', extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index',
target: this.btnCollabChanges.$el target: this.btnCollabChanges.$el
}); });
this.synchTooltip.on('dontshowclick', function () { this.synchTooltip.on('dontshowclick', function () {

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

@ -917,6 +917,10 @@ define([
this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object'); this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding) if (this.appOptions.canBranding)
this.headerView.setBranding(this.editorConfig.customization); this.headerView.setBranding(this.editorConfig.customization);
else if (typeof this.editorConfig.customization == 'object') {
this.editorConfig.customization.compactHeader = this.editorConfig.customization.toolbarBreakTabs =
this.editorConfig.customization.toolbarHideFileName = false;
}
this.appOptions.canRename && this.headerView.setCanRename(true); this.appOptions.canRename && this.headerView.setCanRename(true);
} else } else

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

@ -3111,7 +3111,7 @@ define([
if ( $panel ) if ( $panel )
me.toolbar.addTab(tab, $panel, 4); me.toolbar.addTab(tab, $panel, 4);
if (!config.canBranding || !config.customization.compactHeader) { if (!(config.customization && config.customization.compactHeader)) {
// hide 'print' and 'save' buttons group and next separator // hide 'print' and 'save' buttons group and next separator
me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();

8
apps/spreadsheeteditor/main/app/controller/Viewport.js
View file

@ -78,10 +78,10 @@ define([
'render:before' : function (toolbar) { 'render:before' : function (toolbar) {
var config = SSE.getController('Main').appOptions; var config = SSE.getController('Main').appOptions;
toolbar.setExtra('right', me.header.getPanel('right', config)); toolbar.setExtra('right', me.header.getPanel('right', config));
if (!config.isEdit || config.canBranding && !!config.customization.compactHeader) if (!config.isEdit || config.customization && !!config.customization.compactHeader)
toolbar.setExtra('left', me.header.getPanel('left', config)); toolbar.setExtra('left', me.header.getPanel('left', config));
if ( me.appConfig && me.appConfig.isEdit && (!config.canBranding || !config.customization.compactHeader) && toolbar.btnCollabChanges ) if ( me.appConfig && me.appConfig.isEdit && !(config.customization && config.customization.compactHeader) && toolbar.btnCollabChanges )
toolbar.btnCollabChanges = me.header.btnSave; toolbar.btnCollabChanges = me.header.btnSave;
}, },
@ -148,7 +148,7 @@ define([
me.viewport.vlayout.getItem('toolbar').height = 41; me.viewport.vlayout.getItem('toolbar').height = 41;
} }
if ( config.isEdit && !config.isEditDiagram && !config.isEditMailMerge && (!config.canBranding || !config.customization.compactHeader)) { if ( config.isEdit && !config.isEditDiagram && !config.isEditMailMerge && !(config.customization && config.customization.compactHeader)) {
var $title = me.viewport.vlayout.getItem('title').el; var $title = me.viewport.vlayout.getItem('title').el;
$title.html(me.header.getPanel('title', config)).show(); $title.html(me.header.getPanel('title', config)).show();
$title.find('.extra').html(me.header.getPanel('left', config)); $title.find('.extra').html(me.header.getPanel('left', config));
@ -165,7 +165,7 @@ define([
$filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height')); $filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
} }
if ( config.canBranding ) { if ( config.customization ) {
if ( config.customization.toolbarBreakTabs ) if ( config.customization.toolbarBreakTabs )
me.viewport.vlayout.getItem('toolbar').el.addClass('style-off-tabs'); me.viewport.vlayout.getItem('toolbar').el.addClass('style-off-tabs');

2
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -2092,7 +2092,7 @@ define([
createSynchTip: function () { createSynchTip: function () {
this.synchTooltip = new Common.UI.SynchronizeTip({ this.synchTooltip = new Common.UI.SynchronizeTip({
extCls: (this.mode.canBranding && !!this.mode.customization.compactHeader) ? undefined : 'inc-index', extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index',
target: this.btnCollabChanges.$el target: this.btnCollabChanges.$el
}); });
this.synchTooltip.on('dontshowclick', function() { this.synchTooltip.on('dontshowclick', function() {