From 96621335434b8f8254eb85e507b04e06cbbf81c7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 12 Apr 2017 12:49:16 +0300 Subject: [PATCH] Fix Bug 34590. [DE] Fix Bug 29356, fix Bug 33671. --- apps/common/main/resources/less/comments.less | 2 +- apps/documenteditor/main/app/controller/Main.js | 7 ++++++- apps/documenteditor/main/locale/en.json | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index af57564b7..e88e72717 100644 --- a/apps/common/main/resources/less/comments.less +++ b/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; diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c8d247933..c916235c0 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1272,6 +1272,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; @@ -2095,7 +2099,8 @@ define([ errorAccessDeny: 'You are trying to perform an action you do not have rights for.
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 || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 162c0804f..450e20079 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -318,6 +318,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}%",