diff --git a/apps/common/mobile/lib/view/SharingSettings.jsx b/apps/common/mobile/lib/view/SharingSettings.jsx index 22f60e4b8..32e184eee 100644 --- a/apps/common/mobile/lib/view/SharingSettings.jsx +++ b/apps/common/mobile/lib/view/SharingSettings.jsx @@ -6,17 +6,18 @@ import { Device } from "../../utils/device"; const SharingSettings = props => { const { t } = useTranslation(); + const storeAppOptions = props.storeAppOptions; + const sharingSettingsUrl = storeAppOptions.sharingSettingsUrl; const _t = t('Common.Collaboration', {returnObjects: true}); - const url = 'https://nct.onlyoffice.com/Products/Files/Share.aspx?fileid=142278'; return (
- +
) } -export default SharingSettings; \ No newline at end of file +export default inject("storeAppOptions")(observer(SharingSettings)); \ No newline at end of file diff --git a/apps/common/mobile/lib/view/collaboration/Collaboration.jsx b/apps/common/mobile/lib/view/collaboration/Collaboration.jsx index d029838b9..ea3e08840 100644 --- a/apps/common/mobile/lib/view/collaboration/Collaboration.jsx +++ b/apps/common/mobile/lib/view/collaboration/Collaboration.jsx @@ -4,11 +4,10 @@ import { Popover, List, ListItem, Navbar, NavRight, Sheet, BlockTitle, Page, Vie import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import {Device} from "../../../utils/device"; - import {ReviewController, ReviewChangeController} from "../../controller/collaboration/Review"; import {PageDisplayMode} from "./Review"; - import {ViewCommentsController, ViewCommentsSheetsController} from "../../controller/collaboration/Comments"; +import SharingSettings from "../SharingSettings"; const PageUsers = inject("users")(observer(props => { const { t } = useTranslation(); @@ -81,6 +80,10 @@ const routes = [ allComments: true } } + }, + { + path: '/sharing-settings/', + component: SharingSettings } ]; @@ -88,6 +91,7 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => { const { t } = useTranslation(); const _t = t('Common.Collaboration', {returnObjects: true}); const appOptions = props.storeAppOptions; + const sharingSettingsUrl = appOptions.sharingSettingsUrl; const isViewer = appOptions.isViewer; return ( @@ -103,6 +107,11 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => { } + {sharingSettingsUrl && + + + + } {props.users.editUsers.length > 0 && diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index 749499a8d..d28625b46 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -339,13 +339,6 @@ const EditTabs = props => { component: }) } - if (settings.indexOf('paragraph') > -1) { - editors.push({ - caption: _t.textParagraph, - id: 'edit-paragraph', - component: - }) - } if (settings.indexOf('text') > -1) { editors.push({ caption: _t.textText, @@ -353,6 +346,13 @@ const EditTabs = props => { component: }) } + if (settings.indexOf('paragraph') > -1) { + editors.push({ + caption: _t.textParagraph, + id: 'edit-paragraph', + component: + }) + } } return ( diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx index 32ed242c6..2533eace1 100644 --- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx @@ -191,9 +191,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => onClick={onoptionclick.bind(this, "/application-settings/")}> - - - {_canDownload && diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index 2f2615383..d302d6ae5 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -47,13 +47,6 @@ const routes = [ path: '/about/', component: About }, - - // Sharing Settings - - { - path: '/sharing-settings/', - component: SharingSettings - } /*{ path: '/presentation-settings/', component: PresentationSettingsController, @@ -186,9 +179,6 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( - - - {_canDownload && diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index ea36d7edd..6950042cd 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -67,13 +67,6 @@ const routes = [ { path: '/direction/', component: Direction - }, - - // Sharing Settings - - { - path: '/sharing-settings/', - component: SharingSettings } ]; @@ -196,9 +189,6 @@ const SettingsList = inject("storeAppOptions")(observer(props => { - - - {_canDownload &&