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

comments: cleanup of PR versions/author tags.

Browse source
This commit is contained in:
Marcin Kuzminski 2020-06-24 00:16:12 +02:00
parent 40505633d1
commit 846c4e592b
3 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -253,12 +253,10 @@ tr.inline-comments div {
}
.pr-version {
float: left;
margin: 0px 4px;
display: inline-block;
}
.pr-version-inline {
float: left;
margin: 0px 4px;
display: inline-block;
}
.pr-version-num {
font-size: 10px;

4
rhodecode/public/css/tags.less
View file

@ -37,6 +37,10 @@
&:hover {
border-color: @grey4;
}
&.authortag {
padding: 2px;
}
}
.tag0 { .border ( @border-thickness-tags, @grey4 ); color:@grey4; }

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

@ -62,6 +62,13 @@
<div class="author ${'author-inline' if inline else 'author-general'}">
${base.gravatar_with_user(comment.author.email, 16, tooltip=True)}
% if comment.pull_request and comment.pull_request.author.user_id == comment.author.user_id:
<span class="tag authortag tooltip" title="${_('Pull request author')}">
${_('author')}
</span>
% endif
</div>
<div class="date">
${h.age_component(comment.modified_at, time_is_local=True)}
@ -139,15 +146,9 @@
<a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
<div class="comment-links-block">
% if comment.pull_request and comment.pull_request.author.user_id == comment.author.user_id:
<span class="tag authortag tooltip" title="${_('Pull request author')}">
${_('author')}
</span>
|
% endif
% if inline:
<div class="pr-version-inline">
<a href="${request.current_route_path(_query=dict(version=comment.pull_request_version_id), _anchor='comment-{}'.format(comment.comment_id))}">
<a class="pr-version-inline" href="${request.current_route_path(_query=dict(version=comment.pull_request_version_id), _anchor='comment-{}'.format(comment.comment_id))}">
% if outdated_at_ver:
<code class="pr-version-num" title="${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
outdated ${'v{}'.format(pr_index_ver)} |
@ -158,25 +159,26 @@
</code>
% endif
</a>
</div>
% else:
% if comment.pull_request_version_id and pr_index_ver:
|
<div class="pr-version">
% if comment.outdated:
<a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}">
<a class="pr-version"
href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}"
>
${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}
</a>
</a> |
% else:
<div title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
<a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}">
<code class="pr-version-num">
${'v{}'.format(pr_index_ver)}
</code>
</a>
</div>
<a class="pr-version"
title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"
href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}"
>
<code class="pr-version-num">
${'v{}'.format(pr_index_ver)}
</code>
</a> |
% endif
</div>
% endif
% endif