diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index e7e11ba2f..3e006d6f5 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -11,7 +11,7 @@
<%=scope.pickLink(comment)%>
<% } else { %>
- + <% if (hideAddReply) { %> <% } else { %> @@ -93,7 +93,7 @@ <% if (showReplyInPopover) { %>
- +
diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 1a05dda56..86cb533a5 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -240,13 +240,14 @@ define([ el: $('#id-comments-popover'), itemTemplate: _.template(replaceWords(commentsTemplate, { textAddReply: me.textAddReply, + textMentionReply: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textAddReply, textAdd: me.textAdd, textCancel: me.textCancel, textEdit: me.textEdit, textReply: me.textReply, textClose: me.textClose, maxCommLength: Asc.c_oAscMaxCellOrCommentLength, - textMention: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : '' + textMentionComment: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textEnterComment }) ) }); @@ -1294,6 +1295,7 @@ define([ textFollowMove : 'Follow Move', textMention : '+mention will provide access to the document and send an email', textMentionNotify : '+mention will notify the user via email', + textEnterComment : 'Enter your comment here', textViewResolved : 'You have not permission for reopen comment', txtAccept: 'Accept', txtReject: 'Reject',