Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 34590. [DE] Fix Bug 29356, fix Bug 33671.

Browse source
This commit is contained in:
Julia Radzhabova 2017-04-12 12:49:16 +03:00
parent 358154cb62
commit 9662133543
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/comments.less
View file

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

7
apps/documenteditor/main/app/controller/Main.js
View file

@ -1272,6 +1272,10 @@ define([
config.msg = this.errorAccessDeny; config.msg = this.errorAccessDeny;
break; break;
case Asc.c_oAscError.ID.UplImageUrl:
config.msg = this.errorBadImageUrl;
break;
default: default:
config.msg = this.errorDefaultMessage.replace('%1', id); config.msg = this.errorDefaultMessage.replace('%1', id);
break; break;
@ -2095,7 +2099,8 @@ define([
errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.', errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.',
titleServerVersion: 'Editor updated', 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.',
textChangesSaved: 'All changes saved' textChangesSaved: 'All changes saved',
errorBadImageUrl: 'Image url is incorrect'
} }
})(), DE.Controllers.Main || {})) })(), DE.Controllers.Main || {}))
}); });

1
apps/documenteditor/main/locale/en.json
View file

@ -318,6 +318,7 @@
"DE.Controllers.Main.titleServerVersion": "Editor updated", "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.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.textChangesSaved": "All changes saved",
"DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", "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.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.zoomText": "Zoom {0}%", "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",