Test with onlyoffice 5.2.6

www/common/onlyoffice/sdkjs/cell/css/main-mobile.css

@@ -1,110 +1,110 @@
-@charset "UTF-8";
-
-/*
- * Worksheet canvas
- * --------------------------------------------------------
- */
-
-#ws-canvas-outer {
-	position: absolute;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-}
-
-#ws-canvas {
-	border: 0;
-}
-
-#ws-canvas-overlay, #ws-canvas-graphic, #ws-canvas-graphic-overlay {
-	border: 0;
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 1;
-}
-
-/*
- * Worksheet scroll bars
- * --------------------------------------------------------
- */
-
-#ws-v-scrollbar {
-	position: absolute;
-	right: 0;
-	width: 19px;
-	top: -1px;
-	bottom: 18px;
-	overflow: hidden;
-	z-index: 10;
-}
-
-#ws-v-scroll-helper {
-	width: 1px;
-}
-
-#ws-h-scrollbar {
-	position: absolute;
-	bottom: 0;
-	height: 19px;
-	left: 0;
-	right: 18px;
-	overflow: hidden;
-	z-index: 10;
-}
-
-#ws-h-scroll-helper {
-	height: 1px;
-}
-
-#ws-scrollbar-corner {
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	width: 18px;
-	height: 18px;
-	background-color: #DCE2E8;
-	border: 0;
-	z-index: 10;
-}
-
-/* Scrollbars common */
-
-#ws-v-scrollbar .jspVerticalBar,
-#ws-h-scrollbar .jspHorizontalBar,
-#ws-v-scrollbar .jspTrack,
-#ws-h-scrollbar .jspTrack {
-	background-color: #DCE2E8;
-}
-
-#ws-v-scrollbar .jspDrag,
-#ws-h-scrollbar .jspDrag {
-	background-color: #C0C0C0;
-}
-#ws-v-scrollbar .jspDrag.jspHover,
-#ws-v-scrollbar .jspDrag.jspActive,
-#ws-h-scrollbar .jspDrag.jspHover,
-#ws-h-scrollbar .jspDrag.jspActive {
-	background-color: #808080;
-}
-
-/* Vertical scrollbar */
-
-#ws-v-scrollbar .jspVerticalBar {
-	width: 7px;
-	border-left: 1px solid #C1C6CC;
-}
-#ws-v-scrollbar .jspTrack {
-	width: 8px;
-}
-
-/* Horizontal scrollbar */
-
-#ws-h-scrollbar .jspHorizontalBar {
-	height: 7px;
-	border-top: 1px solid #C1C6CC;
-}
-#ws-h-scrollbar .jspTrack {
-	height: 8px;
-}
+@charset "UTF-8";
+
+/*
+ * Worksheet canvas
+ * --------------------------------------------------------
+ */
+
+#ws-canvas-outer {
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+}
+
+#ws-canvas {
+	border: 0;
+}
+
+#ws-canvas-overlay, #ws-canvas-graphic, #ws-canvas-graphic-overlay {
+	border: 0;
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 1;
+}
+
+/*
+ * Worksheet scroll bars
+ * --------------------------------------------------------
+ */
+
+#ws-v-scrollbar {
+	position: absolute;
+	right: 0;
+	width: 19px;
+	top: -1px;
+	bottom: 18px;
+	overflow: hidden;
+	z-index: 10;
+}
+
+#ws-v-scroll-helper {
+	width: 1px;
+}
+
+#ws-h-scrollbar {
+	position: absolute;
+	bottom: 0;
+	height: 19px;
+	left: 0;
+	right: 18px;
+	overflow: hidden;
+	z-index: 10;
+}
+
+#ws-h-scroll-helper {
+	height: 1px;
+}
+
+#ws-scrollbar-corner {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	width: 18px;
+	height: 18px;
+	background-color: #DCE2E8;
+	border: 0;
+	z-index: 10;
+}
+
+/* Scrollbars common */
+
+#ws-v-scrollbar .jspVerticalBar,
+#ws-h-scrollbar .jspHorizontalBar,
+#ws-v-scrollbar .jspTrack,
+#ws-h-scrollbar .jspTrack {
+	background-color: #DCE2E8;
+}
+
+#ws-v-scrollbar .jspDrag,
+#ws-h-scrollbar .jspDrag {
+	background-color: #C0C0C0;
+}
+#ws-v-scrollbar .jspDrag.jspHover,
+#ws-v-scrollbar .jspDrag.jspActive,
+#ws-h-scrollbar .jspDrag.jspHover,
+#ws-h-scrollbar .jspDrag.jspActive {
+	background-color: #808080;
+}
+
+/* Vertical scrollbar */
+
+#ws-v-scrollbar .jspVerticalBar {
+	width: 7px;
+	border-left: 1px solid #C1C6CC;
+}
+#ws-v-scrollbar .jspTrack {
+	width: 8px;
+}
+
+/* Horizontal scrollbar */
+
+#ws-h-scrollbar .jspHorizontalBar {
+	height: 7px;
+	border-top: 1px solid #C1C6CC;
+}
+#ws-h-scrollbar .jspTrack {
+	height: 8px;
+}

www/common/onlyoffice/sdkjs/cell/css/main.css

