engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comments: link to resolved comment in FIX comment type.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-01-24 16:11:41 +01:00
parent f08be8b977
commit d055888eda
2 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rhodecode/public/css/comments.less
View file

@ -95,6 +95,19 @@ tr.inline-comments div {
}
}
.has-spacer-after {
&:after {
content: ' | ';
color: @grey5;
}
}
.has-spacer-before {
&:before {
content: ' | ';
color: @grey5;
}
}
.comment {

30
rhodecode/templates/changeset/changeset_file_comment.mako
View file

@ -59,21 +59,21 @@
% if inline:
<span></span>
% else:
<div class="status-change">
% if comment.pull_request:
<a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
<div class="status-change">
% if comment.pull_request:
<a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
% if comment.status_change:
${_('pull request #%s') % comment.pull_request.pull_request_id}:
% else:
${_('pull request #%s') % comment.pull_request.pull_request_id}
% endif
</a>
% else:
% if comment.status_change:
${_('pull request #%s') % comment.pull_request.pull_request_id}:
% else:
${_('pull request #%s') % comment.pull_request.pull_request_id}
${_('Status change on commit')}:
% endif
</a>
% else:
% if comment.status_change:
${_('Status change on commit')}:
% endif
% endif
</div>
</div>
% endif
% if comment.status_change:
@ -83,6 +83,12 @@
</div>
% endif
% if comment.resolved_comment:
<a class="has-spacer-before" href="#comment-${comment.resolved_comment.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${comment.resolved_comment.comment_id}'))">
${_('resolves comment #{}').format(comment.resolved_comment.comment_id)}
</a>
% endif
<a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
<div class="comment-links-block">