diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index ceac2d37e..7162286bb 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -616,6 +616,7 @@ define([ me._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && me.appOptions.canEdit && me.editorConfig.mode !== 'view'; me.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof me.editorConfig.customization == 'object'); + me.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof me.editorConfig.customization == 'object'); me.applyModeCommonElements(); me.applyModeEditorElements(); diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index 443cbd403..d9074465a 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -74,7 +74,8 @@ define([ { caption: 'ROC 16K', subtitle: Common.Utils.String.format('19,68{0} x 27,3{0}', txtCm), value: [196.8, 273] }, { caption: 'Envelope Choukei 3', subtitle: Common.Utils.String.format('11,99{0} x 23,49{0}', txtCm), value: [119.9, 234.9] }, { caption: 'Super B/A3', subtitle: Common.Utils.String.format('33,02{0} x 48,25{0}', txtCm), value: [330.2, 482.5] } - ]; + ], + _licInfo; return { models: [], @@ -113,6 +114,8 @@ define([ setMode: function (mode) { this.getView('Settings').setMode(mode); + if (mode.canBranding) + _licInfo = mode.customization; }, initEvents: function () { @@ -185,6 +188,7 @@ define([ me.initPageInfo(); } else if ('#settings-about-view' == pageId) { // About + me.setLicInfo(_licInfo); } else { $('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode')); $('#settings-search').single('click', _.bind(me.onSearch, me)); @@ -224,6 +228,43 @@ define([ } }, + setLicInfo: function(data){ + if (data && typeof data == 'object' && typeof(data.customer)=='object') { + $('.page[data-page=settings-about-view] .logo').hide(); + $('#settings-about-tel').parent().hide(); + $('#settings-about-licensor').show(); + + var customer = data.customer, + value = customer.name; + value && value.length ? + $('#settings-about-name').text(value) : + $('#settings-about-name').hide(); + + value = customer.address; + value && value.length ? + $('#settings-about-address').text(value) : + $('#settings-about-address').parent().hide(); + + (value = customer.mail) && value.length ? + $('#settings-about-email').attr('href', "mailto:"+value).text(value) : + $('#settings-about-email').parent().hide(); + + if ((value = customer.www) && value.length) { + var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : ''; + $('#settings-about-url').attr('href', http+value).text(value); + } else + $('#settings-about-url').hide(); + + if ((value = customer.info) && value.length) { + $('#settings-about-info').show().text(value); + } + + if ( (value = customer.logo) && value.length ) { + $('#settings-about-logo').show().html(''); + } + } + }, + // Handlers onEditDocumet: function() { diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index 5741c13ab..05f98691a 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -430,16 +430,24 @@
+

DOCUMENT EDITOR

<%= scope.textVersion %> {{PRODUCT_VERSION}}

+

Ascensio System SIA

+

Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021

+

support@onlyoffice.com

+

+371 660-16425

+

www.onlyoffice.com

+

+
+ diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js index 1477d3695..7e3d041d3 100644 --- a/apps/documenteditor/mobile/app/view/Settings.js +++ b/apps/documenteditor/mobile/app/view/Settings.js @@ -54,7 +54,8 @@ define([ _canEdit = false, _canDownload = false, _canDownloadOrigin = false, - _canReader = false; + _canReader = false, + _canAbout = true; return { // el: '.view-main', @@ -95,6 +96,10 @@ define([ _canDownload = mode.canDownload; _canDownloadOrigin = mode.canDownloadOrigin; _canReader = !mode.isEdit && mode.canReader; + + if (mode.customization && mode.canBrandingExt) { + _canAbout = (mode.customization.about!==false); + } }, rootLayout: function () { @@ -117,6 +122,7 @@ define([ } if (!_canDownload) $layour.find('#settings-download-as').hide(); if (!_canDownloadOrigin) $layour.find('#settings-download').hide(); + if (!_canAbout) $layour.find('#settings-about').hide(); return $layour.html(); } @@ -245,7 +251,8 @@ define([ textCustom: 'Custom', textCustomSize: 'Custom Size', textDocumentFormats: 'Document Formats', - textOrientation: 'Orientation' + textOrientation: 'Orientation', + textPoweredBy: 'Powered by' } })(), DE.Views.Settings || {})) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 22dc3ea1f..7dd9371f4 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -348,6 +348,7 @@ "DE.Views.Settings.textPages": "Pages", "DE.Views.Settings.textParagraphs": "Paragraphs", "DE.Views.Settings.textPortrait": "Portrait", + "DE.Views.Settings.textPoweredBy": "Powered by", "DE.Views.Settings.textReader": "Reader Mode", "DE.Views.Settings.textSettings": "Settings", "DE.Views.Settings.textSpaces": "Spaces", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 827f5ed5e..a864c65d9 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -574,6 +574,7 @@ define([ me._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && me.appOptions.canEdit && me.editorConfig.mode !== 'view'; me.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof me.editorConfig.customization == 'object'); + me.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof me.editorConfig.customization == 'object'); me.applyModeCommonElements(); me.applyModeEditorElements(); diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js index 298eaccdf..03d09b096 100644 --- a/apps/presentationeditor/mobile/app/controller/Settings.js +++ b/apps/presentationeditor/mobile/app/controller/Settings.js @@ -55,7 +55,8 @@ define([ var rootView, inProgress, infoObj, - modalView; + modalView, + _licInfo; var _slideSizeArr = [ [254, 190.5], [254, 143] @@ -91,6 +92,8 @@ define([ setMode: function (mode) { this.getView('Settings').setMode(mode); + if (mode.canBranding) + _licInfo = mode.customization; }, initEvents: function () { @@ -163,6 +166,46 @@ define([ var me = this; if (pageId == '#settings-setup-view') { me.onApiPageSize(me.api.get_PresentationWidth(), me.api.get_PresentationHeight()); + } else if (pageId == '#settings-about-view') { + // About + me.setLicInfo(_licInfo); + } + }, + + setLicInfo: function(data){ + if (data && typeof data == 'object' && typeof(data.customer)=='object') { + $('.page[data-page=settings-about-view] .logo').hide(); + $('#settings-about-tel').parent().hide(); + $('#settings-about-licensor').show(); + + var customer = data.customer, + value = customer.name; + value && value.length ? + $('#settings-about-name').text(value) : + $('#settings-about-name').hide(); + + value = customer.address; + value && value.length ? + $('#settings-about-address').text(value) : + $('#settings-about-address').parent().hide(); + + (value = customer.mail) && value.length ? + $('#settings-about-email').attr('href', "mailto:"+value).text(value) : + $('#settings-about-email').parent().hide(); + + if ((value = customer.www) && value.length) { + var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : ''; + $('#settings-about-url').attr('href', http+value).text(value); + } else + $('#settings-about-url').hide(); + + if ((value = customer.info) && value.length) { + $('#settings-about-info').show().text(value); + } + + if ( (value = customer.logo) && value.length ) { + $('#settings-about-logo').show().html(''); + } } }, diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template index d5bdef055..dbab00f80 100644 --- a/apps/presentationeditor/mobile/app/template/Settings.template +++ b/apps/presentationeditor/mobile/app/template/Settings.template @@ -232,16 +232,24 @@
+

PRESENTATION EDITOR

<%= scope.textVersion %> {{PRODUCT_VERSION}}

+

Ascensio System SIA

+

Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021

+

support@onlyoffice.com

+

+371 660-16425

+

www.onlyoffice.com

+

+
+ diff --git a/apps/presentationeditor/mobile/app/view/Settings.js b/apps/presentationeditor/mobile/app/view/Settings.js index ec71b1ab7..40afdc56d 100644 --- a/apps/presentationeditor/mobile/app/view/Settings.js +++ b/apps/presentationeditor/mobile/app/view/Settings.js @@ -52,7 +52,8 @@ define([ // private var isEdit, canEdit = false, - canDownload = false; + canDownload = false, + canAbout = true; return { // el: '.view-main', @@ -96,6 +97,10 @@ define([ isEdit = mode.isEdit; canEdit = !mode.isEdit && mode.canEdit && mode.canRequestEditRights; canDownload = mode.canDownload || mode.canDownloadOrigin; + + if (mode.customization && mode.canBrandingExt) { + canAbout = (mode.customization.about!==false); + } }, rootLayout: function () { @@ -115,6 +120,7 @@ define([ .prop('checked', Common.SharedSettings.get('readerMode')); } if (!canDownload) $layour.find('#settings-download').hide(); + if (!canAbout) $layour.find('#settings-about').hide(); return $layour.html(); } @@ -211,7 +217,8 @@ define([ textTel: 'tel', textSlideSize: 'Slide Size', mniSlideStandard: 'Standard (4:3)', - mniSlideWide: 'Widescreen (16:9)' + mniSlideWide: 'Widescreen (16:9)', + textPoweredBy: 'Powered by' } })(), PE.Views.Settings || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 1d15f4d3d..ff24dd0ea 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -420,6 +420,7 @@ "PE.Views.Settings.textFind": "Find", "PE.Views.Settings.textHelp": "Help", "PE.Views.Settings.textLoading": "Loading...", + "PE.Views.Settings.textPoweredBy": "Powered by", "PE.Views.Settings.textPresentInfo": "Presentation Info", "PE.Views.Settings.textPresentSetup": "Presentation Setup", "PE.Views.Settings.textPresentTitle": "Presentation title", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index f93220509..3932cb6ed 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -51,7 +51,8 @@ define([ var rootView, inProgress, infoObj, - modalView; + modalView, + _licInfo; return { models: [], @@ -85,6 +86,8 @@ define([ setMode: function (mode) { this.getView('Settings').setMode(mode); + if (mode.canBranding) + _licInfo = mode.customization; }, initEvents: function () { @@ -142,13 +145,58 @@ define([ } }, - onPageShow: function(view) { + onPageShow: function(view, pageId) { var me = this; $('#settings-search').single('click', _.bind(me._onSearch, me)); $('#settings-edit-document').single('click', _.bind(me._onEditDocument, me)); $(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me)); + me.initSettings(pageId); }, + initSettings: function (pageId) { + var me = this; + if (pageId == '#settings-about-view') { + // About + me.setLicInfo(_licInfo); + } + }, + + setLicInfo: function(data){ + if (data && typeof data == 'object' && typeof(data.customer)=='object') { + $('.page[data-page=settings-about-view] .logo').hide(); + $('#settings-about-tel').parent().hide(); + $('#settings-about-licensor').show(); + + var customer = data.customer, + value = customer.name; + value && value.length ? + $('#settings-about-name').text(value) : + $('#settings-about-name').hide(); + + value = customer.address; + value && value.length ? + $('#settings-about-address').text(value) : + $('#settings-about-address').parent().hide(); + + (value = customer.mail) && value.length ? + $('#settings-about-email').attr('href', "mailto:"+value).text(value) : + $('#settings-about-email').parent().hide(); + + if ((value = customer.www) && value.length) { + var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : ''; + $('#settings-about-url').attr('href', http+value).text(value); + } else + $('#settings-about-url').hide(); + + if ((value = customer.info) && value.length) { + $('#settings-about-info').show().text(value); + } + + if ( (value = customer.logo) && value.length ) { + $('#settings-about-logo').show().html(''); + } + } + }, // API handlers diff --git a/apps/spreadsheeteditor/mobile/app/template/Settings.template b/apps/spreadsheeteditor/mobile/app/template/Settings.template index 47d9c2f81..fd9378da6 100644 --- a/apps/spreadsheeteditor/mobile/app/template/Settings.template +++ b/apps/spreadsheeteditor/mobile/app/template/Settings.template @@ -270,16 +270,24 @@
+

SPREADSHEET EDITOR

<%= scope.textVersion %> {{PRODUCT_VERSION}}

+

Ascensio System SIA

+

Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021

+

support@onlyoffice.com

+

+371 660-16425

+

www.onlyoffice.com

+

+
+ diff --git a/apps/spreadsheeteditor/mobile/app/view/Settings.js b/apps/spreadsheeteditor/mobile/app/view/Settings.js index 133ad23b5..8a599c607 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/view/Settings.js @@ -51,7 +51,8 @@ define([ // private var isEdit, canEdit = false, - canDownload = false; + canDownload = false, + canAbout = true; return { // el: '.view-main', @@ -101,6 +102,10 @@ define([ isEdit = mode.isEdit; canEdit = !mode.isEdit && mode.canEdit && mode.canRequestEditRights; canDownload = mode.canDownload || mode.canDownloadOrigin; + + if (mode.customization && mode.canBrandingExt) { + canAbout = (mode.customization.about!==false); + } }, rootLayout: function () { @@ -115,6 +120,7 @@ define([ if (!canEdit) $layout.find('#settings-edit-document').hide(); } if (!canDownload) $layout.find('#settings-download').hide(); + if (!canAbout) $layout.find('#settings-about').hide(); return $layout.html(); } @@ -141,7 +147,7 @@ define([ content: $content.html() }); - this.fireEvent('page:show', this); + this.fireEvent('page:show', [this, templateId]); } }, @@ -203,7 +209,8 @@ define([ textVersion: 'Version', textAddress: 'address', textEmail: 'email', - textTel: 'tel' + textTel: 'tel', + textPoweredBy: 'Powered by' } })(), SSE.Views.Settings || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 2b4ae6721..f7d84b864 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -456,6 +456,7 @@ "SSE.Views.Settings.textFindAndReplace": "Find and Replace", "SSE.Views.Settings.textHelp": "Help", "SSE.Views.Settings.textLoading": "Loading...", + "SSE.Views.Settings.textPoweredBy": "Powered by", "SSE.Views.Settings.textSettings": "Settings", "SSE.Views.Settings.textTel": "tel", "SSE.Views.Settings.textVersion": "Version",