From 4b86af5ac171abf01ca922e17139e0e29b66c299 Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Tue, 21 Sep 2021 10:53:30 +0300 Subject: [PATCH 1/2] Fix Chamilo.ascx --- .../Help/GettingStarted/Integration/Chamilo/Chamilo.ascx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx b/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx index 36657aee9..c75feaea2 100644 --- a/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx +++ b/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx @@ -150,7 +150,7 @@
-

Diabling the ONLYOFFICE connector for Chamilo

+

Disabling the ONLYOFFICE connector for Chamilo

If you need to disable the ONLYOFFICE connector:

  1. On the Plugins page, find ONLYOFFICE and click Configure.
    2. From ee4b97ac92256fd758d4e006b8d6fa56af5d30f3 Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Tue, 21 Sep 2021 19:00:05 +0300 Subject: [PATCH 2/2] Fixes for connectors pages --- .../Integration/Chamilo/Chamilo.ascx | 55 ++++++++----- .../Integration/Confluence/Confluence.ascx | 75 +++++++++++------- .../Integration/Liferay/Liferay.ascx | 47 +++++++---- .../Integration/Nuxeo/Nuxeo.ascx | 78 +++++++++++-------- Web/Controls/Help/Integration/Chamilo.ascx | 1 - Web/Controls/Help/Integration/Confluence.ascx | 2 +- .../Help/Integration/Integration.ascx | 6 +- Web/Controls/Help/Integration/Nuxeo.ascx | 2 +- Web/css/help.less | 12 ++- 9 files changed, 173 insertions(+), 105 deletions(-) diff --git a/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx b/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx index c75feaea2..bf3ad2262 100644 --- a/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx +++ b/Web/Controls/Help/GettingStarted/Integration/Chamilo/Chamilo.ascx @@ -18,10 +18,25 @@
      @@ -39,28 +54,30 @@

      About the ONLYOFFICE and Chamilo integration

      -

      ONLYOFFICE offers an official connector to integrate ONLYOFFICE Docs with Chamilo and edit office documents within the document library. You can download the ONLYOFFICE connector from GitHub page.

      +

      ONLYOFFICE offers an official connector to integrate ONLYOFFICE Docs with Chamilo and edit office documents within the document library. You can download the ONLYOFFICE connector from the GitHub page.

      To learn more about how the ONLYOFFICE connector for Chamilo works, please visit our API documentation.

      -
      +

      Main features

      +

      • Editing and viewing text documents, spreadsheets, and presentations.
      • Co-editing documents in real-time: two co-editing modes (Fast and Strict), the Track Changes mode, comments, and the built-in chat.
        • -
      • JWT support to secure your traffic so that no one, besides the users with proper rights, can have access to your documents.
        • +
      • JWT support to secure your traffic so that no one can have access to your documents with the exception of the users with proper rights.
      -
      +

      Supported formats

      +

      • For editing and viewing: DOCX, PPTX, XLSX
      -
      +

      What's new in version 1.1.2

      Added

        @@ -75,26 +92,27 @@

      The full change log is available here.

      -
      +

      Connecting ONLYOFFICE Docs to Chamilo

      -
      +

      Requirements

      • ONLYOFFICE Docs (Document Server) 6.2 or later

        You need an instance of ONLYOFFICE Docs that is resolvable and connectable both from Chamilo and any end clients. It must be able to POST to Chamilo directly.

        -

        Please refer to the official documentation page to learn more about installing ONLYOFFICE Docs.

        + Please refer to the official documentation page to learn more about installing ONLYOFFICE Docs.
      • Chamilo v1.11.14 or later
      +
      ONLYOFFICE Docs and Chamilo can be installed either on different computers, or on the same machine. In case you select the latter variant, you will need to set up a custom port for ONLYOFFICE Docs as by default both ONLYOFFICE Docs and Chamilo work on port 80. See the corresponding instructions for Docker, Ubuntu, CentOS, or Windows.
      -
      +

      Installing the ONLYOFFICE Connector for Chamilo

      Starting from Chamilo v1.11.16, the ONLYOFFICE connector is pre-installed. If you use Chamilo v.1.11.14, please follow these instructions to install the ONLYOFFICE connector:

      @@ -114,18 +132,18 @@
      -
      +

      Updating the ONLYOFFICE connector for Chamilo

      To update the connector to the latest version, you need to uninstall the pre-installed one first following the instruction:

      1. Open the terminal in the root folder.
      2. Delete the plugin using the following command: rm -rf /var/www/html/chamilo-x.x.x/plugin/onlyoffice -

        Where chamilo-x.x.x is your Chamilo cersion.

        3. +

        Where chamilo-x.x.x is your Chamilo version.

      Once you uninstall the connector, follow the ">installation instruction.

      -
      +

      Configuring the ONLYOFFICE Connector for Chamilo

      @@ -149,14 +167,13 @@
      -
      +

      Disabling the ONLYOFFICE connector for Chamilo

      If you need to disable the ONLYOFFICE connector:

      1. On the Plugins page, find ONLYOFFICE and click Configure.
      2. Tick the No checkbox in the Enable section.
      -

      Once you uninstall the connector, follow the ">installation instruction.

      @@ -183,7 +200,7 @@
    • Click the Chamilo edit icon" /> Edit icon.
      • -
    • On the opened page, select/deselect the Read only checkbox.
      • +
    • On the opened page, select the Read only checkbox.
    • Click the Save document button.
