Files
@ a1e156503afe
Branch filter:
Location: kallithea/rhodecode/templates/compare/compare_diff.html - annotation
a1e156503afe
2.5 KiB
text/html
Fixed calls to Session in db model
- added inject_ui method that should be later used for all injections of extra parameters into ui
- fixed naming conflict of `comments` functions and relationship that had the same name
- added inject_ui method that should be later used for all injections of extra parameters into ui
- fixed naming conflict of `comments` functions and relationship that had the same name
f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 a07e04ef7bb4 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 3c4afb8894bd f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 b262e349a7a5 f29469677319 b262e349a7a5 b262e349a7a5 b262e349a7a5 f8c953c6b040 f8c953c6b040 f29469677319 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 f8c953c6b040 f8c953c6b040 f8c953c6b040 f8c953c6b040 f29469677319 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 a07e04ef7bb4 f29469677319 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">${_('Outgoing changesets')}</div>
<%include file="compare_cs.html" />
## FILES
<div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
<div class="cs_files">
%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>
</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
<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>
|