Merge pull request 'release/v1.10.0 from release/v1.10.0 into master

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/9

Author: LinneyS

.github/workflows/lint-ruby.yml

@@ -30,7 +30,7 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        bundle update
+        bundle install
 
     - name: Rubocop
       run: |

.gitmodules

@@ -48,10 +48,6 @@
 	path = web/documentserver-example/java/src/main/resources/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
 	branch = master
-[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-formats"]
-	path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/csharp/assets/document-templates"]
 	path = web/documentserver-example/csharp/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates

3rd-Party.license

@@ -1,6 +1,5 @@
 Document Server integration example uses code from the following 3rd party projects.
 
-
 web/documentserver-example/csharp
 
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
@@ -132,6 +131,10 @@ Jackson Databind - General-purpose data-binding functionality and tree-model for
 License:        Apache 2.0
 License File:   jackson-databind.license
 
+Jackson Dataformat Properties - Support for reading and writing content of "Java Properties" style configuration files as if there was implied nesting structure (by default using dots as separators). (https://github.com/FasterXML/jackson-dataformats-text/blob/master/LICENSE)
+License:        Apache 2.0
+License File:   jackson-dataformat-properties.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -156,6 +159,10 @@ jQuery.UI     - jQuery UI is an open source library of interface components —
 License:        MIT
 License File:   jQuery.UI.license
 
+JSON          - JSON is a light-weight, language independent, data interchange format. (https://github.com/stleary/JSON-java/blob/master/LICENSE)
+License         Public Domain
+License File:   json.license
+
 JSON.simple   - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
 License:        Apache 2.0
 License File:   JSON.simple.license
@@ -168,11 +175,11 @@ ModelMapper   - ModelMapper is an intelligent object mapping library that automa
 License:        Apache 2.0
 License File    modelmapper.license
 
-Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE)
+Spring Boot   - Helps create Spring-powered, production-grade applications and services. Has external dependencies on Spring Framework. (https://github.com/spring-projects/spring-boot/blob/main/LICENSE.txt)
 License:        Apache 2.0
-License File:   prime-jwt.license
+License File:   spring-boot.license
 
-Spring Boot   - Helps create Spring-powered, production-grade applications and services. Has external dependencies on Spring Framework. (https://github.com/spring-projects/spring-boot/blob/main/LICENSE.txt)
+Spring Boot Web - Starter for building web, including RESTful, applications using Spring MVC. Uses Tomcat as the default embedded container. (https://github.com/spring-projects/spring-boot/blob/main/LICENSE.txt)
 License:        Apache 2.0
 License File:   spring-boot.license
 
@@ -271,6 +278,9 @@ urllib        - Request HTTP URLs in a complex world — basic and digest authen
 License:        MIT
 License File:   urllib.license
 
+utf7          - Encodes and decodes JavaScript (Unicode/UCS-2) strings to UTF-7 ASCII strings. (https://github.com/kkaefer/utf7/blob/master/LICENSE)
+License:        MIT
+License File:   utf7.license
 
 
 web/documentserver-example/php

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 1.10.0
+- nodejs: converting function on index page
+- java-spring: using java docs-integration-sdk
+- tabs menu
+- creating and editing pdf instead docxf
+- filling by default
+- forgotten files
+- delete all files
+- save as for pdf
+- handling conversion -9 error
+- change inserted image
+- different goback for users
+
 ## 1.9.0
 - nodejs: filling by default
 - nodejs: docxf, oform as pdf documentType

Readme.md

@@ -1,21 +1,21 @@
 ## Integration examples
 
-Test examples are simple document management systems that can be built into your application for testing.
+These test examples are simple document management systems that can be built into your application for testing.
 Do NOT use these integration examples on your own server without proper code modifications!
 In case you enabled any of the test examples, disable it before going for production.
 
 These examples show the way to integrate [ONLYOFFICE Docs][2] into your own website or application using one of the programming languages.
-The package contains examples written in .Net (C# MVC), .Net (C#), Java, Node.js, PHP and Ruby.
+The package contains examples written in .Net (C# MVC), .Net (C#), Java, Java Spring, Node.js, PHP, Python and Ruby.
 
 You should change `http://documentserver` to your server address in these files:
 * [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
 * [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
 * [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
 * [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
 * [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
-* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.json`
-* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/config.py`
-* [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/config/application.rb`
+* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/src/configuration/ConfigurationManager.php`
+* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/src/configuration/configuration.py`
+* [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/app/configuration/configuration.rb`
 
 More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview")
 

web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs

@@ -38,9 +38,15 @@ public static void RegisterBundles(BundleCollection bundles)
 
             // create the main script bundle
             bundles.Add(new ScriptBundle("~/bundles/scripts").Include(
+                "~/Scripts/formats.js",
                 "~/Scripts/jscript.js"
                             ));
 
+            // create the forgotten page script bundle
+            bundles.Add(new ScriptBundle("~/bundles/forgotten").Include(
+                "~/Scripts/forgotten.js"
+                            ));
+
             // create a style bundle
             bundles.Add(new StyleBundle("~/Content/css").Include(
                 "~/Content/stylesheet.css",
@@ -52,6 +58,11 @@ public static void RegisterBundles(BundleCollection bundles)
             bundles.Add(new StyleBundle("~/Content/editor").Include(
                 "~/Content/editor.css"
                             ));
+
+            // create the forgotten page style bundle
+            bundles.Add(new StyleBundle("~/Content/forgotten").Include(
+                "~/Content/forgotten.css"
+                            ));
         }
     }
 }

web/documentserver-example/csharp-mvc/Content/forgotten.css

@@ -0,0 +1,161 @@
+.center {
+    width: auto;
+}
+
+.left-panel {
+    width: 256px;
+}
+
+.main-panel {
+    width: 832px;
+    margin: 0 32px;
+    padding: 48px 0;
+    left: 0;
+}
+
+.tableRow {
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #E2E2E2;
+}
+
+.tableRow td:first-child {
+    width: 70%;
+    flex-grow: 0;
+    max-width: none;
+}
+
+.tableHeader td:first-child {
+    text-align: left;
+}
+
+.tableHeader td:last-child, .tableRow td:last-child {
+    width: 10%;
+    text-align: center;
+    padding: 0 !important;
+}
+
+.tableHeader {
+    width: 100%;
+}
+
+.stored-edit {
+    display: block;
+    padding-top: 0;
+    max-width: none;
+}
+
+menu.links {
+    width: 100%;
+}
+
+.scroll-table-body table {
+    table-layout: fixed;
+}
+
+.stored-edit span {
+    font-size: 12px;
+    line-height: normal;
+    position: static;
+}
+
+.scroll-table-body {
+    overflow-y: auto;
+}
+
+.stored-list {
+    height: calc(100% - 58px);
+}
+
+header {
+    min-width:auto;
+}
+
+header a {
+    display: block;
+    margin: 0 auto;
+    width: 1152px;
+}
+
+@media (max-width: 1279px) and (min-width: 1024px) {
+    .left-panel {
+        width: 208px;
+    }
+
+    .main-panel {
+        width: 688px;
+    }
+
+    header a {
+        width: 928px;
+    }
+
+    header img {
+        margin-left: 16px;
+    }
+}
+
+@media (max-width: 1023px) and (min-width: 593px) {
+    .center {
+        max-width: 768px;
+        width: calc(100% - 80px);
+    }
+
+    .table-main {
+        width: 100%;
+    }
+
+    .left-panel {
+        width: 208px;
+    }
+
+    .main-panel {
+        width: calc(100% - 32px);
+    }
+
+    .tableHeader td:last-child, .tableRow td:last-child {
+        width: 20%;
+    }
+
+    header a {
+        width: 768px;
+    }
+
+    header img {
+        margin-left: 40px;
+    }
+}
+
+@media (max-width: 592px) and (min-width: 320px) {
+    .center, .table-main {
+        width: 100%;
+    }
+
+    .left-panel {
+        display: none;
+    }
+
+    .main-panel {
+        width: 100%;
+        margin: 0;
+        padding: 28px 16px;
+    }
+
+    .tableHeader td:last-child, .tableRow td:last-child {
+        width: 25%;
+    }
+
+    header a {
+        width: auto;
+    }
+
+    .scroll-table-body {
+        top: 40px;
+    }
+
+    .tableRow {
+        padding: 8px 0;
+    }
+}