@@ -1,156 +1,156 @@
-@charset "UTF-8";
-
-/*
- * Worksheet canvas
- * --------------------------------------------------------
- */
-
-#ws-canvas-outer {
-	position: absolute;
-	left: 0;
-	top: 0;
-	right: 14px;
-	bottom: 14px;
-    overflow: hidden;
-}
-
-#ws-canvas {
-	border: 0;
-    -webkit-user-select: none;
-}
-
-#ws-canvas-overlay, #ws-canvas-graphic, #ws-canvas-graphic-overlay {
-    -webkit-user-select: none;
-	border: 0;
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 1;
-}
-
-/*
- * Worksheet scroll bars
- * --------------------------------------------------------
- */
-
-#ws-v-scrollbar {
-	position: absolute;
-	right: 0;
-	width: 14px;
-	top: 0px;
-	bottom: 14px;
-	overflow: hidden;
-	z-index: 10;
-    background-color: #f1f1f1;
-}
-
-#ws-v-scroll-helper {
-	width: 1px;
-}
-
-#ws-h-scrollbar {
-	position: absolute;
-	bottom: 0;
-	height: 14px;
-	left: 0px;
-	right: 14px;
-	overflow: hidden;
-	z-index: 10;
-    background-color: #f1f1f1;
-}
-
-#ws-h-scroll-helper {
-	height: 1px;
-}
-
-#ws-scrollbar-corner {
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	width: 14px;
-	height: 14px;
-	background-color: #F4F4F4;
-	border: 0;
-	z-index: 10;
-}
-
-/* Scrollbars common */
-
-#ws-v-scrollbar .jspVerticalBar,
-#ws-h-scrollbar .jspHorizontalBar,
-#ws-v-scrollbar .jspTrack,
-#ws-h-scrollbar .jspTrack {
-	background-color: #DCE2E8;
-}
-
-#ws-v-scrollbar .jspDrag,
-#ws-h-scrollbar .jspDrag {
-	background-color: #C0C0C0;
-}
-#ws-v-scrollbar .jspDrag.jspHover,
-#ws-v-scrollbar .jspDrag.jspActive,
-#ws-h-scrollbar .jspDrag.jspHover,
-#ws-h-scrollbar .jspDrag.jspActive {
-	background-color: #808080;
-}
-
-/* Vertical scrollbar */
-
-#ws-v-scrollbar .jspVerticalBar {
-	width: 7px;
-	border-left: 1px solid #C1C6CC;
-}
-#ws-v-scrollbar .jspTrack {
-	width: 8px;
-}
-
-/* Horizontal scrollbar */
-
-#ws-h-scrollbar .jspHorizontalBar {
-	height: 7px;
-	border-top: 1px solid #C1C6CC;
-}
-#ws-h-scrollbar .jspTrack {
-	height: 8px;
-}
-
-/*
- * Cell editor
- * --------------------------------------------------------
- */
-
-#ce-canvas-outer {
-	position: absolute;
-	border: 0;
-	overflow: hidden;
-}
-
-#ce-canvas,
-#ce-canvas-overlay {
-	border: 0;
-	position: absolute;
-	left: 0;
-	top: 0;
-}
-
-#ce-cursor {
-	position: absolute;
-	background-color: #000;
-	width: 1px;
-	height: 11pt;
-    cursor: text;
-}
-
-#apiPopUpSelector {
-    position: absolute;
-}
-#apiPopUpList {
-    width: 100%;
-    height: 100%;
-    max-height: 210px;
-    overflow: hidden;
-    position: relative;
-}
-#apiPopUpList li {
-    max-width: 500px;
+@charset "UTF-8";
+
+/*
+ * Worksheet canvas
+ * --------------------------------------------------------
+ */
+
+#ws-canvas-outer {
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 14px;
+	bottom: 14px;
+    overflow: hidden;
+}
+
+#ws-canvas {
+	border: 0;
+    -webkit-user-select: none;
+}
+
+#ws-canvas-overlay, #ws-canvas-graphic, #ws-canvas-graphic-overlay {
+    -webkit-user-select: none;
+	border: 0;
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 1;
+}
+
+/*
+ * Worksheet scroll bars
+ * --------------------------------------------------------
+ */
+
+#ws-v-scrollbar {
+	position: absolute;
+	right: 0;
+	width: 14px;
+	top: 0px;
+	bottom: 14px;
+	overflow: hidden;
+	z-index: 10;
+    background-color: #f1f1f1;
+}
+
+#ws-v-scroll-helper {
+	width: 1px;
+}
+
+#ws-h-scrollbar {
+	position: absolute;
+	bottom: 0;
+	height: 14px;
+	left: 0px;
+	right: 14px;
+	overflow: hidden;
+	z-index: 10;
+    background-color: #f1f1f1;
+}
+
+#ws-h-scroll-helper {
+	height: 1px;
+}
+
+#ws-scrollbar-corner {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	width: 14px;
+	height: 14px;
+	background-color: #F4F4F4;
+	border: 0;
+	z-index: 10;
+}
+
+/* Scrollbars common */
+
+#ws-v-scrollbar .jspVerticalBar,
+#ws-h-scrollbar .jspHorizontalBar,
+#ws-v-scrollbar .jspTrack,
+#ws-h-scrollbar .jspTrack {
+	background-color: #DCE2E8;
+}
+
+#ws-v-scrollbar .jspDrag,
+#ws-h-scrollbar .jspDrag {
+	background-color: #C0C0C0;
+}
+#ws-v-scrollbar .jspDrag.jspHover,
+#ws-v-scrollbar .jspDrag.jspActive,
+#ws-h-scrollbar .jspDrag.jspHover,
+#ws-h-scrollbar .jspDrag.jspActive {
+	background-color: #808080;
+}
+
+/* Vertical scrollbar */
+
+#ws-v-scrollbar .jspVerticalBar {
+	width: 7px;
+	border-left: 1px solid #C1C6CC;
+}
+#ws-v-scrollbar .jspTrack {
+	width: 8px;
+}
+
+/* Horizontal scrollbar */
+
+#ws-h-scrollbar .jspHorizontalBar {
+	height: 7px;
+	border-top: 1px solid #C1C6CC;
+}
+#ws-h-scrollbar .jspTrack {
+	height: 8px;
+}
+
+/*
+ * Cell editor
+ * --------------------------------------------------------
+ */
+
+#ce-canvas-outer {
+	position: absolute;
+	border: 0;
+	overflow: hidden;
+}
+
+#ce-canvas,
+#ce-canvas-overlay {
+	border: 0;
+	position: absolute;
+	left: 0;
+	top: 0;
+}
+
+#ce-cursor {
+	position: absolute;
+	background-color: #000;
+	width: 1px;
+	height: 11pt;
+    cursor: text;
+}
+
+#apiPopUpSelector {
+    position: absolute;
+}
+#apiPopUpList {
+    width: 100%;
+    height: 100%;
+    max-height: 210px;
+    overflow: hidden;
+    position: relative;
+}
+#apiPopUpList li {
+    max-width: 500px;
 }

www/common/onlyoffice/sdkjs/common/Images/cursors_hot_spots.txt

@@ -0,0 +1,17 @@
+plus.png
+x:6 y:6
+
+plus_2x.png
+x:12 y:12
+
+plus_copy.png
+x:6 y:12
+
+plus_copy_2x.png
+x:12 y:25
+
+text_copy.png
+x:2 y:11
+
+text_copy_2x.png
+x:5 y:23

www/common/onlyoffice/sdkjs/slide/themes/theme1/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme10/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme11/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme2/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme3/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme4/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme5/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme6/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme7/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme8/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/sdkjs/slide/themes/theme9/theme.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

www/common/onlyoffice/web-apps/apps/api/documents/api.js

@@ -43,6 +43,7 @@
                     print: <can print>, // default = true
                     rename: <can rename>, // default = false
                     changeHistory: <can change history>, // default = false
+                    comment: <can comment in view mode> // default = edit
                 }
             },
             editorConfig: {
@@ -115,7 +116,8 @@
                     statusBar: true,
                     autosave: true,
                     forcesave: false,
-                    commentAuthorOnly: false
+                    commentAuthorOnly: false,
+                    showReviewChanges: false
                 },
                 plugins: {
                     autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}',
@@ -129,9 +131,11 @@
                 }
             },
             events: {
-                'onReady': <document ready callback>,
+                'onReady': <application ready callback>, // deprecated
+                'onAppReady': <application ready callback>,
                 'onBack': <back to folder callback>,
                 'onDocumentStateChange': <document state changed callback>
+                'onDocumentReady': <document ready callback>
             }
         }
 
@@ -162,9 +166,11 @@
                 }
             },
             events: {
-                'onReady': <document ready callback>,
+                'onReady': <application ready callback>, // deprecated
+                'onAppReady': <application ready callback>,
                 'onBack': <back to folder callback>,
                 'onError': <error callback>,
+                'onDocumentReady': <document ready callback>
             }
         }
     */
@@ -183,6 +189,9 @@
         _config.editorConfig.canRequestEditRights = _config.events && !!_config.events.onRequestEditRights;
         _config.frameEditorId = placeholderId;
 
+        _config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead.");
+        _config.events && (_config.events.onAppReady = _config.events.onAppReady || _config.events.onReady);
+
         var onMouseUp = function (evt) {
             _processMouse(evt);
         };
@@ -203,7 +212,7 @@
             }
         };
 
