Files
@ f01540c62f8a
Branch filter:
Location: kallithea/rhodecode/templates/compare/compare_diff.html - annotation
f01540c62f8a
3.2 KiB
text/html
top menu: show user menu as a menu option like others, now also with login name
A minor regression: the message count is not clickable ... but it was hard to
hit, and somewhat confusing that different parts of the icon meant different
things.
The new html/css will probably need some review and cross platform testing.
A minor regression: the message count is not clickable ... but it was hard to
hit, and somewhat confusing that different parts of the icon meant different
things.
The new html/css will probably need some review and cross platform testing.
f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 ed11764eb81a f8c953c6b040 f8c953c6b040 f8c953c6b040 79818f546538 f8c953c6b040 f8c953c6b040 f8c953c6b040 a07e04ef7bb4 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 3c4afb8894bd f8c953c6b040 ed11764eb81a f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 b262e349a7a5 16af24982e30 b262e349a7a5 b262e349a7a5 b262e349a7a5 16af24982e30 685ebc84c2e9 16af24982e30 16af24982e30 16af24982e30 16af24982e30 16af24982e30 685ebc84c2e9 16af24982e30 f8c953c6b040 16af24982e30 16af24982e30 16af24982e30 f29469677319 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 f8c953c6b040 f8c953c6b040 25d77aef2729 25d77aef2729 685ebc84c2e9 f8c953c6b040 f8c953c6b040 f29469677319 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 25d77aef2729 25d77aef2729 25d77aef2729 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(_(u'Home'),h.url('/'))}
»
${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
»
${_('Compare')}
</%def>
<%def name="page_nav()">
${self.menu('changelog')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<div class="table">
<div id="body" class="diffblock">
<div class="code-header cv">
<h3 class="code-header-title">${_('Compare View')}</h3>
<div>
${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a>
</div>
</div>
</div>
<div id="changeset_compare_view_content">
##CS
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
<%include file="compare_cs.html" />
## FILES
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
% if c.limited_diff:
${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
% else:
${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
%endif
</div>
<div class="cs_files">
%if not c.files:
<span class="empty_data">${_('No files')}</span>
%endif
%for fid, change, f, stat in c.files:
<div class="cs_${change}">
<div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>
<div class="changes">${h.fancy_file_stats(stat)}</div>
</div>
%endfor
</div>
% if c.limited_diff:
<h5>${_('Changeset was too big and was cut off...')}</h5>
% endif
</div>
</div>
## diff block
<%namespace name="diff_block" file="/changeset/diff_block.html"/>
%for fid, change, f, stat in c.files:
${diff_block.diff_block_simple([c.changes[fid]])}
%endfor
% if c.limited_diff:
<h4>${_('Changeset was too big and was cut off...')}</h4>
% endif
<script type="text/javascript">
YUE.onDOMReady(function(){
YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
var act = e.currentTarget.nextElementSibling;
if(YUD.hasClass(act,'active')){
YUD.removeClass(act,'active');
YUD.setStyle(act,'display','none');
}else{
YUD.addClass(act,'active');
YUD.setStyle(act,'display','');
}
});
})
</script>
</div>
</%def>
|