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

Added placeholder if mentions not possible

Browse source
This commit is contained in:
Alexei Koshelev 2022-11-09 15:54:01 +03:00
parent a86884c73a
commit 169c39a58f
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/template/CommentsPopover.template
View file

@ -11,7 +11,7 @@
<div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(comment)%></div> <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(comment)%></div>
<% } else { %> <% } else { %>
<div class="inner-edit-ct"> <div class="inner-edit-ct">
<textarea class="msg-reply user-select" maxlength="maxCommLength" spellcheck="false" <% if (!!dummy) { %> placeholder="textMention"<% } %>><%=comment%></textarea> <textarea class="msg-reply user-select" maxlength="maxCommLength" spellcheck="false" <% if (!!dummy) { %> placeholder="textMentionComment"<% } %>><%=comment%></textarea>
<% if (hideAddReply) { %> <% if (hideAddReply) { %>
<button class="btn normal dlg-btn primary btn-inner-edit" id="id-comments-change-popover">textAdd</button> <button class="btn normal dlg-btn primary btn-inner-edit" id="id-comments-change-popover">textAdd</button>
<% } else { %> <% } else { %>
@ -93,7 +93,7 @@
<% if (showReplyInPopover) { %> <% if (showReplyInPopover) { %>
<div class="reply-ct"> <div class="reply-ct">
<textarea class="msg-reply user-select" placeholder="textAddReply" maxlength="maxCommLength" spellcheck="false"></textarea> <textarea class="msg-reply user-select" placeholder="textMentionReply" maxlength="maxCommLength" spellcheck="false"></textarea>
<button class="btn normal dlg-btn primary btn-reply" id="id-comments-change-popover">textReply</button> <button class="btn normal dlg-btn primary btn-reply" id="id-comments-change-popover">textReply</button>
<button class="btn normal dlg-btn btn-close">textClose</button> <button class="btn normal dlg-btn btn-close">textClose</button>
</div> </div>

4
apps/common/main/lib/view/ReviewPopover.js
View file

@ -240,13 +240,14 @@ define([
el: $('#id-comments-popover'), el: $('#id-comments-popover'),
itemTemplate: _.template(replaceWords(commentsTemplate, { itemTemplate: _.template(replaceWords(commentsTemplate, {
textAddReply: me.textAddReply, textAddReply: me.textAddReply,
textMentionReply: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textAddReply,
textAdd: me.textAdd, textAdd: me.textAdd,
textCancel: me.textCancel, textCancel: me.textCancel,
textEdit: me.textEdit, textEdit: me.textEdit,
textReply: me.textReply, textReply: me.textReply,
textClose: me.textClose, textClose: me.textClose,
maxCommLength: Asc.c_oAscMaxCellOrCommentLength, 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', textFollowMove : 'Follow Move',
textMention : '+mention will provide access to the document and send an email', textMention : '+mention will provide access to the document and send an email',
textMentionNotify : '+mention will notify the user via email', textMentionNotify : '+mention will notify the user via email',
textEnterComment : 'Enter your comment here',
textViewResolved : 'You have not permission for reopen comment', textViewResolved : 'You have not permission for reopen comment',
txtAccept: 'Accept', txtAccept: 'Accept',
txtReject: 'Reject', txtReject: 'Reject',