-        var _onReady = function() {
+        var _onAppReady = function() {
             if (_config.type === 'mobile') {
                 document.body.onfocus = function(e) {
                     setTimeout(function(){
@@ -273,11 +282,11 @@
                     } else if (msg.event === 'onInternalMessage' && msg.data && msg.data.type == 'localstorage') {
                         _callLocalStorage(msg.data.data);
                     } else {
-                        if (msg.event === 'onReady') {
-                            _onReady();
+                        if (msg.event === 'onAppReady') {
+                            _onAppReady();
                         }
 
-                        if (handler) {
+                        if (handler && typeof handler == "function") {
                             res = handler.call(_self, {target: _self, data: msg.data});
                         }
                     }
@@ -311,7 +320,7 @@
                 }
 
                 if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') {
-                    var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps))$/
+                    var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt|ott))$/
                                     .exec(_config.document.fileType);
                     if (!type) {
                         window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");
@@ -325,9 +334,7 @@
 
                 var type = /^(?:(pdf|djvu|xps))$/.exec(_config.document.fileType);
                 if (type && typeof type[1] === 'string') {
-                    if (!_config.document.permissions)
-                        _config.document.permissions = {};
-                    _config.document.permissions.edit = false;
+                    _config.editorConfig.canUseHistory = false;
                 }
 
                 if (!_config.document.title || _config.document.title=='')
@@ -409,21 +416,12 @@
             });
         };
 
