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

[all] for bug 53110

Browse source
This commit is contained in:
Maxim Kadushkin 2021-12-18 13:40:59 +03:00
parent a0112969ec
commit 521ac275e2
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -97,7 +97,7 @@ class MainPage extends Component {
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
<Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}> <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
{showLogo && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>} {showLogo && appOptions.canBranding !== undefined && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
<Subnavbar> <Subnavbar>
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/> <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
<Search useSuspense={false}/> <Search useSuspense={false}/>

2
apps/presentationeditor/mobile/src/page/main.jsx
View file

@ -105,7 +105,7 @@ class MainPage extends Component {
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
<Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}> <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
{showLogo && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>} {showLogo && appOptions.canBranding && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
<Subnavbar> <Subnavbar>
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/> <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
<Search useSuspense={false}/> <Search useSuspense={false}/>

2
apps/presentationeditor/mobile/src/store/appOptions.js
View file

@ -11,6 +11,7 @@ export class storeAppOptions {
lostEditingRights: observable, lostEditingRights: observable,
changeEditingRights: action, changeEditingRights: action,
canBrandingExt: observable,
isDocReady: observable, isDocReady: observable,
changeDocReady: action changeDocReady: action
@ -19,6 +20,7 @@ export class storeAppOptions {
isEdit = false; isEdit = false;
canViewComments = false; canViewComments = false;
canBrandingExt = false;
config = {}; config = {};
lostEditingRights = false; lostEditingRights = false;

2
apps/spreadsheeteditor/mobile/src/page/main.jsx
View file

@ -100,7 +100,7 @@ class MainPage extends Component {
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
<Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}> <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
{showLogo && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>} {showLogo && appOptions.canBranding !== undefined && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
<Subnavbar> <Subnavbar>
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/> <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
<Search useSuspense={false}/> <Search useSuspense={false}/>

4
apps/spreadsheeteditor/mobile/src/store/appOptions.js
View file

@ -11,6 +11,7 @@ export class storeAppOptions {
lostEditingRights: observable, lostEditingRights: observable,
changeEditingRights: action, changeEditingRights: action,
canBranding: observable,
isDocReady: observable, isDocReady: observable,
changeDocReady: action changeDocReady: action
@ -25,6 +26,7 @@ export class storeAppOptions {
this.canViewComments = value; this.canViewComments = value;
} }
canBranding = undefined;
lostEditingRights = false; lostEditingRights = false;
changeEditingRights (value) { changeEditingRights (value) {
this.lostEditingRights = value; this.lostEditingRights = value;
@ -98,8 +100,6 @@ export class storeAppOptions {
this.trialMode = params.asc_getLicenseMode(); this.trialMode = params.asc_getLicenseMode();
this.canDownloadOrigin = permissions.download !== false; this.canDownloadOrigin = permissions.download !== false;
this.canDownload = permissions.download !== false; this.canDownload = permissions.download !== false;
this.canBranding = params.asc_getCustomization();
this.canBrandingExt = params.asc_getCanBranding() && (typeof this.customization == 'object');
this.canUseReviewPermissions = this.canLicense && (!!permissions.reviewGroups || this.customization this.canUseReviewPermissions = this.canLicense && (!!permissions.reviewGroups || this.customization
&& this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object')); && this.customization.reviewPermissions && (typeof (this.customization.reviewPermissions) == 'object'));
this.canUseCommentPermissions = this.canLicense && !!permissions.commentGroups; this.canUseCommentPermissions = this.canLicense && !!permissions.commentGroups;