diff --git a/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx b/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx index 10195eeb1..a8901875b 100644 --- a/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx +++ b/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx @@ -1280,5 +1280,6 @@
  • +
  • \ No newline at end of file diff --git a/Web/Controls/Help/ArticlesCompleteList/Desktop/100025_pro_features/100025_pro_features.ascx b/Web/Controls/Help/ArticlesCompleteList/Desktop/100025_pro_features/100025_pro_features.ascx new file mode 100644 index 000000000..eeb42072b --- /dev/null +++ b/Web/Controls/Help/ArticlesCompleteList/Desktop/100025_pro_features/100025_pro_features.ascx @@ -0,0 +1,3 @@ +<%@ Control Language="C#" %> +">Using pro features in ONLYOFFICE Desktop Editors \ No newline at end of file diff --git a/Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx b/Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx new file mode 100644 index 000000000..6c71f4a92 --- /dev/null +++ b/Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx @@ -0,0 +1,97 @@ +<%@ Control Language="C#" Inherits="BaseContentUserControls" %> +<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> + + + +
    +

    Using pro features in ONLYOFFICE Desktop Editors

    + + <%--
    +
      + +
    +
    --%> +

    Introduction to pro features

    +

    Starting from the version 5.6 of Desktop Editors, you can add pro features to Desktop Editors and use them when working with local documents. Pro features are the features which are available in the paid online version (cloud or server), starting from Document Server v.5.5.

    +

    Currently, pro features are only available for the Document Editor:

    + + + +

    Enabling pro features

    +
    +
    +

    You will be able to use pro features in the ONLYOFFICE Desktop Editors after connecting to the paid ONLYOFFICE cloud and creating a new document or opening an existing one.

    + +

    To connect to the ONLYOFFICE cloud:

    +
      +
    1. Launch Desktop Editors.
    2. +
    3. In the main program window, switch to the Connect to cloud tab at the left sidebar.
    4. +
    5. Click the ONLYOFFICE button.
    6. +
    7. Specify your web office address in the new window.
    8. +
    9. Click the Connect now button.
    10. +
    +
    + Connect to cloud tab" /> + Connect to cloud tab" /> +
    +
    +
      +
    1. On the authorization page, specify the login and password used to access your cloud office account.
    2. +
    + Authorization page" /> + Authorization page" /> +
    + +

    Once you connected to the ONLYOFFICE cloud, select the necessary section and folder in the Documents module and open the necessary document or create a new one.

    +

    To open an existing document, click on its name in the document list.

    +

    To create a new document, click the Create button in the left upper corner, select the Document option, set the document name and click the Save Confirmation icon" /> icon.

    +
    + Create a new document or open an existing one" /> + Create a new document or open an existing one" /> +
    +
    +

    When you disconnect from the cloud, pro features will still be available in the ONLYOFFICE Desktop Editors and you will be able to use them when working with documents stored on your computer.

    +
    + If you reinstall ONLYOFFICE Desktop Editors after activating pro features, you’ll need to connect to the paid cloud once again and create or open a document to reactivate pro features. +
    +
    +
    + +

    Using pro features

    +
    +
    +

    Once you activated pro features in ONLYOFFICE Desktop Editors, you can use them both when connecting to the ONLYOFFICE cloud, and when working with your local files.

    +

    To insert content controls, switch to the Insert tab and use the Content Controls icon" /> Content Controls button on the top toolbar.

    +

    The detailed instructions on how to create and edit content controls are available ">here.

    +
    + Insert Content controls" /> + Insert Content controls" /> +
    +
    +

    To compare a document with another one, switch to the Collaboration tab and use the Compare icon" /> Compare button on the top toolbar.

    +

    The detailed instructions on how to compare documents are available ">here.

    +
    + Compare documents" /> + Compare documents" /> +
    +
    + +
    +
    +
    + diff --git a/Web/Controls/Help/Desktop/Documents/Documents.ascx b/Web/Controls/Help/Desktop/Documents/Documents.ascx index dd18ac7bf..19dfc15d1 100644 --- a/Web/Controls/Help/Desktop/Documents/Documents.ascx +++ b/Web/Controls/Help/Desktop/Documents/Documents.ascx @@ -32,6 +32,7 @@
  • +
  • Troubleshooting

    Resolución de problemas

    Устранение неполадок

    diff --git a/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx b/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx index 2249fae9b..dc2621707 100644 --- a/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx +++ b/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" Inherits="BaseContentUserControls" %> <%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> -v.5.5 +v.5.6 \ No newline at end of file diff --git a/Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServer_Current.ascx b/Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServer_Current.ascx index 6381643cb..bd9fd23ac 100644 --- a/Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServer_Current.ascx +++ b/Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServer_Current.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" Inherits="BaseContentUserControls" %> <%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> -v.5.5 +v.5.6 \ No newline at end of file diff --git a/Web/desktop/documents/allplatforms/pro-features.aspx b/Web/desktop/documents/allplatforms/pro-features.aspx new file mode 100644 index 000000000..640fabd42 --- /dev/null +++ b/Web/desktop/documents/allplatforms/pro-features.aspx @@ -0,0 +1,20 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/Desktop/DesktopArticles.master" %> +<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> + + + + + + + + + + +
    + + \ No newline at end of file diff --git a/Web/images/Help/Guides/big/guide125/compare.png b/Web/images/Help/Guides/big/guide125/compare.png new file mode 100644 index 000000000..ff36d4e8c Binary files /dev/null and b/Web/images/Help/Guides/big/guide125/compare.png differ diff --git a/Web/images/Help/Guides/big/guide125/controls.png b/Web/images/Help/Guides/big/guide125/controls.png new file mode 100644 index 000000000..ca7095566 Binary files /dev/null and b/Web/images/Help/Guides/big/guide125/controls.png differ diff --git a/Web/images/Help/Guides/big/guide125/portal.png b/Web/images/Help/Guides/big/guide125/portal.png new file mode 100644 index 000000000..a4f1394a9 Binary files /dev/null and b/Web/images/Help/Guides/big/guide125/portal.png differ diff --git a/Web/images/Help/Guides/big/guide125/step2.png b/Web/images/Help/Guides/big/guide125/step2.png new file mode 100644 index 000000000..74a0b6fba Binary files /dev/null and b/Web/images/Help/Guides/big/guide125/step2.png differ diff --git a/Web/images/Help/Guides/big/guide125/step3.png b/Web/images/Help/Guides/big/guide125/step3.png new file mode 100644 index 000000000..11261e94b Binary files /dev/null and b/Web/images/Help/Guides/big/guide125/step3.png differ diff --git a/Web/images/Help/Guides/small/guide125/compare.png b/Web/images/Help/Guides/small/guide125/compare.png new file mode 100644 index 000000000..e92b01928 Binary files /dev/null and b/Web/images/Help/Guides/small/guide125/compare.png differ diff --git a/Web/images/Help/Guides/small/guide125/controls.png b/Web/images/Help/Guides/small/guide125/controls.png new file mode 100644 index 000000000..7ed3ed2e0 Binary files /dev/null and b/Web/images/Help/Guides/small/guide125/controls.png differ diff --git a/Web/images/Help/Guides/small/guide125/portal.png b/Web/images/Help/Guides/small/guide125/portal.png new file mode 100644 index 000000000..eea6686d8 Binary files /dev/null and b/Web/images/Help/Guides/small/guide125/portal.png differ diff --git a/Web/images/Help/Guides/small/guide125/step2.png b/Web/images/Help/Guides/small/guide125/step2.png new file mode 100644 index 000000000..a2d9683ff Binary files /dev/null and b/Web/images/Help/Guides/small/guide125/step2.png differ diff --git a/Web/images/Help/Guides/small/guide125/step3.png b/Web/images/Help/Guides/small/guide125/step3.png new file mode 100644 index 000000000..dbe997759 Binary files /dev/null and b/Web/images/Help/Guides/small/guide125/step3.png differ