# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-01-24 15:11:41
# Node ID e9811c69801427771a697f4dabd466a5aae913b1
# Parent  b6c6e62c8fed71bee9fa22b2718b37882cb6bf7b

comments: link to resolved comment in FIX comment type.

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:
               <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">