##// END OF EJS Templates
diffs: compare overhaul....
diffs: compare overhaul. - made compare and commit range pages more consistent with other commit diff pages - removed mergerly, closes #4665. Old diff2way is replaced by new diffs with side-by-side mode. - cleanup button behaviour on compare page. Added help text and generally improved UX - switched file-diffs to compare page with file filter. Part of #4000 - added collapse/expand commits buttons in compare views.

File last commit:

r1259:8e9f93ec default
r1259:8e9f93ec default
Show More
compare_commits.html
113 lines | 3.5 KiB | text/html | HtmlLexer
## Changesets table !
<%namespace name="base" file="/base/base.html"/>
%if c.ancestor:
<div class="ancestor">${_('Common Ancestor Commit')}:
<a href="${h.url('changeset_home',
repo_name=c.repo_name,
revision=c.ancestor)}">
${h.short_id(c.ancestor)}
</a>
</div>
%endif
<div class="container">
<input type="hidden" name="__start__" value="revisions:sequence">
<table class="rctable compare_view_commits">
<tr>
<th>${_('Time')}</th>
<th>${_('Author')}</th>
<th>${_('Commit')}</th>
<th></th>
<th>${_('Description')}</th>
</tr>
%for commit in c.commit_ranges:
<tr id="row-${commit.raw_id}"
commit_id="${commit.raw_id}"
class="compare_select"
>
<td class="td-time">
${h.age_component(commit.date)}
</td>
<td class="td-user">
${base.gravatar_with_user(commit.author, 16)}
</td>
<td class="td-hash">
<code>
<a href="${h.url('changeset_home',
repo_name=c.target_repo.repo_name,
revision=commit.raw_id)}">
r${commit.revision}:${h.short_id(commit.raw_id)}
</a>
${h.hidden('revisions',commit.raw_id)}
</code>
</td>
<td class="expand_commit"
data-commit-id="${commit.raw_id}"
title="${_( 'Expand commit message')}"
>
<div class="show_more_col">
<i class="show_more"></i>
</div>
</td>
<td class="mid td-description">
<div class="log-container truncate-wrap">
<div
id="c-${commit.raw_id}"
class="message truncate"
data-message-raw="${commit.message}"
>
${h.urlify_commit_message(commit.message, c.repo_name)}
</div>
</div>
</td>
</tr>
%endfor
<tr class="compare_select_hidden" style="display: none">
<td colspan="5">
${ungettext('%s commit hidden','%s commits hidden', len(c.commit_ranges)) % len(c.commit_ranges)}
</td>
</tr>
% if not c.commit_ranges:
<tr class="compare_select">
<td colspan="5">
${_('No commits in this compare')}
</td>
</tr>
% endif
</table>
<input type="hidden" name="__end__" value="revisions:sequence">
</div>
<script>
$('.expand_commit').on('click',function(e){
var target_expand = $(this);
var cid = target_expand.data('commitId');
// ## TODO: dan: extract styles into css, and just toggleClass('open') here
if (target_expand.hasClass('open')){
$('#c-'+cid).css({
'height': '1.5em',
'white-space': 'nowrap',
'text-overflow': 'ellipsis',
'overflow':'hidden'
});
target_expand.removeClass('open');
}
else {
$('#c-'+cid).css({
'height': 'auto',
'white-space': 'pre-line',
'text-overflow': 'initial',
'overflow':'visible'
});
target_expand.addClass('open');
}
});
$('.compare_select').on('click',function(e){
var cid = $(this).attr('commit_id');
$('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));
});
</script>