Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

apps/common/main/resources/less/comments.less

@@ -295,7 +295,7 @@
         height: 20px;
         line-height: @line-height-base;
         background-color: #EE3525;
-        margin: 18px 25px;
+        margin: 10px 18px;
         padding: 2px 10px;
         color: #fff;
         overflow: hidden;

apps/documenteditor/main/app/controller/Main.js

@@ -1258,6 +1258,10 @@ define([
                         config.msg = this.errorAccessDeny;
                         break;
 
+                    case Asc.c_oAscError.ID.UplImageUrl:
+                        config.msg = this.errorBadImageUrl;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -2116,7 +2120,8 @@ define([
             errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.',
             titleServerVersion: 'Editor updated',
             errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
-            textChangesSaved: 'All changes saved'
+            textChangesSaved: 'All changes saved',
+            errorBadImageUrl: 'Image url is incorrect'
         }
     })(), DE.Controllers.Main || {}))
 });

apps/documenteditor/main/locale/en.json

@@ -301,6 +301,7 @@
   "DE.Controllers.Main.titleServerVersion": "Editor updated",
   "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
   "DE.Controllers.Main.textChangesSaved": "All changes saved",
+  "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",

apps/documenteditor/mobile/app/controller/Main.js

@@ -810,6 +810,10 @@ define([
                         config.msg = this.errorConnectToServer;
                         break;
 
+                    case Asc.c_oAscError.ID.UplImageUrl:
+                        config.msg = this.errorBadImageUrl;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -1211,7 +1215,8 @@ define([
             textClose: 'Close',
             textDone: 'Done',
             titleServerVersion: 'Editor updated',
-            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.'
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
+            errorBadImageUrl: 'Image url is incorrect'
         }
     })(), DE.Controllers.Main || {}))
 });
\ No newline at end of file

apps/documenteditor/mobile/locale/en.json

@@ -69,6 +69,7 @@
   "DE.Controllers.Main.errorUsersExceed": "The number of users was exceeded",
   "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
+  "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
   "DE.Controllers.Main.loadFontTextText": "Loading data...",

apps/presentationeditor/main/app/controller/Main.js

@@ -1010,6 +1010,10 @@ define([
                         config.msg = this.errorAccessDeny;
                         break;
 
+                    case Asc.c_oAscError.ID.UplImageUrl:
+                        config.msg = this.errorBadImageUrl;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -1905,7 +1909,8 @@ define([
             errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.',
             titleServerVersion: 'Editor updated',
             errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
-            textChangesSaved: 'All changes saved'
+            textChangesSaved: 'All changes saved',
+            errorBadImageUrl: 'Image url is incorrect'
         }
     })(), PE.Controllers.Main || {}))
 });

apps/presentationeditor/main/app/controller/Toolbar.js

@@ -697,11 +697,11 @@ define([
         },
 
         onApiLockDocumentTheme: function() {
-            this.toolbar.lockToolbar(PE.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas]});
+            this.toolbar.lockToolbar(PE.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
         },
 
         onApiUnLockDocumentTheme: function() {
-            this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas]});
+            this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
         },
 
         onApiCoAuthoringDisconnect: function(disableDownload) {

apps/presentationeditor/main/app/view/Toolbar.js

@@ -855,7 +855,7 @@ define([
                 enableKeyEvents: true,
                 itemHeight  : 38,
                 hint: this.tipSlideTheme,
-                lock: [_set.lostConnect, _set.noSlides],
+                lock: [_set.themeLock, _set.lostConnect, _set.noSlides],
                 beforeOpenHandler: function(e) {
                     var cmp = this,
                         menu = cmp.openButton.menu,

apps/presentationeditor/main/locale/en.json

@@ -248,6 +248,7 @@
   "PE.Controllers.Main.titleServerVersion": "Editor updated",
   "PE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
   "PE.Controllers.Main.textChangesSaved": "All changes saved",
+  "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
   "PE.Controllers.Toolbar.textAccent": "Accents",

apps/presentationeditor/mobile/app/controller/Main.js

@@ -762,6 +762,10 @@ define([
                         config.msg = this.errorConnectToServer;
                         break;
 
+                    case Asc.c_oAscError.ID.UplImageUrl:
+                        config.msg = this.errorBadImageUrl;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -1213,7 +1217,8 @@ define([
             textClose: 'Close',
             textDone: 'Done',
             titleServerVersion: 'Editor updated',
-            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.'
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
+            errorBadImageUrl: 'Image url is incorrect'
         }
     })(), PE.Controllers.Main || {}))
 });
\ No newline at end of file

apps/presentationeditor/mobile/locale/en.json

@@ -83,6 +83,7 @@
   "PE.Controllers.Main.errorUsersExceed": "The number of users was exceeded",
   "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
   "PE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
+  "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "PE.Controllers.Main.loadFontsTextText": "Loading data...",
   "PE.Controllers.Main.loadFontsTitleText": "Loading Data",
   "PE.Controllers.Main.loadFontTextText": "Loading data...",