diff --git a/Web/Controls/Help/GettingStarted/Integration/Confluence/Confluence.ascx b/Web/Controls/Help/GettingStarted/Integration/Confluence/Confluence.ascx index 933ccfce1..ba1832098 100644 --- a/Web/Controls/Help/GettingStarted/Integration/Confluence/Confluence.ascx +++ b/Web/Controls/Help/GettingStarted/Integration/Confluence/Confluence.ascx @@ -18,10 +18,24 @@
    @@ -37,25 +51,27 @@
    -

    About the ONLYOFFICE Confluence integration

    +

    About the ONLYOFFICE and Confluence integration

    -

    ONLYOFFICE offers an official connector to integrate ONLYOFFICE Docs with Confluence and edit office documents within the document library. You can install the ONLYOFFICE connector from the Atlassian Marketplace or download it from GitHub page. The application is distributed under the Apache license.

    +

    ONLYOFFICE offers an official connector to integrate ONLYOFFICE Docs with Confluence and edit office documents within the document library. You can install the ONLYOFFICE connector from the Atlassian Marketplace or download it from the GitHub page. The application is distributed under the Apache license.

    -

    To learn more about how it works and how to compile the ONLYOFFICE connector for Confluence, please visit our API documentation.

    + To learn more about how it works and how to compile the ONLYOFFICE connector for Confluence, please visit our API documentation.
    -
    +

    Main features

    +

    • Creating text documents, spreadsheets, and presentations using the New document option.
    • Editing and viewing documents with the Edit in ONLYOFFICE option.
      • -
    • Co-editing documents in real-time: use two co-editing modes (Fast and Strict), Track Changes, comments, and built-in chat.
      • +
    • Co-editing documents in real-time: two co-editing modes (Fast and Strict), Track Changes, comments, and a built-in chat.
    • JWT support to secure your traffic so that no one, besides the users with proper rights, can have access to your documents.
    -
    +

    Supported formats

    +

    • For creating, editing and viewing: DOCX, PPTX, XLSX
    • For editing via conversion to OOXML: ODT, DOC, ODP, PPT, ODS, XLS
      • @@ -63,7 +79,7 @@
    -
    +

    What's new in version 3.0.0

    Added

      @@ -81,28 +97,28 @@

      Connecting ONLYOFFICE Docs to Confluence

      -
      +

      Requirements

      • ONLYOFFICE Docs (Document Server) 5.9.4 or later

        You need an instance of ONLYOFFICE Docs that is resolvable and connectable both from Confluence and any end clients. It must be able to POST to Confluence directly.

        -

        Please refer to the official documentation page to learn more about installing ONLYOFFICE Docs.

        + Please refer to the official documentation page to learn more about installing ONLYOFFICE Docs.
      • Confluence Data Center 6.13.1 - 7.12.3 or Confluence Server 6.13.1 - 7.12.3
      -
      +

      Installing the ONLYOFFICE Connector for Confluence from the Atlassian Marketplace

      -

      You can download the latest connector version from the official Atlassian Marketplace. To do it, please follow:

      +

      You can download the latest connector version from the official Atlassian Marketplace. To do so, please follow these steps:

      1. Log into your Confluence instance as an administrator.
      2. Click the admin drop-down box and choose Manage apps. The Manage apps screen will appear.
        3. -
      3. Click Find new apps from the left-hand side of the page.
        4. +
      4. Click Find new apps on the left-hand side of the page.
      5. Locate ONLYOFFICE Connector for Confluence via search. Results will include the add-on versions compatible with your Confluence instance.
      6. Click Install to download and install your application.
      @@ -115,19 +131,16 @@
      -
      +

      Configuring the ONLYOFFICE Connector for Confluence

      -
      - ONLYOFFICE_configure" /> - ONLYOFFICE_configure" /> -
      -
      +

      Go to Confluence administration -> Manage apps> -> ONLYOFFICE Connector for Confluence -> Configure:

        -
      • Document Server - the URL address where ONLYOFFICE Docs is installed (e.g. https://documentserver).
        • -
      • Secret key - specify the JWT secret used to sign the data. It is the secret to validate the JSON web token in the request to Document Server.
        • +
      • Document Server - specify the URL address where ONLYOFFICE Docs is installed (e.g. https://documentserver).
        • +
      • Secret key - specify the JWT secret used to sign the data. It is the secret to validate the JSON web token upon the request to Document Server.

        The JWT configuration on the Document Server side can be found here.

        +

      The JWT configuration on the ONLYOFFICE Docs side can be found in the following paths:

      @@ -136,13 +149,19 @@

      Advanced server settings:

        -
      • Server address for internal requests from the Document Editing Service - Address that is used to access the Confluence server from the Document Editing Service.
        • +
      • Server address for internal requests from the Document Editing Service - address that is used to access the Confluence server from the Document Editing Service.
      • Document Editing Service address for internal requests from the server - address that is used to access the Document Editing Service from the Confluence server.
      -
      +
      + ONLYOFFICE_configure" /> + ONLYOFFICE_configure" /> +
      +
      + +

      Connecting to the demo ONLYOFFICE Docs

      If you would like to test the ONLYOFFICE online editors within Confluence without actual installation of ONLYOFFICE Docs, go to Confluence administration -> Manage apps -> ONLYOFFICE Connector for Confluence -> Configure, tick the Connect to demo ONLYOFFICE Document Server checkbox and click the Save button.

      -
      This is a public test server that will be available during a 30-day period. Don't use it with your sensitive data.
      +
      This is a public test server that will be available during a 30-day period. Don't use your sensitive data there.
      @@ -156,7 +175,7 @@
    • Open the page where you need to create a file.
    • Click the New document button.
    • Choose the needed file type.
      • -
    • Provide the file name in the text field near the file type icon.
      • +
    • Enter the file name in the text field near the file type icon.
    • Click the Confluence save object icon" /> Save button. diff --git a/Web/Controls/Help/GettingStarted/Integration/Liferay/Liferay.ascx b/Web/Controls/Help/GettingStarted/Integration/Liferay/Liferay.ascx index 36fad77c5..8cf8672e6 100644 --- a/Web/Controls/Help/GettingStarted/Integration/Liferay/Liferay.ascx +++ b/Web/Controls/Help/GettingStarted/Integration/Liferay/Liferay.ascx @@ -18,10 +18,22 @@
        @@ -40,22 +52,23 @@

        ONLYOFFICE offers an official connector to integrate ONLYOFFICE Docs with Liferay and edit office documents inside Liferay Document and Media Library. You can download the ONLYOFFICE connector from the Liferay Marketplace or from the GitHub page. The connector is distributed under the Apache license.

        -

        To learn more about how the ONLYOFFICE connector for Liferay works , please visit our API documentation page.

        + To learn more about how the ONLYOFFICE connector for Liferay works , please visit our API documentation page.
        -
        +

        Main features

        +

        • Creating files using the Create with ONLYOFFICE menu option.
        • Viewing and editing existing text documents, spreadsheets, or presentations using the ONLYOFFICE Edit/View menu option within the Documents and Media section.
          • -
        • Co-editing documents in real-time: use two co-editing modes (Fast and Strict), Track Changes, comments, and the built-in chat.
          • +
        • Co-editing documents in real-time: two co-editing modes (Fast and Strict), Track Changes, comments, and the built-in chat.
        • JWT support to secure your traffic so that no one can have access to your documents with the exception of the users with proper rights
        -

        Visit our For Developers page to find out more about the ONLYOFFICE Connector for Liferay and how it works in details.

        -
        +

        Supported formats

        +

        • For creating, editing and viewing: DOCX, PPTX, XLSX
        • For editing via conversion to OOXML: ODT, DOC, RTF, TXT, ODP, PPT, ODS, XLS, CSV
          • @@ -63,7 +76,7 @@
        -
        +

        What's new in version 2.0.0

        Added

          @@ -86,27 +99,27 @@

          Connecting ONLYOFFICE Docs to Liferay

          -
          +

          Requirements

          • ONLYOFFICE Docs (Document Server) 5.9.4 or later

            You need an instance of ONLYOFFICE Docs that is resolvable and connectable both from Liferay and any end clients. It must be able to POST to Liferay directly.

            -

            Please refer to the official documentation page to learn more about installing ONLYOFFICE Docs.

            + Please refer to the official documentation page to learn more about installing ONLYOFFICE Docs.
          -
          -

          Installing the ONLYOFFICE Connector for Confluence from the Atlassian Marketplace

          +
          +

          Installing the ONLYOFFICE Connector for Liferay from the Liferay App Store

          You can install the ONLYOFFICE connector using the App Manager or from the official Liferay App Store.

          To install it using the App Manager:

          1. Navigate to Control Panel -> Apps -> App Manager.
          2. Click the Liferay options icon" /> Options button.
          3. Click the Upload button.
            4. -
          4. In the opened window, choose the ONLYOFFICE application file.
            5. +
          5. In the opened window, choose the ONLYOFFICE application file.

          To install the connector from the App Store:

            @@ -119,7 +132,7 @@
          -
          +

          Configuring the Liferay and ONLYOFFICE integration application

          Go to Control Panel -> Configuration -> System Settings. In the Platform section, choose the Connectors category and select ONLYOFFICE.

          @@ -140,7 +153,7 @@
          -
          +

          Start using ONLYOFFICE Docs within Liferay

          To create a file:

          diff --git a/Web/Controls/Help/GettingStarted/Integration/Nuxeo/Nuxeo.ascx b/Web/Controls/Help/GettingStarted/Integration/Nuxeo/Nuxeo.ascx index 916772118..3da983902 100644 --- a/Web/Controls/Help/GettingStarted/Integration/Nuxeo/Nuxeo.ascx +++ b/Web/Controls/Help/GettingStarted/Integration/Nuxeo/Nuxeo.ascx @@ -18,10 +18,21 @@
            @@ -36,22 +47,24 @@
          -

          About the ONLYOFFICE Nuxeo integration

          +

          About the ONLYOFFICE and Nuxeo integration

          ONLYOFFICE offers an official connector to integrate ONLYOFFICE Docs with Nuxeo and edit office documents within the content management system. You can install the ONLYOFFICE connector from the official Nuxeo Marketplace or download it from the GitHub page. The application is distributed under the Apache license.

          -

          To learn more about how it works and how to compile the ONLYOFFICE connector for Nuxeo, please visit our API documentation.

          + To learn more about how it works and how to compile the ONLYOFFICE connector for Nuxeo, please visit our API documentation.
          -
          +

          Main features

          +

          • Editing text documents, spreadsheets and presentations.
            • -
          • Co-editing documents in real-time: use two co-editing modes (Fast and Strict), Track Changes, comments, and built-in chat.
            • -
          • JWT support to secure your traffic so no one besides the users with proper rights has access to your documents
            • +
          • Co-editing documents in real-time: two co-editing modes (Fast and Strict), Track Changes, comments, and a built-in chat.
            • +
          • JWT support to secure your traffic so no one, besides the users with proper rights, can have access to your documents.
          -
          +

          Supported Formats

          +

          • For editing : DOCX, PPTX, XLSX
          • For viewing only: PDF,ODT, ODS, ODP, DOC, XLS, PPT, CSV, RTF
            • @@ -65,14 +78,14 @@

            Connecting ONLYOFFICE Docs to Nuxeo

            -
            +

            Requirements

            • ONLYOFFICE Docs 5.9.4 or later

              You need an instance of ONLYOFFICE Docs that is resolvable and connectable both from Nuxeo and any end clients. It must be able to POST to Nuxeo directly.

              -

              Please refer to the official ONLYOFFICE Docs documentation page to learn more about installing ONLYOFFICE Docs.

              + Please refer to the official ONLYOFFICE Docs documentation page to learn more about installing ONLYOFFICE Docs.
            • Nuxeo LTS 2019
              • @@ -80,42 +93,43 @@
            -
            +

            Installing the ONLYOFFICE addon for Nuxeo

            -

            You can connect ONLYOFFICe to a Nuxeo Online Services registered instance with internet access, an unregistered instance, or an offline instance.

            +

            You can connect ONLYOFFICE to a Nuxeo Online Services registered instance with internet access, an unregistered instance, or an offline instance.

            - The provided instructions use the nuxeoctl script. Visit official Nuxeo documentation page to find more available options on how to install packages. + The provided instructions use the nuxeoctl script. Visit the official Nuxeo documentation page to find more available options on how to install the packages.
            -

            For a Nuxeo Online Services registered instance with internet access please follow:

            +

            For a Nuxeo Online Services registered instance with internet access please follow these steps:

            1. Stop your server 
              ./nuxeoctl stop
            2. Run the following command to install the connector: 
              ./nuxeo/bin/nuxeoctl mp-install onlyoffice-nuxeo-x.x.x
              - Where onlyoffice-nuxeo-x-x-x is the latest available version of the Nuxeo ONLYOFFICE connector. -

              To find the connector version:

              + Where onlyoffice-nuxeo-x-x-x is the latest available version of the ONLYOFFICE connector for Nuxeo. +
              To find the connector version:
                -
              1. Go to the Nuxeo Marketplace and find the latest connector version of Nuxeo ONLYOFFICE connector.
                2. +
              2. Go to the Nuxeo Marketplace and find the official ONLYOFFICE connector.
              3. Click the Install button
              4. Find the connector version in the For a Nuxeo Online Sevices registered instance with internet access section.
              +
            3. After the package is downloaded and installed, start your server 
              ./nuxeoctl start
            -

            For an unregistered instance, or an offline instance please follow:

            +

            For an unregistered instance, or an offline instance please follow these steps:

            1. Stop your server 
              ./nuxeoctl stop
            2. Download the connector 
              wget https://connect.nuxeo.com/nuxeo/site/marketplace/package/onlyoffice-nuxeo/download?version=x.x.x
              - Where version=x.x.x is the latest available version of the Nuxeo ONLYOFFICE connector. Otherwise, visit the Nuxeo Marketplace and find the link manualy. + Where version=x.x.x is the latest available version of the ONLYOFFICE connector for Nuxeo. Otherwise, visit the Nuxeo Marketplace and find the link manualy.
            3. Install the package by providing the path to the downloaded .zip file 
              ./nuxeoctl mp-install /Path/to/file/onlyoffice-nuxeo-x.x.x.zip
              @@ -127,15 +141,14 @@
            -
            +

            Configuring the ONLYOFFICE addon for Nuxeo

            Open the nuxeo/bin/nuxeo.conf file via any available text editor and add the following lines into it:

            onlyoffice.docserv.url=http://documentserver/
 onlyoffice.jwt.secret=/your_secret/
            -

            Where docserv.url is an url of an installed and running ONLYOFFICE Docs and jwt.secret is the secret to validate the JSON web token in the request to ONLYOFFICE Docs.

            -

            If you used Docker to install ONLYOFFICE Docs, use information from ONLYOFFICE GitHub page to properly configure JWT.

            -

            If you used other installation options, check the API documentation for configuring JWT on the ONLYOFFICE Docs side.

            +

            Where docserv.url is the URL of an installed and running ONLYOFFICE Docs instance, and jwt.secret is the secret to validate the JSON web token upon the request to ONLYOFFICE Docs.

            +

            If you used Docker to install ONLYOFFICE Docs, use information from the ONLYOFFICE GitHub page to properly configure JWT. If you used other installation options, check the API documentation for configuring JWT on the ONLYOFFICE Docs side.

            @@ -146,22 +159,19 @@ onlyoffice.jwt.secret=/your_secret/

            To edit or view a document:

            1. Open the needed file.
              2. -
            2. Click the View in ONLYOFFICE button.
              3. +
            3. Click the View in ONLYOFFICE button.

              The document will be opened for viewing and editing.

              +
            ONLYOFFICE_viewfile" /> ONLYOFFICE_viewfile" />
            -

            To co-edit a document the following is required:

            -
              -
            1. You need to have the permission to edit the document
              2. -
            2. The document format has to be supported by the connector.
              3. -
            3. The document has to be opened in ONLYOFFICE Docs by the other user.
              4. -
            -

            To co-edit a document :

            +
            To co-edit a document, the following is required: users need to have the permissions to edit the document and the document format has to be supported by the connector.
            + +

            To co-edit a document:

            1. Open the summary page of the document.
              2. -
            2. Click the Collaborative Edition With ONLYOFFICE icon in the bottom-right part of the window. +
            3. Click the Collaborative Edition With ONLYOFFICE icon in the bottom right corner of the window.

              The document will be opened for co-editing.

            diff --git a/Web/Controls/Help/Integration/Chamilo.ascx b/Web/Controls/Help/Integration/Chamilo.ascx index fd7110d3d..3e6f03f0d 100644 --- a/Web/Controls/Help/Integration/Chamilo.ascx +++ b/Web/Controls/Help/Integration/Chamilo.ascx @@ -38,7 +38,6 @@
          • ">Updating the ONLYOFFICE Connector for Chamilo
          • ">Configuring the ONLYOFFICE Connector for Chamilo
          • ">Disabling the ONLYOFFICE Connector for Chamilo
            • -
          • ">Connecting to the demo ONLYOFFICE Docs
        • diff --git a/Web/Controls/Help/Integration/Confluence.ascx b/Web/Controls/Help/Integration/Confluence.ascx index 8bef32a7c..23dd63f80 100644 --- a/Web/Controls/Help/Integration/Confluence.ascx +++ b/Web/Controls/Help/Integration/Confluence.ascx @@ -23,7 +23,7 @@
          • -
            About the ONLYOFFICE Confluence integration
            +
            About the ONLYOFFICE and Confluence integration
            • ">Main features
            • ">Supported formats
              • diff --git a/Web/Controls/Help/Integration/Integration.ascx b/Web/Controls/Help/Integration/Integration.ascx index 2ca5ee251..5bd4747c1 100644 --- a/Web/Controls/Help/Integration/Integration.ascx +++ b/Web/Controls/Help/Integration/Integration.ascx @@ -67,7 +67,7 @@