diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less --- a/rhodecode/public/css/comments.less +++ b/rhodecode/public/css/comments.less @@ -95,6 +95,19 @@ tr.inline-comments div { } } +.has-spacer-after { + &:after { + content: ' | '; + color: @grey5; + } +} + +.has-spacer-before { + &:before { + content: ' | '; + color: @grey5; + } +} .comment { diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako --- a/rhodecode/templates/changeset/changeset_file_comment.mako +++ b/rhodecode/templates/changeset/changeset_file_comment.mako @@ -59,21 +59,21 @@ % if inline: % else: -
- % if comment.pull_request: - +
+ % if comment.pull_request: + + % if comment.status_change: + ${_('pull request #%s') % comment.pull_request.pull_request_id}: + % else: + ${_('pull request #%s') % comment.pull_request.pull_request_id} + % endif + + % 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 - - % else: - % if comment.status_change: - ${_('Status change on commit')}: % endif - % endif -
+
% endif % if comment.status_change: @@ -83,6 +83,12 @@ % endif + % if comment.resolved_comment: + + ${_('resolves comment #{}').format(comment.resolved_comment.comment_id)} + + % endif +