Show More
@@ -95,6 +95,19 b' tr.inline-comments div {' | |||||
95 | } |
|
95 | } | |
96 | } |
|
96 | } | |
97 |
|
97 | |||
|
98 | .has-spacer-after { | |||
|
99 | &:after { | |||
|
100 | content: ' | '; | |||
|
101 | color: @grey5; | |||
|
102 | } | |||
|
103 | } | |||
|
104 | ||||
|
105 | .has-spacer-before { | |||
|
106 | &:before { | |||
|
107 | content: ' | '; | |||
|
108 | color: @grey5; | |||
|
109 | } | |||
|
110 | } | |||
98 |
|
111 | |||
99 | .comment { |
|
112 | .comment { | |
100 |
|
113 |
@@ -59,21 +59,21 b'' | |||||
59 | % if inline: |
|
59 | % if inline: | |
60 | <span></span> |
|
60 | <span></span> | |
61 | % else: |
|
61 | % else: | |
62 | <div class="status-change"> |
|
62 | <div class="status-change"> | |
63 | % if comment.pull_request: |
|
63 | % if comment.pull_request: | |
64 | <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}"> |
|
64 | <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}"> | |
|
65 | % if comment.status_change: | |||
|
66 | ${_('pull request #%s') % comment.pull_request.pull_request_id}: | |||
|
67 | % else: | |||
|
68 | ${_('pull request #%s') % comment.pull_request.pull_request_id} | |||
|
69 | % endif | |||
|
70 | </a> | |||
|
71 | % else: | |||
65 | % if comment.status_change: |
|
72 | % if comment.status_change: | |
66 | ${_('pull request #%s') % comment.pull_request.pull_request_id}: |
|
73 | ${_('Status change on commit')}: | |
67 | % else: |
|
|||
68 | ${_('pull request #%s') % comment.pull_request.pull_request_id} |
|
|||
69 | % endif |
|
74 | % endif | |
70 | </a> |
|
|||
71 | % else: |
|
|||
72 | % if comment.status_change: |
|
|||
73 | ${_('Status change on commit')}: |
|
|||
74 | % endif |
|
75 | % endif | |
75 |
|
|
76 | </div> | |
76 | </div> |
|
|||
77 | % endif |
|
77 | % endif | |
78 |
|
78 | |||
79 | % if comment.status_change: |
|
79 | % if comment.status_change: | |
@@ -83,6 +83,12 b'' | |||||
83 | </div> |
|
83 | </div> | |
84 | % endif |
|
84 | % endif | |
85 |
|
85 | |||
|
86 | % if comment.resolved_comment: | |||
|
87 | <a class="has-spacer-before" href="#comment-${comment.resolved_comment.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${comment.resolved_comment.comment_id}'))"> | |||
|
88 | ${_('resolves comment #{}').format(comment.resolved_comment.comment_id)} | |||
|
89 | </a> | |||
|
90 | % endif | |||
|
91 | ||||
86 | <a class="permalink" href="#comment-${comment.comment_id}"> ¶</a> |
|
92 | <a class="permalink" href="#comment-${comment.comment_id}"> ¶</a> | |
87 |
|
93 | |||
88 | <div class="comment-links-block"> |
|
94 | <div class="comment-links-block"> |
General Comments 0
You need to be logged in to leave comments.
Login now