diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 060ecd1bc4..aa4f116eb1 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -52,6 +52,9 @@ --f7-subnavbar-border-color: @background-menu-divider; --f7-list-border-color: @background-menu-divider; + --f7-picker-item-text-color: rgba(var(--text-normal), 0.45); + --f7-picker-item-selected-text-color: @text-normal; + // Main Toolbar #editor-navbar.navbar .right a + a, #editor-navbar.navbar .left a + a { diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 146426690a..dfd53ab6f4 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -43,6 +43,9 @@ --f7-dialog-title-text-color: @text-normal; --f7-dialog-button-text-color: @brandColor; + --f7-picker-item-text-color: rgba(var(--text-normal), 0.45); + --f7-picker-item-selected-text-color: @text-normal; + .button { --f7-touch-ripple-color: transparent; } diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx index fadd14ca2e..a569c98dd5 100644 --- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx @@ -18,7 +18,8 @@ import EditorUIController from '../lib/patch'; canFillForms: stores.storeAppOptions.canFillForms, users: stores.users, isDisconnected: stores.users.isDisconnected, - displayMode: stores.storeReview.displayMode + displayMode: stores.storeReview.displayMode, + dataDoc: stores.storeDocumentInfo.dataDoc })) class ContextMenu extends ContextMenuController { constructor(props) { @@ -273,7 +274,7 @@ class ContextMenu extends ContextMenuController { }); } - if ( canFillForms && canCopy && !locked ) { + if ( canFillForms && dataDoc.fileType !== 'oform' && !locked ) { itemsIcon.push({ event: 'paste', icon: 'icon-paste' diff --git a/apps/documenteditor/mobile/src/controller/Error.jsx b/apps/documenteditor/mobile/src/controller/Error.jsx index 16eca5427d..4373e04d0b 100644 --- a/apps/documenteditor/mobile/src/controller/Error.jsx +++ b/apps/documenteditor/mobile/src/controller/Error.jsx @@ -4,6 +4,9 @@ import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => { + const { t } = useTranslation(); + const _t = t("Error", { returnObjects: true }); + useEffect(() => { const on_engine_created = k => { k.asc_registerCallback('asc_onError', onError); }; @@ -20,9 +23,6 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu }); const onError = (id, level, errData) => { - const {t} = useTranslation(); - const _t = t("Error", { returnObjects: true }); - if (id === Asc.c_oAscError.ID.LoadingScriptError) { f7.notification.create({ title: _t.criticalErrorTitle, diff --git a/apps/documenteditor/mobile/src/controller/add/AddTable.jsx b/apps/documenteditor/mobile/src/controller/add/AddTable.jsx index 7916390a1d..b0ff95107c 100644 --- a/apps/documenteditor/mobile/src/controller/add/AddTable.jsx +++ b/apps/documenteditor/mobile/src/controller/add/AddTable.jsx @@ -37,7 +37,7 @@ class AddTableController extends Component { text: '', content: '
' + - '
' + + '
' + '
' + _t.textColumns + '
' + '
' + _t.textRows + '
' + '
' + diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 82a687446f..9de1ee6a8c 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -4,6 +4,7 @@ @import '../../../../common/mobile/resources/less/_mixins.less'; @import '../../../../common/mobile/resources/less/colors-table.less'; @import '../../../../common/mobile/resources/less/colors-table-dark.less'; + @brandColor: var(--brand-word); .device-ios { @@ -158,4 +159,12 @@ height: 50px; } +// Picker + +.row-picker { + .col-50 { + color: @text-secondary; + } +} + diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index 0a992a5246..93f1dfa054 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { f7 } from 'framework7-react'; +import { f7, Link } from 'framework7-react'; import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react'; import { observer, inject } from "mobx-react"; @@ -101,7 +101,9 @@ class MainPage extends Component { {/* Top Navbar */} - {showLogo && appOptions.canBranding !== undefined &&
} + {showLogo && appOptions.canBranding !== undefined &&
{ + window.open(`${__PUBLISHER_URL__}`, "_blank"); + }}>
} diff --git a/apps/presentationeditor/mobile/src/controller/Error.jsx b/apps/presentationeditor/mobile/src/controller/Error.jsx index 839dd126bb..85b605270b 100644 --- a/apps/presentationeditor/mobile/src/controller/Error.jsx +++ b/apps/presentationeditor/mobile/src/controller/Error.jsx @@ -4,6 +4,9 @@ import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => { + const { t } = useTranslation(); + const _t = t("Error", { returnObjects: true }); + useEffect(() => { const on_engine_created = k => { k.asc_registerCallback('asc_onError', onError); }; @@ -20,9 +23,6 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu }); const onError = (id, level, errData) => { - const {t} = useTranslation(); - const _t = t("Error", { returnObjects: true }); - if (id === Asc.c_oAscError.ID.LoadingScriptError) { f7.notification.create({ title: _t.criticalErrorTitle, diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index 4031267f92..d1f099a0b1 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { f7, Page, View, Navbar, Subnavbar, Icon } from 'framework7-react'; +import { f7, Page, View, Navbar, Subnavbar, Icon, Link} from 'framework7-react'; import { observer, inject } from "mobx-react"; import { Device } from '../../../../common/mobile/utils/device'; @@ -110,7 +110,9 @@ class MainPage extends Component { {/* Top Navbar */} - {showLogo && appOptions.canBranding !== undefined &&
} + {showLogo && appOptions.canBranding !== undefined &&
{ + window.open(`${__PUBLISHER_URL__}`, "_blank"); + }}>
} diff --git a/apps/spreadsheeteditor/mobile/src/controller/Error.jsx b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx index 94f05d1c37..1b991fc32e 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Error.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx @@ -4,6 +4,9 @@ import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => { + const { t } = useTranslation(); + const _t = t("Error", { returnObjects: true }); + useEffect(() => { const on_engine_created = k => { k.asc_registerCallback('asc_onError', onError); }; @@ -20,8 +23,6 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu }); const onError = (id, level, errData) => { - const {t} = useTranslation(); - const _t = t("Error", { returnObjects: true }); const api = Common.EditorApi.get(); if (id === Asc.c_oAscError.ID.LoadingScriptError) { diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx index 9b0c3a91a1..951bcc33ba 100644 --- a/apps/spreadsheeteditor/mobile/src/page/main.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx @@ -11,7 +11,7 @@ import FilterOptionsController from '../controller/FilterOptions.jsx' import AddOptions from "../view/add/Add"; import EditOptions from "../view/edit/Edit"; import { Search, SearchSettings } from '../controller/Search'; -import { f7 } from 'framework7-react'; +import { f7, Link } from 'framework7-react'; import {FunctionGroups} from "../controller/add/AddFunction"; import ContextMenu from '../controller/ContextMenu'; @@ -107,7 +107,10 @@ class MainPage extends Component { {/* Top Navbar */} - {showLogo && appOptions.canBranding !== undefined &&
} + {showLogo && appOptions.canBranding !== undefined &&
{ + window.open(`${__PUBLISHER_URL__}`, "_blank"); + }}>
}