##// 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
changeset_range.html
125 lines | 4.6 KiB | text/html | HtmlLexer
## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('%s Commits') % c.repo_name} -
r${c.commit_ranges[0].revision}:${h.short_id(c.commit_ranges[0].raw_id)}
...
r${c.commit_ranges[-1].revision}:${h.short_id(c.commit_ranges[-1].raw_id)}
${ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
%if c.rhodecode_name:
&middot; ${h.branding(c.rhodecode_name)}
%endif
</%def>
<%def name="breadcrumbs_links()">
${_('Commits')} -
r${c.commit_ranges[0].revision}:${h.short_id(c.commit_ranges[0].raw_id)}
...
r${c.commit_ranges[-1].revision}:${h.short_id(c.commit_ranges[-1].raw_id)}
${ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
</%def>
<%def name="menu_bar_nav()">
${self.menu_items(active='repositories')}
</%def>
<%def name="menu_bar_subnav()">
${self.repo_menu(active='changelog')}
</%def>
<%def name="main()">
<div class="summary-header">
<div class="title">
${self.repo_page_title(c.rhodecode_db_repo)}
</div>
</div>
<div class="summary changeset">
<div class="summary-detail">
<div class="summary-detail-header">
<span class="breadcrumbs files_location">
<h4>
${_('Commit Range')}
<code>
r${c.commit_ranges[0].revision}:${h.short_id(c.commit_ranges[0].raw_id)}...r${c.commit_ranges[-1].revision}:${h.short_id(c.commit_ranges[-1].raw_id)}
</code>
</h4>
</span>
</div>
<div class="fieldset">
<div class="left-label">
${_('Diff option')}:
</div>
<div class="right-content">
<div class="header-buttons">
<a href="${h.url('compare_url', repo_name=c.repo_name, source_ref_type='rev', source_ref=getattr(c.commit_ranges[0].parents[0] if c.commit_ranges[0].parents else h.EmptyCommit(), 'raw_id'), target_ref_type='rev', target_ref=c.commit_ranges[-1].raw_id)}">
${_('Show combined compare')}
</a>
</div>
</div>
</div>
<%doc>
##TODO(marcink): implement this and diff menus
<div class="fieldset">
<div class="left-label">
${_('Diff options')}:
</div>
<div class="right-content">
<div class="diff-actions">
<a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision='?')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}">
${_('Raw Diff')}
</a>
|
<a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision='?')}" class="tooltip" title="${h.tooltip(_('Patch diff'))}">
${_('Patch Diff')}
</a>
|
<a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision='?',diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">
${_('Download Diff')}
</a>
</div>
</div>
</div>
</%doc>
</div> <!-- end summary-detail -->
</div> <!-- end summary -->
<div id="changeset_compare_view_content">
<div class="pull-left">
<div class="btn-group">
<a
class="btn"
href="#"
onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">
${ungettext('Expand %s commit','Expand %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
</a>
<a
class="btn"
href="#"
onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
${ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
</a>
</div>
</div>
## Commit range generated below
<%include file="../compare/compare_commits.html"/>
<div class="cs_files">
<%namespace name="cbdiffs" file="/codeblocks/diffs.html"/>
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
<%namespace name="diff_block" file="/changeset/diff_block.html"/>
${cbdiffs.render_diffset_menu()}
%for commit in c.commit_ranges:
${cbdiffs.render_diffset(
diffset=c.changes[commit.raw_id],
collapse_when_files_over=5,
commit=commit,
)}
%endfor
</div>
</div>
</%def>