-        var _showError = function(title, msg) {
-            _showMessage(title, msg, "error");
-        };
-
-        // severity could be one of: "error", "info" or "warning"
-        var _showMessage = function(title, msg, severity) {
-            if (typeof severity !== 'string') {
-                severity = "info";
-            }
+        var _showMessage = function(title, msg) {
+            msg = msg || title;
             _sendCommand({
                 command: 'showMessage',
                 data: {
-                    title: title,
-                    msg: msg,
-                    severity: severity
+                    msg: msg
                 }
             });
         };
@@ -540,7 +538,6 @@
         };
 
         return {
-            showError           : _showError,
             showMessage         : _showMessage,
             processSaveResult   : _processSaveResult,
             processRightsChange : _processRightsChange,
@@ -656,7 +653,7 @@
             app = appMap[config.documentType.toLowerCase()];
         } else
         if (!!config.document && typeof config.document.fileType === 'string') {
-            var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides))$/
+            var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm))$/
                             .exec(config.document.fileType);
             if (type) {
                 if (typeof type[1] === 'string') app = appMap['spreadsheet']; else

www/common/onlyoffice/web-apps/apps/documenteditor/main/index.html

@@ -7,9 +7,8 @@
     <meta name="description" content="" />
     <meta name="keywords" content="" />
     <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
 
-    <!-- splash -->        
+    <!-- splash -->
 
     <style type="text/css">
         .loadmask {
@@ -177,8 +176,6 @@
             100%    { top:100px; background: #55bce6; }
         }
     </style>
-</head>
-<body>
 
     <script>
         var userAgent = navigator.userAgent.toLowerCase(),
@@ -221,7 +218,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',
@@ -238,24 +235,50 @@
         else if ( lang == 'sl') loading = 'Nalaganje...';
         else if ( lang == 'tr') loading = 'Yükleniyor...';
 
-        if (!stopLoading)
-        document.write(
-            '<div id="loading-mask" class="loadmask">' +
-                '<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
-                    ((logo!==null) ? logo :
-                    '<div class="loader-page-romb">' +
-                        '<div class="romb" id="blue"></div>' +
-                        '<div class="romb" id="green"></div>' +
-                        '<div class="romb" id="red"></div>' +
-                    '</div>') +
-                '</div>' +
-                '<div class="loader-page-text">' +  customer +
-                '<div class="loader-page-text-loading">' + loading + '</div>' +
-                '</div>' +
-            '</div>');
-
-        var require = { 
-            waitSeconds: 30 
+        if ( !stopLoading )
+            document.write(
+                '<div id="loading-mask" class="loadmask">' +
+                    '<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
+                        ((logo!==null) ? logo :
+                        '<div class="loader-page-romb">' +
+                            '<div class="romb" id="blue"></div>' +
+                            '<div class="romb" id="green"></div>' +
+                            '<div class="romb" id="red"></div>' +
+                        '</div>') +
+                    '</div>' +
+                    '<div class="loader-page-text">' +  customer +
+                        '<div class="loader-page-text-loading">' + loading + '</div>' +
+                    '</div>' +
+                '</div>');
+    </script>
+
+    <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
+</head>
+<body>
+
+    <script>
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
+        var require = {
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/Contents.json

@@ -1,42 +1 @@
-[
-	{"src": "UsageInstructions/SetPageParameters.htm", "name": "Set page parameters", "headername": "Usage Instructions"},
-	{"src": "UsageInstructions/ChangeColorScheme.htm", "name": "Change color scheme"},
-	{"src": "UsageInstructions/CopyPasteUndoRedo.htm", "name": "Copy/paste text passages, undo/redo your actions"},
-	{"src": "UsageInstructions/NonprintingCharacters.htm", "name": "Show/hide nonprinting characters"},
-	{"src": "UsageInstructions/AlignText.htm", "name": "Align your text in a paragraph"},
-	{"src": "UsageInstructions/FormattingPresets.htm", "name": "Apply formatting styles"},
-	{"src": "UsageInstructions/BackgroundColor.htm", "name": "Select background color for a paragraph"},
-	{"src": "UsageInstructions/ParagraphIndents.htm", "name": "Change paragraph indents"},
-	{"src": "UsageInstructions/LineSpacing.htm", "name": "Set paragraph line spacing"},
-	{"src": "UsageInstructions/PageBreaks.htm", "name": "Insert page breaks"},
-	{"src": "UsageInstructions/SectionBreaks.htm", "name": "Insert section breaks"},
-	{"src": "UsageInstructions/AddBorders.htm", "name": "Add borders"},
-	{"src": "UsageInstructions/FontTypeSizeColor.htm", "name": "Set font type, size, and color"},
-	{"src": "UsageInstructions/DecorationStyles.htm", "name": "Apply font decoration styles"},
-	{"src": "UsageInstructions/CopyClearFormatting.htm", "name": "Copy/clear text formatting"},
-	{"src": "UsageInstructions/SetTabStops.htm", "name": "Set tab stops"},
-	{"src": "UsageInstructions/CreateLists.htm", "name": "Create lists"},
-	{"src": "UsageInstructions/InsertTables.htm", "name": "Insert tables"},
-	{"src": "UsageInstructions/InsertImages.htm", "name": "Insert images"},
-	{"src": "UsageInstructions/InsertAutoshapes.htm", "name": "Insert autoshapes"},
-	{"src": "UsageInstructions/InsertCharts.htm", "name": "Insert charts"},
-	{"src": "UsageInstructions/AddHyperlinks.htm", "name": "Add hyperlinks"},
-	{"src": "UsageInstructions/InsertDropCap.htm", "name": "Insert a drop cap"},
-	{"src": "UsageInstructions/InsertHeadersFooters.htm", "name": "Insert headers and footers"},
-    {"src":"UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers" },
-    {"src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations" },
-    {"src": "UsageInstructions/InsertTextObjects.htm", "name": "Insert text objects" },
-    {"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge"},
-	{"src": "UsageInstructions/ViewDocInfo.htm", "name": "View document information"},
-	{"src": "UsageInstructions/SavePrintDownload.htm", "name": "Save/download/print your document"},
-	{"src": "UsageInstructions/OpenCreateNew.htm", "name": "Create a new document or open an existing one"},
-	{"src": "HelpfulHints/About.htm", "name": "About Document Editor", "headername": "Helpful Hints"},
-	{"src": "HelpfulHints/SupportedFormats.htm", "name": "Supported Formats of Electronic Documents"},
-	{"src": "HelpfulHints/AdvancedSettings.htm", "name": "Advanced Settings of Document Editor"},
-	{"src": "HelpfulHints/Navigation.htm", "name": "View Settings and Navigation Tools"},
-	{"src": "HelpfulHints/Search.htm", "name": "Search and Replace Function"},
-	{"src": "HelpfulHints/CollaborativeEditing.htm", "name": "Collaborative Document Editing"},
-	{"src": "HelpfulHints/Review.htm", "name": "Document Review"},
-	{"src": "HelpfulHints/SpellChecking.htm", "name": "Spell-checking"},
-	{"src": "HelpfulHints/KeyboardShortcuts.htm", "name": "Keyboard Shortcuts"}
-]
+[{"src":"UsageInstructions/SetPageParameters.htm","name":"Set page parameters","headername":"Usage Instructions"},{"src":"UsageInstructions/ChangeColorScheme.htm","name":"Change color scheme"},{"src":"UsageInstructions/CopyPasteUndoRedo.htm","name":"Copy/paste text passages, undo/redo your actions"},{"src":"UsageInstructions/NonprintingCharacters.htm","name":"Show/hide nonprinting characters"},{"src":"UsageInstructions/AlignText.htm","name":"Align your text in a paragraph"},{"src":"UsageInstructions/FormattingPresets.htm","name":"Apply formatting styles"},{"src":"UsageInstructions/BackgroundColor.htm","name":"Select background color for a paragraph"},{"src":"UsageInstructions/ParagraphIndents.htm","name":"Change paragraph indents"},{"src":"UsageInstructions/LineSpacing.htm","name":"Set paragraph line spacing"},{"src":"UsageInstructions/PageBreaks.htm","name":"Insert page breaks"},{"src":"UsageInstructions/SectionBreaks.htm","name":"Insert section breaks"},{"src":"UsageInstructions/AddBorders.htm","name":"Add borders"},{"src":"UsageInstructions/FontTypeSizeColor.htm","name":"Set font type, size, and color"},{"src":"UsageInstructions/DecorationStyles.htm","name":"Apply font decoration styles"},{"src":"UsageInstructions/CopyClearFormatting.htm","name":"Copy/clear text formatting"},{"src":"UsageInstructions/SetTabStops.htm","name":"Set tab stops"},{"src":"UsageInstructions/CreateLists.htm","name":"Create lists"},{"src":"UsageInstructions/InsertTables.htm","name":"Insert tables"},{"src":"UsageInstructions/InsertImages.htm","name":"Insert images"},{"src":"UsageInstructions/InsertAutoshapes.htm","name":"Insert autoshapes"},{"src":"UsageInstructions/InsertCharts.htm","name":"Insert charts"},{"src":"UsageInstructions/AddHyperlinks.htm","name":"Add hyperlinks"},{"src":"UsageInstructions/InsertDropCap.htm","name":"Insert a drop cap"},{"src":"UsageInstructions/InsertHeadersFooters.htm","name":"Insert headers and footers"},{"src":"UsageInstructions/InsertPageNumbers.htm","name":"Insert page numbers"},{"src":"UsageInstructions/InsertFootnotes.htm","name":"Insert footnotes"},{"src":"UsageInstructions/InsertEquation.htm","name":"Insert equations"},{"src":"UsageInstructions/InsertTextObjects.htm","name":"Insert text objects"},{"src":"UsageInstructions/UseMailMerge.htm","name":"Use mail merge"},{"src":"UsageInstructions/ViewDocInfo.htm","name":"View document information"},{"src":"UsageInstructions/SavePrintDownload.htm","name":"Save/download/print your document"},{"src":"UsageInstructions/OpenCreateNew.htm","name":"Create a new document or open an existing one"},{"src":"HelpfulHints/About.htm","name":"About Document Editor","headername":"Helpful Hints"},{"src":"HelpfulHints/SupportedFormats.htm","name":"Supported Formats of Electronic Documents"},{"src":"HelpfulHints/AdvancedSettings.htm","name":"Advanced Settings of Document Editor"},{"src":"HelpfulHints/Navigation.htm","name":"View Settings and Navigation Tools"},{"src":"HelpfulHints/Search.htm","name":"Search and Replace Function"},{"src":"HelpfulHints/CollaborativeEditing.htm","name":"Collaborative Document Editing"},{"src":"HelpfulHints/Review.htm","name":"Document Review"},{"src":"HelpfulHints/SpellChecking.htm","name":"Spell-checking"},{"src":"HelpfulHints/KeyboardShortcuts.htm","name":"Keyboard Shortcuts"}]

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm

@@ -12,7 +12,12 @@
         <p><b>Document Editor</b> lets you change its advanced settings. To access them, click the <b>File</b> <img alt="File icon" src="../images/file.png" /> icon at the left sidebar and select the <b>Advanced Settings...</b> option. You can also use the <img alt="Advanced Settings icon" src="../images/advanced_settings_icon.png" /> icon in the right upper corner of the top toolbar.</p>
         <p>The advanced settings are:</p>
         <ul>
-            <li><b>Commenting Display</b><sup class="oOfficeFeatures">*</sup> is used to turn on/off the live commenting option. If you disable this feature, the commented passages will be highlighted only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</li>
+            <li><b>Commenting Display</b> is used to turn on/off the live commenting option: 
+            <ul>
+                <li><b>Turn on display of the comments</b> - if you disable this feature, the commented passages will be highlighted only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon at the left sidebar.</li>
+                <li><b>Turn on display of the resolved comments</b> - if you disable this feature, the resolved comments will be hidden in the document text. You'll be able to view such comments only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon at the left sidebar.</li>
+            </ul>
+            </li>
             <li><b>Spell Checking</b> is used to turn on/off the spell checking option.</li>
             <li><b>Alternate Input</b> is used to turn on/off hieroglyphs.</li>
             <li><b>Alignment Guides</b> is used to turn on/off alignment guides that appear when you move objects and allow you to position them on the page precisely.</li>
@@ -43,7 +48,6 @@
             <li><b>Unit of Measurement</b> is used to specify what units are used on the rulers and in properties windows for measuring elements parameters such as width, height, spacing, margins etc. You can select the <b>Centimeter</b>, <b>Point</b>, or <b>Inch</b> option.</li>
         </ul>
         <p>To save the changes you made, click the <b>Apply</b> button.</p>
-        <p class="oOfficeFeatures"><sup>*</sup>available for paid versions only</p>
     </div>
 </body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm

@@ -26,7 +26,7 @@
         <p>When no users are viewing or editing the file, the icon in the status bar will look like <img alt="Manage document access rights icon" src="../images/access_rights.png" /> allowing you to manage the users who have access to the file right from the document: invite new users giving them either full or read-only access, or denying some users access rights to the file. Click this icon to manage the access to the file; this can be done both when there are no other users who view or co-edit the document at the moment and when there are other users and the icon looks like <img alt="Number of users icon" src="../images/usersnumber.png" />.</p>
         <p>As soon as one of the users saves his/her changes by clicking the <img alt="Save icon" src="../images/savewhilecoediting.png" /> icon, the others will see a note within the status bar stating that they have updates. To save the changes you made, so that other users can view them, and get the updates saved by your co-editors, click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar. The updates will be highlighted for you to check what exactly has been changed.</p>
         <p>You can specify what changes you want to be highlighted during co-editing if you click the <img alt="File icon" src="../images/file.png" /> icon at the left sidebar, select the <b>Advanced Settings...</b> option and choose between <b>none</b>, <b>all</b> and <b>last</b> realtime collaboration changes. Selecting <b>View all</b> changes, all the changes made during the current session will be highlighted. Selecting <b>View last</b> changes, only the changes made since you last time clicked the <img alt="Save icon" src="../images/saveupdate.png" /> icon will be highlighted. Selecting <b>View None</b> changes, changes made during the current session will not be highlighted.</p>
-        <h3>Chat<a class="sup_link" href="../HelpfulHints/CollaborativeEditing.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></h3>
+        <h3>Chat</h3>
         <p>You can use this tool to coordinate the co-editing process on-the-fly, for example, to arrange with your collaborators about who is doing what, which paragraph you are going to edit now etc.</p>
         <p>The chat messages are stored during one session only. To discuss the document content it is better to use comments which are stored until you decide to delete them.</p>
         <p>To access the chat and leave a message for other users,</p>
@@ -38,7 +38,7 @@
         <p>All the messages left by users will be displayed on the panel on the left. If there are new messages you haven't read yet, the chat icon will look like this - <img alt="Chat icon" src="../images/chaticon_new.png" />.</p>
         <p>To close the panel with chat messages, click the <img alt="Chat icon" src="../images/chaticon.png" /> icon once again.</p>
         </div>
-                <h3>Comments<a class="sup_link oOfficeFeatures" href="../HelpfulHints/CollaborativeEditing.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></h3>
+                <h3>Comments</h3>
         <p>To leave a comment,</p>
         <ol>
             <li>select a text passage where you think there is an error or problem,</li>
@@ -50,16 +50,15 @@
             <li>click the <b>Add Comment/Add</b> button.</li>
         </ol>
         <p>The comment will be seen on the panel on the left. Any other user can answer to the added comment asking questions or reporting on the work he/she has done. For this purpose, click the <b>Add Reply</b> link situated under the comment.</p>
-        <p>The text passage you commented will be highlighted in the document. To view the comment, just click within the passage. If you need to disable this feature, click the <img alt="File icon" src="../images/file.png" /> icon, select the <b>Advanced Settings...</b> option and uncheck the <b>Turn on live commenting option</b> box. In this case the commented passages will be highlighted only if you click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</p>
+        <p>The text passage you commented will be highlighted in the document. To view the comment, just click within the passage. If you need to disable this feature, click the <img alt="File icon" src="../images/file.png" /> icon, select the <b>Advanced Settings...</b> option and uncheck the <b>Turn on display of the comments</b> box. In this case the commented passages will be highlighted only if you click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</p>
         <p>You can manage the comments you added in the following way:</p>
         <ul>
             <li>edit them by clicking the <img alt="Edit icon" src="../images/editcommenticon.png" /> icon,</li>
             <li>delete them by clicking the <img alt="Delete icon" src="../images/deletecommenticon.png" /> icon,</li>
-            <li>close the discussion by clicking the <img alt="Resolve icon" src="../images/resolveicon.png" /> icon if the task or problem you stated in your comment was solved, after that the discussion you opened with your comment gets the resolved status. To open it again, click the <img alt="Open again icon" src="../images/resolvedicon.png" /> icon.</li>
+            <li>close the discussion by clicking the <img alt="Resolve icon" src="../images/resolveicon.png" /> icon if the task or problem you stated in your comment was solved, after that the discussion you opened with your comment gets the resolved status. To open it again, click the <img alt="Open again icon" src="../images/resolvedicon.png" /> icon. If you want to hide resolved comments, click the <img alt="File icon" src="../images/file.png" /> icon, select the <b>Advanced Settings...</b> option and uncheck the <b>Turn on display of the resolved comments</b> box. In this case the resolved comments will be highlighted only if you click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</li>
         </ul>
-        <p>New comments added by other users will become visible only after you click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar.</p>
+        <p>If you are using the <b>Strict</b> co-editing mode, new comments added by other users will become visible only after you click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar.</p>
         <p>To close the panel with comments, click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon once again.</p>
-        <p class="oOfficeFeatures"><sup id="footnote">*</sup>available for paid versions only</p>
     </div>
 </body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm

@@ -25,17 +25,17 @@
 					<td>Open the <b>Search</b> panel to start searching for a character/word/phrase in the currently edited document.</td>
 				</tr>
 				<tr>
-					<td>Open 'Comments' panel<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
+					<td>Open 'Comments' panel</td>
 					<td>Ctrl+Shift+H</td>
 					<td>Open the <b>Comments</b> panel to add your own comment or reply to other users' comments.</td>
 				</tr>
 				<tr>
-					<td>Open comment field<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
+					<td>Open comment field</td>
 					<td>Alt+H</td>
 					<td>Open a data entry field where you can add the text of your comment.</td>
 				</tr>
 				<tr class="onlineDocumentFeatures">
-					<td>Open 'Chat' panel<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
+					<td>Open 'Chat' panel</td>
 					<td>Alt+Q</td>
 					<td>Open the <b>Chat</b> panel and send a message.</td>
 				</tr>
@@ -342,12 +342,11 @@
 					<td>Maintain the proportions of the selected object when resizing.</td>
 				</tr>
 				<tr>
-					<td>Movement by three-pixel increments</td>
+					<td>Movement by one-pixel increments</td>
 					<td>Ctrl</td>
-					<td>Hold down the Ctrl key and use the keybord arrows to move the selected object by three pixels at a time.</td>
+					<td>Hold down the Ctrl key and use the keybord arrows to move the selected object by one pixel at a time.</td>
 				</tr>
 			</table>
-            <p class="oOfficeFeatures"><sup id="footnote">*</sup> - available for paid versions only</p>
 		</div>
 	</body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/CopyPasteUndoRedo.htm

@@ -9,6 +9,7 @@
 	<body>
 		<div class="mainpart">
 			<h1>Copy/paste text passages, undo/redo your actions</h1>
+            <h3>Use basic clipboard operations</h3>
 			<p>To cut, copy and paste text passages and inserted objects (autoshapes, images, charts) within the current document use the corresponding options from the right-click menu or icons at the top toolbar:</p>
 			<ul>
                 <li><b>Cut</b> – select a text fragment or an object and use the <b>Cut</b> option from the right-click menu to delete the selection and send it to the computer clipboard memory. The cut data can be later inserted to another place in the same document.</li>
@@ -23,6 +24,14 @@
                 <li><b>Ctrl+V</b> key combination for pasting.</li>
             </ul>
 			<p class="note"><b>Note</b>: instead of cutting and pasting text within the same document you can just select the necessary text passage and drag and drop it to the necessary position.</p>
+            <h3>Use the Paste Special feature</h3>
+            <p>Once the copied text is pasted, the <b>Paste Special</b> <img alt="Paste Special" src="../images/pastespecialbutton.png" /> button appears next to the inserted text passage. Click this button to select the necessary paste option. </p>
+            <p>When pasting the paragraph text or some text within autoshapes, the following options are available:</p>
+            <ul>
+                <li><em>Paste</em> - allows to paste the copied text keeping its original formatting.</li>
+                <li><em>Keep text only</em> - allows to paste the text without its original formatting.</li>
+            </ul>
+            <h3>Undo/redo your actions</h3>
 			<p>To perform the undo/redo operations, use the corresponding icons at the top toolbar or keyboard shortcuts:</p>
             <ul>
                 <li><b>Undo</b> – use the <b>Undo</b> <img alt="Undo icon" src="../images/undo.png" /> icon at the top toolbar or the <b>Ctrl+Z</b> key combination to undo the last operation you performed.</li>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertAutoshapes.htm

@@ -183,6 +183,8 @@
             <p><img alt="Shape - Advanced Settings" src="../images/shape_properties_4.png" /></p>
 			<p>The <b>Text Padding</b> tab allows to change the autoshape <b>Top</b>, <b>Bottom</b>, <b>Left</b> and <b>Right</b> internal margins (i.e. the distance between the text within the shape and the autoshape borders).</p>
             <p class="note"><b>Note</b>: this tab is only available if text is added within the autoshape, otherwise the tab is disabled.</p>
+            <p><img alt="Shape - Advanced Settings" src="../images/shape_properties_5.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the shape.</p>
 		</div>
 	</body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertCharts.htm

@@ -158,6 +158,8 @@
                         </ul>
                         </li>
                     </ul>
+                    <p><img alt="Chart - Advanced Settings" src="../images/chartsettings5.png" /></p>
+                    <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the chart.</p>
                     </li>
 			</ol>
 			<hr />
@@ -242,6 +244,8 @@
 				<li><b>Move object with text</b> controls whether the chart moves as the text to which it is anchored moves.</li>
 				<li><b>Allow overlap</b> controls whether two charts overlap or not if you drag them near each other on the page.</li>
 			</ul>
+            <p><img alt="Chart - Advanced Settings" src="../images/chart_properties_3.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the chart.</p>
 		</div>
 	</body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertFootnotes.htm

@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Insert footnotes</title>
+		<meta charset="utf-8" />
+        <meta name="description" content="Insert footnotes to provide explanations for some terms or make references to the sources" />
+		<link type="text/css" rel="stylesheet" href="../editor.css" />
+        <script type="text/javascript" src="../callback.js"></script>
+	</head>
+	<body>
+		<div class="mainpart">
+			<h1>Insert footnotes</h1>
+            <p>You can add footnotes to provide explanations or comments for certain sentences or terms used in your text, make references to the sources etc.</p>
+			<p>To insert a footnote into your document,</p>
+			<ol>
+                <li>position the insertion point at the end of the text passage that you want to add a footnote to,</li>
+				<li>click the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/addfootnote.png" /> icon at the top toolbar, or<br/>
+                click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon and select the <b>Insert Footnote</b> option from the menu,
+                <p>The footnote mark (i.e. the superscript character that indicates a footnote) appears in the document text and the insertion point moves to the bottom of the current page.</p>
+                </li>
+				<li>type in the footnote text.</li>
+			</ol>
+            <p>Repeat the above mentioned operations to add subsequent footnotes for other text passages in the document. The footnotes are numbered automatically.</p>
+            <p><img alt="Footnotes" src="../images/footnotesadded.png" /></p>
+            <p>If you hover the mouse pointer over the footnote mark in the document text, a small pop-up window with the footnote text appears.</p>
+            <p><img alt="Footnote text" src="../images/footnotetext.png" /></p>
+            <p>To easily navigate between the added footnotes within the document text,</p>
+            <ol>
+                <li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon,</li>
+                <li>in the <b>Go to Footnotes</b> section, use the <img alt="Previous footnote icon" src="../images/previousfootnote.png" /> arrow to go to the previous footnote or the <img alt="Next footnote icon" src="../images/nextfootnote.png" /> arrow to go to the next footnote.</li>
+            </ol>
+            <hr />
+			<p>To edit the footnotes settings,</p>
+			<ol>
+				<li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon at the top toolbar,</li>
+                <li>select the <b>Notes Settings</b> option from the menu,</li>
+				<li>change the current parameters in the <b>Notes Settings</b> window that opens: 
+				<p><img alt="Footnotes Settings window" src="../images/footnotes_settings.png" /></p>
+				<ul>
+				<li>Set the <b>Location</b> of footnotes on the page selecting one of the available options: 
+                    <ul>
+                        <li><b>Bottom of page</b> - to position footnotes at the bottom of the page (this option is selected by default).</li>
+                        <li><b>Below text</b> - to position footnotes closer to the text. This option can be useful in cases when the page contains a short text.</li>
+                    </ul>
+                </li>
+                <li>Adjust the footnotes <b>Format</b>:
+                    <ul>
+                        <li><b>Number Format</b> - select the necessary number format from the available ones: <em>1, 2, 3,...</em>, <em>a, b, c,...</em>, <em>A, B, C,...</em>, <em>i, ii, iii,...</em>, <em>I, II, III,...</em>.</li>
+                        <li><b>Start at</b> - use the arrows to set the number or letter you want to start numbering with.</li>
+                        <li><b>Numbering</b> - select a way to number your footnotes:
+                        <ul>
+                            <li><b>Continuous</b> - to number footnotes sequentially throughout the document,</li>
+                            <li><b>Restart each section</b> - to start footnote numbering with the number 1 (or some other specified character) at the beginning of each section,</li>
+                            <li><b>Restart each page</b> - to start footnote numbering with the number 1 (or some other specified character) at the beginning of each page.</li>
+                        </ul>
+                        </li>
+                        <li><b>Custom Mark</b> - set a special character or a word you want to use as the footnote mark (e.g. * or Note1). Enter the necessary character/word into the text entry field and click the <b>Insert</b> button at the bottom of the <b>Notes Settings</b> window.</li>
+                    </ul>
+                </li>
+                <li>Use the <b>Apply changes to</b> drop-down list to select if you want to apply the specified notes settings to the <b>Whole document</b> or the <b>Current section</b> only.
+                <p class="note"><b>Note</b>: to use different footnotes formatting in separate parts of the document, you need to add <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">section breaks</a> first.</p>
+                </li>
+				</ul>
+				</li>
+                <li>When ready, click the <b>Apply</b> button.</li>
+			</ol>
+            
+            <hr />
+            <p>To remove a single footnote, position the insertion point directly before the footnote mark in the document text and press <b>Delete</b>. Other footnotes will be renumbered automatically.</p>
+            <p>To delete all the footnotes in the document,</p>
+            <ol>
+                <li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon at the top toolbar,</li>
+                <li>select the <b>Delete All Footnotes</b> option from the menu.</li>
+            </ol>
+		</div>
+	</body>
+</html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm

@@ -46,7 +46,7 @@
 				<li><b>Image Advanced Settings</b> is used to open the 'Image - Advanced Settings' window.</li>
 			</ul>
 			<hr />
-			<p>To change its advanced settings, click the image with the right mouse button and select <b>Advanced Settings</b> from the right-click menu or just click the <b>Show advanced settings</b> link at the right sidebar. The image properties window will open:</p>
+			<p>To change its advanced settings, click the image with the right mouse button and select the <b>Image Advanced Settings</b> option from the right-click menu or just click the <b>Show advanced settings</b> link at the right sidebar. The image properties window will open:</p>
 			<p><img alt="Image - Advanced Settings: Size" src="../images/image_properties.png" /></p>
 			<p>The <b>Size</b> tab contains the following parameters:</p>
 			<ul>
@@ -92,6 +92,8 @@
                 <li><b>Move object with text</b> controls whether the image moves as the text to which it is anchored moves.</li>
 				<li><b>Allow overlap</b> controls whether two images overlap or not if you drag them near each other on the page.</li>
 			</ul>
+            <p><img alt="Image - Advanced Settings" src="../images/image_properties_3.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image.</p>
 		</div>
 	</body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertPageNumbers.htm

@@ -37,7 +37,7 @@
 				<li>Set the <b>Position</b> of page numbers on the page as well as relative to the top and bottom of the page.</li>
 				<li>Check the <b>Different first page</b> box to apply a different page number to the very first page or in case you don't want to add any number to it at all. </li>
 				<li>Use the <b>Different odd and even pages</b> box to insert different page numbers for odd and even pages. </li>
-				<li>The <b>Link to Previous</b> option is available in case you've previously added <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">sections</a> into your document. If not, it will be grayed out. Moreover, this option is also unavailable for the very first section (i.e. when a header or footer that belongs to the first section is selected). By default, this box is checked, so that unified numbering is applied to all the sections. If you select a header or footer area, you will see that the area is marked with the <b>Same as Previous</b> label. Uncheck the <b>Link to Previous</b> box to use different page numbering for each section of the document, for example, to start each section numbering at 1. The <b>Same as Previous</b> label will no longer be displayed.</li>
+				<li>The <b>Link to Previous</b> option is available in case you've previously added <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">sections</a> into your document. If not, it will be grayed out. Moreover, this option is also unavailable for the very first section (i.e. when a header or footer that belongs to the first section is selected). By default, this box is checked, so that unified numbering is applied to all the sections. If you select a header or footer area, you will see that the area is marked with the <b>Same as Previous</b> label. Uncheck the <b>Link to Previous</b> box to use different page numbering for each section of the document. The <b>Same as Previous</b> label will no longer be displayed.</li>
 				</ul>
 				<p><img alt="Same as previous label" src="../images/sameasprevious_label.png" /></p>
 				</li>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertRichTextContentControls.htm

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Create forms</title>
+		<meta charset="utf-8" />
+        <meta name="description" content="Insert rich text content controls to create a form with input fields that can be filled in by other users, or protect some parts of the document from being edited or deleted" />
+		<link type="text/css" rel="stylesheet" href="../editor.css" />
+        <script type="text/javascript" src="../callback.js"></script>
+	</head>
+	<body>
+		<div class="mainpart">
+			<h1>Create forms</h1>
+            <p>Using rich text content controls you can create a form with input fields that can be filled in by other users, or protect some parts of the document from being edited or deleted. Rich text content controls are objects containing text that can be formatted. Inline controls cannot contain more than one paragraph, while floating controls can contain several paragraphs, lists, and objects (images, shapes, tables etc.). </p>
+			<h3>Adding controls</h3>
+            <p>To create a new <b>inline</b> control,</p>
+            <ol>
+                <li>position the insertion point within a line of the text where you want the control to be added,<br />or select a text passage you want to become the control contents.</li>
+                <li>press <b>Shift+F1</b></li>
+            </ol>
+            <p>The control will be inserted at the insertion point within a line of the existing text. Inline controls do not allow adding line breaks and cannot contain other objects such as images, tables etc.</p>
+            <p><img alt="New inline content control" src="../images/addedcontentcontrol.png" /></p>
+            <p>To create a new <b>floating</b> control,</p>
+            <ol>
+                <li>position the insertion point at the end of a paragraph after which you want the control to be added,<br />or select one or more of the existing paragraphs you want to become the control contents.</li>
+                <li>press <b>Shift+F2</b></li>
+            </ol>
+            <p>The control will be inserted in a new paragraph. Floating controls allow adding line breaks, i.e. can contain multiple paragraphs as well as some objects, such as images, tables, other content controls etc.</p>
+            <p><img alt="Floating content control" src="../images/floatingcontentcontrol.png" /></p>
+            <p class="note"><b>Note</b>: The content control border is visible when the control is selected only. The borders do not appear on a printed version.</p>
+            <h3>Moving controls</h3>
+            <p>Controls can be <b>moved</b> to another place in the document: click the button to the left of the control border to select the control and drag it without releasing the mouse button to another position in the document text.</p>
+            <p><img alt="Moving content control" src="../images/movecontentcontrol.png" /></p>
+            <p>You can also <b>copy and paste</b> inline controls: select the necessary control and use the <b>Ctrl+C/Ctrl+V</b> key combinations.</p>
+            <h3>Editing control contents</h3>
+            <p>To switch to the control editing mode, press <b>Shift+F9</b>. You will be able to navigate between the controls only using the keyboard arrow buttons. <!--To exit from this mode and be able to edit regular text in your document--></p>
+            <p>Replace the default text within the control ("Your text here") with your own one: select the default text, press the <b>Delete</b> key and type in a new text or copy a text passage from anywhere and paste it into the content control.</p>
+            <p>Text within the rich text content control of any type (both inline and floating) can be formatted using the icons on the top toolbar: you can adjust the <a href="../UsageInstructions/FontTypeSizeColor.htm" onclick="onhyperlinkclick(this)">font type, size, color</a>, apply <a href="../UsageInstructions/DecorationStyles.htm" onclick="onhyperlinkclick(this)">decoration styles</a> and <a href="../UsageInstructions/FormattingPresets.htm" onclick="onhyperlinkclick(this)">formatting presets</a>. It's also possible to use the <b>Paragraph - Advanced settings</b> window accessible from the contextual menu or from the right sidebar to change the text properties. Text within floating controls can be formatted like a regular text of the document, i.e. you can set <a href="../UsageInstructions/LineSpacing.htm" onclick="onhyperlinkclick(this)">line spacing</a>, change <a href="../UsageInstructions/ParagraphIndents.htm" onclick="onhyperlinkclick(this)">paragraph indents</a>, adjust <a href="../UsageInstructions/SetTabStops.htm" onclick="onhyperlinkclick(this)">tab stops</a>.</p>
+            <h3>Protecting controls</h3>
+            <p>You can prevent users from editing or deleting some individual content controls. Use one of the following keyboard shortcuts:</p>
+            <ul>
+                <li>To protect a control from being edited (but not from being deleted), select the necessary control and press <b>Shift+F6</b></li>
+                <li>To protect a control from being deleted (but not from being edited), select the necessary control and press <b>Shift+F7</b></li>
+                <li>To protect a control from being both edited and deleted, select the necessary control and press <b>Shift+F8</b></li>
+                <li>To disable the protection from editing/deleting, select the necessary control and press <b>Shift+F5</b></li>
+            </ul>
+            <h3>Removing controls</h3>
+            <p>If you do not need a control anymore, you can use one of the following keyboard shortcuts:</p>
+            <ul>
+                <li>To remove a control and all its contents, select the necessary control and press <b>Shift+F3</b></li>
+                <li>To remove a control and leave all its contents, select the necessary control and press <b>Shift+F4</b></li>
+            </ul>
+            
+		</div>
+	</body>
+</html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTables.htm

@@ -64,7 +64,7 @@
 				</li>
 				<li><p><b>Select from Template</b> is used to choose a table template from the available ones.</p></li>
 				<li><p><b>Borders Style</b> is used to select the border size, color, style as well as background color.</p></li>
-				<li><p><b>Text Wrapping</b> is used to select between two text wrapping styles - inline and flow.</p></li>
+				<li><p><b>Wrapping Style</b> is used to select between two text wrapping styles - inline and flow.</p></li>
 				<li><p><b>Rows &amp; Columns</b> is used to perform some operations with the table: select, delete, insert rows and columns, merge cells, split a cell.</p></li>
 				<li><p><b>Repeat as header row at the top of each page</b> is used to insert the same header row at the top of each page in long tables.</p></li>
 				<li><p><b>Show advanced settings</b> is used to open the 'Table - Advanced Settings' window.</p></li>
@@ -149,7 +149,9 @@
                     </ul>
                 </li>
             </ul>
-            
+            <p><img alt="Table - Advanced Settings" src="../images/table_properties_6.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the table.</p>
+                        
 		</div>
 	</body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/ParagraphIndents.htm

@@ -25,7 +25,8 @@
 			<p>Select the necessary paragraph(s) and drag the indent markers along the ruler.</p>
 			<ul>
 			<li><b>First Line Indent</b> marker <img alt="First Line Indent marker" src="../images/firstline_indent.png" /> is used to set the offset from the left side of the page for the first line of the paragraph.</li>
-			<li><b>Hanging Indent</b> marker <img alt="Hanging Indent marker" src="../images/hanging.png" /> is used to set the offset from the left side of the page for the second and all the subsequent lines of the paragraph.</li>
+			<li><b>Hanging Indent</b> marker <img alt="Hanging Indent marker" src="../images/hanging.png" /> is used to set the offset from the left side of the page for the second line and all the subsequent lines of the paragraph.</li>
+            <li><b>Left Indent</b> marker <img alt="Left Indent marker" src="../images/leftindent.png" /> is used to set the entire paragraph offset from the left side of the page.</li>
 			<li><b>Right Indent</b> marker <img alt="Right Indent marker" src="../images/right_indent.png" /> is used to set the paragraph offset from the right side of the page.</li>
 			</ul>
 		</div>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/SectionBreaks.htm

@@ -10,7 +10,7 @@
 	<body>
 		<div class="mainpart">
 			<h1>Insert section breaks</h1>
-			<p>Section breaks allow you to apply a different layout or formatting for the certain parts of your document. For example, you can use individual <a href="../UsageInstructions/InsertHeadersFooters.htm" onclick="onhyperlinkclick(this)">headers and footers</a>, <a href="../UsageInstructions/InsertPageNumbers.htm" onclick="onhyperlinkclick(this)">page numbering</a>, <a href="../UsageInstructions/SetPageParameters.htm" onclick="onhyperlinkclick(this)">margins, size, orientation, or column number</a> for each separate section.</p>
+			<p>Section breaks allow you to apply a different layout or formatting for the certain parts of your document. For example, you can use individual <a href="../UsageInstructions/InsertHeadersFooters.htm" onclick="onhyperlinkclick(this)">headers and footers</a>, <a href="../UsageInstructions/InsertPageNumbers.htm" onclick="onhyperlinkclick(this)">page numbering</a>, <a href="../UsageInstructions/InsertFootnotes.htm" onclick="onhyperlinkclick(this)">footnotes format</a>, <a href="../UsageInstructions/SetPageParameters.htm" onclick="onhyperlinkclick(this)">margins, size, orientation, or column number</a> for each separate section.</p>
 			<p class="note"><b>Note</b>: an inserted section break defines formatting of the preceding part of the document.</p>
 			<p>To insert a section break at the current cursor position:</p>
 			<ol>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/SetPageParameters.htm

@@ -46,6 +46,8 @@
                 <li><b>Left</b> <img alt="Left column icon" src="../images/leftcolumn.png" /> - to add two columns: a narrow column on the left and a wide column on the right,</li>
                 <li><b>Right</b> <img alt="Right column icon" src="../images/rightcolumn.png" /> - to add two columns: a narrow column on the right and a wide column on the left.</li>
             </ul>
+            <p>If you want to adjust column settings, select the <b>Custom Columns</b> option from the list. The <b>Columns</b> window will open where you'll be able to set necessary <b>Number of columns</b> (it's possible to add up to 12 columns) and <b>Spacing between columns</b>. Enter your new values into the entry fields or adjust the existing values using arrow buttons. Check the <b>Column divider</b> box to add a vertical line between the columns. When ready, click <b>OK</b> to apply the changes.</p>
+            <p><img alt="Custom Columns" src="../images/customcolumns.png" /></p>
             <p>To exactly specify where a new column should start, place the cursor before the text that you want to move into the new column, click the <b>Insert Page or Section Break</b> <img alt="Insert Page or Section Break" src="../images/pagebreak1.png" /> icon at the top toolbar and then select the <b>Insert Column Break</b> option. The text will be moved to the next column.</p>
             <p>Added column breaks are indicated in your document by a dotted line: <img alt="Column break" src="../images/columnbreak.png" />. If you do not see the inserted column breaks, click the <img alt="Nonprinting Characters icon" src="../images/nonprintingcharacters.png" /> icon at the top toolbar to display them. To remove a column break select it with the mouse and press the <b>Delete</b> key.</p>
             <p>To manually change the column width and spacing, you can use the horizontal ruler.</p>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/UsageInstructions/ViewDocInfo.htm

@@ -12,6 +12,7 @@
 			<p>To access the detailed information about the currently edited document, click the <b>File</b> <img alt="File icon" src="../images/file.png" /> icon at the left sidebar and select the <b>Document Info...</b> option.</p>
 			<h3>General Information</h3>
             <p>The document information includes document title, author, location, creation date, and statistics: the number of pages, paragraphs, words, symbols, symbols with spaces.</p>
+            <p class="note"><b>Note</b>: Online Editors allow you to change the document title directly from the editor interface. To do that, select the <b>Rename...</b> option from the <b>File</b> <img alt="File icon" src="../images/file.png" /> menu or click on the file name displayed in the editor header next to the logo (in the upper left corner), then enter the necessary <b>File name</b> in a new window that opens and click <b>OK</b>.</p>
             <div class="onlineDocumentFeatures">
                 <h3>Permission Information</h3>
                 <p class="note"><b>Note</b>: this option is not available for users with the <b>Read Only</b> permissions.</p>
@@ -21,7 +22,7 @@
                 <p class="note"><b>Note</b>: this option is not available for free accounts as well as for users with the <b>Read Only</b> permissions.</p>
                 <p>To view all the changes made to this document, select the <b>Version History</b> option at the left sidebar. You'll see the list of this document versions (major changes) and revisions (minor changes) with the indication of each version/revision author and creation date and time. For document versions, the version number is also specified (e.g. <em>ver. 2</em>). To know exactly which changes have been made in each separate version/revision, you can view the one you need by clicking it at the left sidebar. The changes made by the version/revision author are marked with the color which is displayed next to the author name on the left sidebar. To return to the document current version, click the <b>Back to Document</b> link on the top of the version list.</p>
             </div>
-            <p>To close the <b>File</b> panel and return to document editing, select the <b>Back to Document</b> option.</p>
+            <p>To close the <b>File</b> panel and return to document editing, select the <b>Close Menu</b> option.</p>
         </div>
 	</body>
 </html>

www/common/onlyoffice/web-apps/apps/documenteditor/main/resources/help/en/callback.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2017
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)