##// END OF EJS Templates
feat(2fa): added 2fa for more auth plugins and moved 2fa forced functionality to ee edition. Fixes: RCCE-68
feat(2fa): added 2fa for more auth plugins and moved 2fa forced functionality to ee edition. Fixes: RCCE-68

File last commit:

r5037:bd722d6e default
r5397:46138ab9 default
Show More
changeset_range.mako
122 lines | 5.0 KiB | application/x-mako | MakoHtmlLexer
templating: use .mako as extensions for template files.
r1282 <%inherit file="/base/base.mako"/>
<%def name="title()">
${_('%s Commits') % c.repo_name} -
diffs: added handy quick file selector in diffs views.
r3100 r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}
templating: use .mako as extensions for template files.
r1282 ...
diffs: added handy quick file selector in diffs views.
r3100 r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
translation: unified usage of pluralize function ungettext....
r1945 ${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
templating: use .mako as extensions for template files.
r1282 %if c.rhodecode_name:
&middot; ${h.branding(c.rhodecode_name)}
%endif
</%def>
dan
ui: fixed commit range page
r3759 <%def name="breadcrumbs_links()"></%def>
templating: use .mako as extensions for template files.
r1282
<%def name="menu_bar_nav()">
${self.menu_items(active='repositories')}
</%def>
<%def name="menu_bar_subnav()">
changelog: rename changelog to commits pages
r3742 ${self.repo_menu(active='commits')}
templating: use .mako as extensions for template files.
r1282 </%def>
<%def name="main()">
ui: new commits page....
r3882
dan
ui: fixed commit range page
r3759 <div class="box">
<div class="summary changeset">
<div class="summary-detail">
<div class="summary-detail-header">
<span class="breadcrumbs files_location">
<h4>
${_('Commit Range')}
</h4>
</span>
templating: use .mako as extensions for template files.
r1282
dan
ui: fixed commit range page
r3759 <div class="clear-fix"></div>
</div>
templating: use .mako as extensions for template files.
r1282
dan
ui: fixed commit range page
r3759 <div class="fieldset">
<div class="left-label-summary">
<p class="spacing">${_('Range')}:</p>
<div class="right-label-summary">
<div class="code-header" >
<div class="compare_header">
<code class="fieldset-text-line">
r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}
...
r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
</code>
</div>
</div>
</div>
</div>
templating: use .mako as extensions for template files.
r1282 </div>
dan
ui: fixed commit range page
r3759 <div class="fieldset">
<div class="left-label-summary">
<p class="spacing">${_('Diff Option')}:</p>
<div class="right-label-summary">
<div class="code-header" >
<div class="compare_header">
ui: new commits page....
r3882 <a class="btn btn-primary" href="${h.route_path('repo_compare',
dan
ui: fixed commit range page
r3759 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 diff')}
</a>
</div>
</div>
</div>
</div>
</div>
templating: use .mako as extensions for template files.
r1282
dan
ui: fixed commit range page
r3759 <div class="clear-fix"></div>
</div> <!-- end summary-detail -->
</div> <!-- end summary -->
templating: use .mako as extensions for template files.
r1282
dan
ui: fixed commit range page
r3759 <div id="changeset_compare_view_content">
templating: use .mako as extensions for template files.
r1282 <div class="pull-left">
<div class="btn-group">
commits/ux: use similar as in files expand/collapse toggle.
r4126 <a class="${('collapsed' if c.collapse_all_commits else '')}" href="#expand-commits" onclick="toggleCommitExpand(this); return false" data-toggle-commits-cnt=${len(c.commit_ranges)} >
% if c.collapse_all_commits:
<i class="icon-plus-squared-alt icon-no-margin"></i>
${_ungettext('Expand {} commit', 'Expand {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
% else:
<i class="icon-minus-squared-alt icon-no-margin"></i>
${_ungettext('Collapse {} commit', 'Collapse {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
% endif
templating: use .mako as extensions for template files.
r1282 </a>
</div>
</div>
## Commit range generated below
<%include file="../compare/compare_commits.mako"/>
<div class="cs_files">
<%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
<%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
<%namespace name="diff_block" file="/changeset/diff_block.mako"/>
ui: new commits page....
r3882
templating: use .mako as extensions for template files.
r1282 %for commit in c.commit_ranges:
commits/pr pages various fixes....
r4485 ## commit range header for each individual diff
<h3>
range-diff: enable hovercards for commits in range-diff.
r4542 <a class="tooltip-hovercard revision" data-hovercard-alt="Commit: ${commit.short_id}" data-hovercard-url="${h.route_path('hovercard_repo_commit', repo_name=c.repo_name, commit_id=commit.raw_id)}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}
</a>
commits/pr pages various fixes....
r4485 </h3>
ui: new commits page....
r3882 ${cbdiffs.render_diffset_menu(c.changes[commit.raw_id])}
templating: use .mako as extensions for template files.
r1282 ${cbdiffs.render_diffset(
diffset=c.changes[commit.raw_id],
collapse_when_files_over=5,
commit=commit,
)}
%endfor
</div>
</div>
dan
ui: fixed commit range page
r3759 </div>
templating: use .mako as extensions for template files.
r1282 </%def>